diff --git a/Makefile b/Makefile
index 3abf6b4e4c2aff11490527d9f0844104596191e7..d5123ee262670eea2b7890511e684f15a62c95d3 100644
--- a/Makefile
+++ b/Makefile
@@ -56,9 +56,9 @@ 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.17.0-beta.1
+DNS_CONTROLLER_TAG=1.17.0-beta.2
# Keep in sync with upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
-KOPS_CONTROLLER_TAG=1.17.0-beta.1
+KOPS_CONTROLLER_TAG=1.17.0-beta.2
# Keep in sync with logic in get_workspace_status
# TODO: just invoke tools/get_workspace_status.sh?
@@ -468,9 +468,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
+ tools/sha1 ${DIST}/linux/amd64/utils.tar.gz ${DIST}/linux/amd64/utils.tar.gz.sha1
+ tools/sha256 ${DIST}/linux/amd64/utils.tar.gz ${DIST}/linux/amd64/utils.tar.gz.sha256
.PHONY: bazel-utils-dist
bazel-utils-dist:
diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
index 37d78b5811f2bf71352ab0c3d126515c4746a2ad..af3dc4ba499663c7d4e9e7e004a4357db4cff217 100644
--- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
+++ b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
spec:
replicas: 1
selector:
@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
@@ -32,7 +32,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
- image: kope/dns-controller:1.17.0-beta.1
+ image: kope/dns-controller:1.17.0-beta.2
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
index 29250ac8580ca779bc12f3b88cd3c6e87fe8c52c..93639de30459e60b76013540f36091ca810d719e 100644
--- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
+++ b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
spec:
replicas: 1
selector:
@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
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.17.0-beta.1
+ image: kope/dns-controller:1.17.0-beta.2
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template
index 3d6d895b97e8338734933a04e1286e11e94fe11d..4537628f82f02d9c69890f0dee08578eb74b9378 100644
--- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template
+++ b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template
@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
spec:
replicas: 1
selector:
@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
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.17.0-beta.1
+ image: kope/dns-controller:1.17.0-beta.2
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
diff --git a/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
index dfc99ccc6493cc1cd08194d495afa73a9568226b..e5c2f8d09b0bc58b5794aafb353d4420758522d5 100644
--- a/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
+++ b/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
@@ -19,7 +19,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
spec:
selector:
matchLabels:
@@ -33,7 +33,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
spec:
priorityClassName: system-node-critical
tolerations:
@@ -46,7 +46,7 @@ spec:
serviceAccount: kops-controller
containers:
- name: kops-controller
- image: kope/kops-controller:1.17.0-beta.1
+ image: kope/kops-controller:1.17.0-beta.2
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
index 282e9acd273539a55708783fd542e691b67e10ec..dc0a07e0b77222bbc75d0c56c11d944a7ee8b904 100644
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -117,7 +117,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
{
key := "kops-controller.addons.k8s.io"
- version := "1.17.0-beta.1"
+ version := "1.17.0-beta.2"
{
location := key + "/k8s-1.16.yaml"
@@ -396,7 +396,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if externalDNS == nil || !externalDNS.Disable {
{
key := "dns-controller.addons.k8s.io"
- version := "1.17.0-beta.1"
+ version := "1.17.0-beta.2"
{
location := key + "/pre-k8s-1.6.yaml"
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
index be2f9ed2f150cb92d9dc87fbc962df24cfc8aa2b..c3479c5aca89d537578332af6511c5145f4dd007 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
@@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
- manifestHash: efd1e31c4a0e76ca7811d1bfb63f7342aa6daa32
+ manifestHash: cd06dfe9a2097a18a8e8eced00f877db41123bd8
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@@ -67,27 +67,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
- manifestHash: 0a5cba2c22ea414268fef16365d6401875e434e8
+ manifestHash: 6d1fa89442b167fdec051347a550828b69be59db
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
- manifestHash: c4444a610db4eca4861fc9d1b3f95972e7223f72
+ manifestHash: 9fb973cf9aa5366b244332bd630e68b454524177
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
- manifestHash: 037e8d47a85eb467dfdb61c29251a1a6873fcef1
+ manifestHash: c8f7b2ee420bcbab7b72096880d9332381989fab
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
index aab39883855aa93f241f04b1ccb58633c017cb15..3711dc0f912524c5a155f12b0f8dc25bb62fa268 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
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.17.0-beta.1
+ version: v1.17.0-beta.2
spec:
containers:
- command:
@@ -29,7 +29,7 @@ spec:
- --zone=*/Z1AFAKE1ZON3YO
- --zone=*/*
- -v=2
- image: kope/dns-controller:1.17.0-beta.1
+ image: kope/dns-controller:1.17.0-beta.2
name: dns-controller
resources:
requests:
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
index 8096c694b22679c3ffbddc509a5f8405b5da87ac..6b8a1c5261344337b02a2967d09f13308d2c2439 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
@@ -17,7 +17,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
name: kops-controller
namespace: kube-system
spec:
@@ -29,14 +29,14 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
spec:
containers:
- command:
- /usr/bin/kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config.yaml
- image: kope/kops-controller:1.17.0-beta.1
+ image: kope/kops-controller:1.17.0-beta.2
name: kops-controller
resources:
requests:
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
index 3569edcda3ebffbf7f62fcd8ba7c2ed3cbd4e7ec..c0c4a04c2ef9e299c47329b1e3af00cdfe64c7f3 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
- manifestHash: efd1e31c4a0e76ca7811d1bfb63f7342aa6daa32
+ manifestHash: cd06dfe9a2097a18a8e8eced00f877db41123bd8
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@@ -67,27 +67,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
- manifestHash: 0a5cba2c22ea414268fef16365d6401875e434e8
+ manifestHash: 6d1fa89442b167fdec051347a550828b69be59db
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
- manifestHash: c4444a610db4eca4861fc9d1b3f95972e7223f72
+ manifestHash: 9fb973cf9aa5366b244332bd630e68b454524177
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
- manifestHash: 037e8d47a85eb467dfdb61c29251a1a6873fcef1
+ manifestHash: c8f7b2ee420bcbab7b72096880d9332381989fab
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
index aab39883855aa93f241f04b1ccb58633c017cb15..3711dc0f912524c5a155f12b0f8dc25bb62fa268 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
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.17.0-beta.1
+ version: v1.17.0-beta.2
spec:
containers:
- command:
@@ -29,7 +29,7 @@ spec:
- --zone=*/Z1AFAKE1ZON3YO
- --zone=*/*
- -v=2
- image: kope/dns-controller:1.17.0-beta.1
+ image: kope/dns-controller:1.17.0-beta.2
name: dns-controller
resources:
requests:
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml
index 8096c694b22679c3ffbddc509a5f8405b5da87ac..6b8a1c5261344337b02a2967d09f13308d2c2439 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml
@@ -17,7 +17,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
name: kops-controller
namespace: kube-system
spec:
@@ -29,14 +29,14 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
- version: v1.17.0-beta.1
+ version: v1.17.0-beta.2
spec:
containers:
- command:
- /usr/bin/kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config.yaml
- image: kope/kops-controller:1.17.0-beta.1
+ image: kope/kops-controller:1.17.0-beta.2
name: kops-controller
resources:
requests:
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
index 8c0ccfc3de4caa83c17dc556370bb25a39f3a47c..d48cc08109c0ae6aa28b45d9f1119903520d37e3 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
@@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
- manifestHash: efd1e31c4a0e76ca7811d1bfb63f7342aa6daa32
+ manifestHash: cd06dfe9a2097a18a8e8eced00f877db41123bd8
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@@ -67,27 +67,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
- manifestHash: 0a5cba2c22ea414268fef16365d6401875e434e8
+ manifestHash: 6d1fa89442b167fdec051347a550828b69be59db
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
- manifestHash: c4444a610db4eca4861fc9d1b3f95972e7223f72
+ manifestHash: 9fb973cf9aa5366b244332bd630e68b454524177
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
- manifestHash: 037e8d47a85eb467dfdb61c29251a1a6873fcef1
+ manifestHash: c8f7b2ee420bcbab7b72096880d9332381989fab
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
index 329062a79c91d34cdcf5462cd98599dc6c0999b8..96fd4c3d5c9d36523c820e9bfd2e27d386ef01f5 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
@@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
- manifestHash: efd1e31c4a0e76ca7811d1bfb63f7342aa6daa32
+ manifestHash: cd06dfe9a2097a18a8e8eced00f877db41123bd8
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@@ -67,27 +67,27 @@ spec:
- id: pre-k8s-1.6
kubernetesVersion: <1.6.0
manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
- manifestHash: 0a5cba2c22ea414268fef16365d6401875e434e8
+ manifestHash: 6d1fa89442b167fdec051347a550828b69be59db
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
- manifestHash: c4444a610db4eca4861fc9d1b3f95972e7223f72
+ manifestHash: 9fb973cf9aa5366b244332bd630e68b454524177
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
- manifestHash: 037e8d47a85eb467dfdb61c29251a1a6873fcef1
+ manifestHash: c8f7b2ee420bcbab7b72096880d9332381989fab
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.17.0-beta.1
+ version: 1.17.0-beta.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
diff --git a/version.go b/version.go
index 738ce4079157f7321e900c563e0226d8c1983bef..b18d4b26b3094fb87ccb3ad01da5ab5809b14390 100644
--- a/version.go
+++ b/version.go
@@ -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.17.0-beta.1"
- KOPS_CI_VERSION = "1.17.0-beta.2"
+ KOPS_RELEASE_VERSION = "1.17.0-beta.2"
+ KOPS_CI_VERSION = "1.17.0-beta.3"
)
// GitVersion should be replaced by the makefile