Skip to content
GitLab
Commit 298c2fce authored by Justin SB's avatar Justin SB
Browse files

Release 1.15.3

parent b999c246
Hide whitespace changes
Inline Side-by-side
Showing
with 73 additions and 65 deletions
+73 -65
Makefile
+ 10
- 4
View file @ 298c2fce
......@@ -55,7 +55,7 @@ unexport KOPS_BASE_URL KOPS_CLUSTER_NAME KOPS_RUN_OBSOLETE_VERSION KOPS_STATE_ST
unexport SKIP_REGION_CHECK S3_ACCESS_KEY_ID S3_ENDPOINT S3_REGION S3_SECRET_ACCESS_KEY VSPHERE_USERNAME VSPHERE_PASSWORD
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=1.15.2
DNS_CONTROLLER_TAG=1.15.3
# Keep in sync with logic in get_workspace_status
# TODO: just invoke tools/get_workspace_status.sh?
......@@ -486,9 +486,15 @@ dns-controller-push: dns-controller-image
.PHONY: utils-dist
utils-dist:
docker build -t utils-builder images/utils-builder
mkdir -p ${DIST}/linux/amd64/
docker run -v `pwd`/.build/dist/linux/amd64/:/dist utils-builder /extract.sh
# Broken with deprecation of jessie; use bazel version instead
# (bazel version just copies an older version)
#docker build -t utils-builder images/utils-builder
#mkdir -p ${DIST}/linux/amd64/
#docker run -v `pwd`/.build/dist/linux/amd64/:/dist utils-builder /extract.sh
bazel build //images/utils-builder:utils
cp bazel-bin/images/utils-builder/utils.tar.gz ${DIST}/linux/amd64/utils.tar.gz
(${SHASUMCMD} ${DIST}/linux/amd64/utils.tar.gz | cut -d' ' -f1) > ${DIST}/linux/amd64/utils.tar.gz.sha1
(${SHA256SUMCMD} ${DIST}/linux/amd64/utils.tar.gz | cut -d' ' -f1) > ${DIST}/linux/amd64/utils.tar.gz.sha256
.PHONY: bazel-utils-dist
bazel-utils-dist:
......
go.sum
+ 2
- 0
View file @ 298c2fce
......@@ -411,6 +411,8 @@ golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313 h1:pczuHS43Cp2ktBEEmLwScxgjWsBSzdaQiKzUyf3DTTc=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9 h1:ZBzSG/7F4eNKz2L3GE9o300RX0Az1Bw5HF7PDraD+qU=
golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db h1:6/JqlYfC1CCaLnGceQTI+sDGhC9UBSPAsBqI0Gun6kU=
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
......
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
+ 3
- 3
View file @ 298c2fce
......@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
spec:
replicas: 1
selector:
......@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
......@@ -31,7 +31,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: kope/dns-controller:1.15.2
image: kope/dns-controller:1.15.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
......
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
+ 3
- 3
View file @ 298c2fce
......@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
spec:
replicas: 1
selector:
......@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
# For 1.6, we keep the old tolerations in case of a downgrade to 1.5
......@@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: kope/dns-controller:1.15.2
image: kope/dns-controller:1.15.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
......
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template
+ 3
- 3
View file @ 298c2fce
......@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
spec:
replicas: 1
selector:
......@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]'
......@@ -28,7 +28,7 @@ spec:
hostNetwork: true
containers:
- name: dns-controller
image: kope/dns-controller:1.15.2
image: kope/dns-controller:1.15.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
......
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+ 2
- 2
View file @ 298c2fce
......@@ -375,7 +375,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if externalDNS == nil || !externalDNS.Disable {
{
key := "dns-controller.addons.k8s.io"
version := "1.15.2"
version := "1.15.3"
{
location := key + "/pre-k8s-1.6.yaml"
......@@ -472,7 +472,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if kops.CloudProviderID(b.cluster.Spec.CloudProvider) == kops.CloudProviderAWS {
key := "storage-aws.addons.k8s.io"
version := "1.15.2"
version := "1.15.3"
{
id := "v1.15.0"
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
+ 3
- 3
View file @ 298c2fce
......@@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
name: dns-controller
namespace: kube-system
spec:
......@@ -19,7 +19,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
spec:
containers:
- command:
......@@ -29,7 +29,7 @@ spec:
- --zone=*/Z1AFAKE1ZON3YO
- --zone=*/*
- -v=2
image: kope/dns-controller:1.15.2
image: kope/dns-controller:1.15.3
name: dns-controller
resources:
requests:
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+ 9
- 9
View file @ 298c2fce
......@@ -59,27 +59,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash: 11bc83839bfb5cfe9cdc347da638ed149816b1a5
manifestHash: cad69e3d894e1e50407d3cc5619746eea5f3c401
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 73d9aaad71c39dec4247716755622d0e5eabd9cc
manifestHash: 6cb36aaf77b47f3296c9c6c516e3544695d69377
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 5301f3013d87c529da2367e2321bdb97d62b64a9
manifestHash: 2268266f4fa67b7084726545722dbf6702c98acf
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......@@ -87,7 +87,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: v1.7.0
kubernetesVersion: '>=1.7.0 <1.15.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......@@ -95,7 +95,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: v1.6.0
kubernetesVersion: <1.7.0
manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
......@@ -103,7 +103,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: k8s-1.7
kubernetesVersion: '>=1.7.0 <1.12.0'
manifest: networking.cilium.io/k8s-1.7.yaml
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/dns-controller.addons.k8s.io-k8s-1.12.yaml
+ 3
- 3
View file @ 298c2fce
......@@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
name: dns-controller
namespace: kube-system
spec:
......@@ -19,7 +19,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
spec:
containers:
- command:
......@@ -38,7 +38,7 @@ spec:
value: http://proxy.example.com
- name: no_proxy
value: noproxy.example.com,127.0.0.1,localhost,api.minimal.example.com,minimal.example.com,100.64.0.1,100.64.0.0/10,169.254.169.254,172.20.0.0/16
image: kope/dns-controller:1.15.2
image: kope/dns-controller:1.15.3
name: dns-controller
resources:
requests:
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
+ 9
- 9
View file @ 298c2fce
......@@ -59,27 +59,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash: 11bc83839bfb5cfe9cdc347da638ed149816b1a5
manifestHash: cad69e3d894e1e50407d3cc5619746eea5f3c401
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: aec889fcd46b14e1bf2fad6a43d2ba473f3b1577
manifestHash: c7277c764e2533529752333323d80d4790b275ae
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 47de8c9236efae4914072a6bdabb568559d8de3f
manifestHash: 2a572379c9c68d8f5a24044d20bf5f91e3d48b61
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......@@ -87,7 +87,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: v1.7.0
kubernetesVersion: '>=1.7.0 <1.15.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......@@ -95,7 +95,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: v1.6.0
kubernetesVersion: <1.7.0
manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
......@@ -103,7 +103,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: networking.kope.io/pre-k8s-1.6.yaml
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
+ 3
- 3
View file @ 298c2fce
......@@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
name: dns-controller
namespace: kube-system
spec:
......@@ -19,7 +19,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
spec:
containers:
- command:
......@@ -29,7 +29,7 @@ spec:
- --zone=*/Z1AFAKE1ZON3YO
- --zone=*/*
- -v=2
image: kope/dns-controller:1.15.2
image: kope/dns-controller:1.15.3
name: dns-controller
resources:
requests:
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+ 9
- 9
View file @ 298c2fce
......@@ -59,27 +59,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash: 11bc83839bfb5cfe9cdc347da638ed149816b1a5
manifestHash: cad69e3d894e1e50407d3cc5619746eea5f3c401
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 73d9aaad71c39dec4247716755622d0e5eabd9cc
manifestHash: 6cb36aaf77b47f3296c9c6c516e3544695d69377
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 5301f3013d87c529da2367e2321bdb97d62b64a9
manifestHash: 2268266f4fa67b7084726545722dbf6702c98acf
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......@@ -87,7 +87,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: v1.7.0
kubernetesVersion: '>=1.7.0 <1.15.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......@@ -95,7 +95,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: v1.6.0
kubernetesVersion: <1.7.0
manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
......@@ -103,4 +103,4 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.2
version: 1.15.3
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/dns-controller.addons.k8s.io-k8s-1.12.yaml
+ 3
- 3
View file @ 298c2fce
......@@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
name: dns-controller
namespace: kube-system
spec:
......@@ -19,7 +19,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.15.2
version: v1.15.3
spec:
containers:
- command:
......@@ -29,7 +29,7 @@ spec:
- --zone=*/Z1AFAKE1ZON3YO
- --zone=*/*
- -v=2
image: kope/dns-controller:1.15.2
image: kope/dns-controller:1.15.3
name: dns-controller
resources:
requests:
......
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
+ 9
- 9
View file @ 298c2fce
......@@ -59,27 +59,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash: 11bc83839bfb5cfe9cdc347da638ed149816b1a5
manifestHash: cad69e3d894e1e50407d3cc5619746eea5f3c401
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 73d9aaad71c39dec4247716755622d0e5eabd9cc
manifestHash: 6cb36aaf77b47f3296c9c6c516e3544695d69377
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 5301f3013d87c529da2367e2321bdb97d62b64a9
manifestHash: 2268266f4fa67b7084726545722dbf6702c98acf
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
......@@ -87,7 +87,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: v1.7.0
kubernetesVersion: '>=1.7.0 <1.15.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......@@ -95,7 +95,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: v1.6.0
kubernetesVersion: <1.7.0
manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
......@@ -103,7 +103,7 @@ spec:
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.15.2
version: 1.15.3
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: networking.weave/pre-k8s-1.6.yaml
......
version.go
+ 2
- 2
View file @ 298c2fce
......@@ -23,8 +23,8 @@ var Version = KOPS_RELEASE_VERSION
// These constants are parsed by build tooling - be careful about changing the formats
const (
KOPS_RELEASE_VERSION = "1.15.2"
KOPS_CI_VERSION = "1.15.3"
KOPS_RELEASE_VERSION = "1.15.3"
KOPS_CI_VERSION = "1.15.4"
)
// GitVersion should be replaced by the makefile
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

免费DevSecOps平台，让您的项目体验完整的DevSecOps流程，让项目更安全