From 27aab12b2855b308e71b1d6b6b897c81068a0661 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Wed, 6 May 2020 07:48:52 -0400 Subject: [PATCH] Release 1.18.0-alpha.3 --- Makefile | 16 +++++++++++----- upup/models/bindata.go | 18 +++++++++--------- .../k8s-1.12.yaml.template | 6 +++--- .../k8s-1.6.yaml.template | 6 +++--- .../k8s-1.16.yaml.template | 6 +++--- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 4 ++-- .../amazonvpc/manifest.yaml | 12 ++++++------ .../dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 +++--- ...kops-controller.addons.k8s.io-k8s-1.16.yaml | 6 +++--- .../cilium/manifest.yaml | 12 ++++++------ .../dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 +++--- ...kops-controller.addons.k8s.io-k8s-1.16.yaml | 6 +++--- .../simple/manifest.yaml | 12 ++++++------ .../weave/manifest.yaml | 12 ++++++------ version.go | 4 ++-- 15 files changed, 69 insertions(+), 63 deletions(-) diff --git a/Makefile b/Makefile index 698ef361ec..321ef98b37 100644 --- a/Makefile +++ b/Makefile @@ -53,9 +53,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.18.0-alpha.2 +DNS_CONTROLLER_TAG=1.18.0-alpha.3 # Keep in sync with upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/ -KOPS_CONTROLLER_TAG=1.18.0-alpha.2 +KOPS_CONTROLLER_TAG=1.18.0-alpha.3 # Keep in sync with logic in get_workspace_status # TODO: just invoke tools/get_workspace_status.sh? @@ -437,9 +437,15 @@ dns-controller-push: .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/bindata.go b/upup/models/bindata.go index e477c0aab4..fa6de4c40d 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -1902,7 +1902,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.18.0-alpha.2 + version: v1.18.0-alpha.3 spec: replicas: 1 selector: @@ -1913,7 +1913,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.18.0-alpha.2 + version: v1.18.0-alpha.3 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: @@ -1927,7 +1927,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: kope/dns-controller:1.18.0-alpha.2 + image: kope/dns-controller:1.18.0-alpha.3 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" @@ -2036,7 +2036,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.18.0-alpha.2 + version: v1.18.0-alpha.3 spec: replicas: 1 selector: @@ -2047,7 +2047,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.18.0-alpha.2 + version: v1.18.0-alpha.3 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' # For 1.6, we keep the old tolerations in case of a downgrade to 1.5 @@ -2063,7 +2063,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: kope/dns-controller:1.18.0-alpha.2 + image: kope/dns-controller:1.18.0-alpha.3 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" @@ -2441,7 +2441,7 @@ metadata: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.18.0-alpha.2 + version: v1.18.0-alpha.3 spec: selector: matchLabels: @@ -2455,7 +2455,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.18.0-alpha.2 + version: v1.18.0-alpha.3 spec: priorityClassName: system-node-critical tolerations: @@ -2468,7 +2468,7 @@ spec: serviceAccount: kops-controller containers: - name: kops-controller - image: kope/kops-controller:1.18.0-alpha.2 + image: kope/kops-controller:1.18.0-alpha.3 volumeMounts: {{ if .UseHostCertificates }} - mountPath: /etc/ssl/certs 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 a5032aec2a..5292597c6e 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.18.0-alpha.2 + version: v1.18.0-alpha.3 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.18.0-alpha.2 + version: v1.18.0-alpha.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.18.0-alpha.2 + image: kope/dns-controller:1.18.0-alpha.3 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 cfa6a56c76..65b87978ec 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.18.0-alpha.2 + version: v1.18.0-alpha.3 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.18.0-alpha.2 + version: v1.18.0-alpha.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.18.0-alpha.2 + image: kope/dns-controller:1.18.0-alpha.3 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 c183f15ce4..fb8059f37d 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.18.0-alpha.2 + version: v1.18.0-alpha.3 spec: selector: matchLabels: @@ -33,7 +33,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.18.0-alpha.2 + version: v1.18.0-alpha.3 spec: priorityClassName: system-node-critical tolerations: @@ -46,7 +46,7 @@ spec: serviceAccount: kops-controller containers: - name: kops-controller - image: kope/kops-controller:1.18.0-alpha.2 + image: kope/kops-controller:1.18.0-alpha.3 volumeMounts: {{ if .UseHostCertificates }} - mountPath: /etc/ssl/certs diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index eb33a55343..36afeb0342 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -121,7 +121,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { { key := "kops-controller.addons.k8s.io" - version := "1.18.0-alpha.2" + version := "1.18.0-alpha.3" { location := key + "/k8s-1.16.yaml" @@ -384,7 +384,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { if externalDNS == nil || !externalDNS.Disable { { key := "dns-controller.addons.k8s.io" - version := "1.18.0-alpha.2" + version := "1.18.0-alpha.3" { location := key + "/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 90f3ea7bef..6e12191fad 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: 9c35881670887d269f0eac0fa1f0c20509e6a8bb + manifestHash: 03852185a7f76734edc29188f38b11b0a69d211f name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.18.0-alpha.2 + version: 1.18.0-alpha.3 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -57,19 +57,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: 8fe461c2c25819f45f4a49aaa9eabc0118df9ecd + manifestHash: 9215321bd31881305f4a6e96a7d7bfb722d9388c name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.18.0-alpha.2 + version: 1.18.0-alpha.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: fb4ca0b799e7abed37996848a889513f586a1539 + manifestHash: 05888879a235e345795776c9678acf2f15e92c56 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.18.0-alpha.2 + version: 1.18.0-alpha.3 - 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 78a605478a..cc35e267d0 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.18.0-alpha.2 + version: v1.18.0-alpha.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.18.0-alpha.2 + version: v1.18.0-alpha.3 spec: containers: - command: @@ -32,7 +32,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: kope/dns-controller:1.18.0-alpha.2 + image: kope/dns-controller:1.18.0-alpha.3 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 22a7977ca6..646d28217e 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.18.0-alpha.2 + version: v1.18.0-alpha.3 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.18.0-alpha.2 + version: v1.18.0-alpha.3 spec: containers: - command: - /usr/bin/kops-controller - --v=2 - --conf=/etc/kubernetes/kops-controller/config.yaml - image: kope/kops-controller:1.18.0-alpha.2 + image: kope/kops-controller:1.18.0-alpha.3 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 e087ffe352..6deef0ca25 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: 9c35881670887d269f0eac0fa1f0c20509e6a8bb + manifestHash: 03852185a7f76734edc29188f38b11b0a69d211f name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.18.0-alpha.2 + version: 1.18.0-alpha.3 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -57,19 +57,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: 8fe461c2c25819f45f4a49aaa9eabc0118df9ecd + manifestHash: 9215321bd31881305f4a6e96a7d7bfb722d9388c name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.18.0-alpha.2 + version: 1.18.0-alpha.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: fb4ca0b799e7abed37996848a889513f586a1539 + manifestHash: 05888879a235e345795776c9678acf2f15e92c56 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.18.0-alpha.2 + version: 1.18.0-alpha.3 - 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 78a605478a..cc35e267d0 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.18.0-alpha.2 + version: v1.18.0-alpha.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.18.0-alpha.2 + version: v1.18.0-alpha.3 spec: containers: - command: @@ -32,7 +32,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: kope/dns-controller:1.18.0-alpha.2 + image: kope/dns-controller:1.18.0-alpha.3 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 22a7977ca6..646d28217e 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.18.0-alpha.2 + version: v1.18.0-alpha.3 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.18.0-alpha.2 + version: v1.18.0-alpha.3 spec: containers: - command: - /usr/bin/kops-controller - --v=2 - --conf=/etc/kubernetes/kops-controller/config.yaml - image: kope/kops-controller:1.18.0-alpha.2 + image: kope/kops-controller:1.18.0-alpha.3 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 db8de8ae90..a6e8975649 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: 9c35881670887d269f0eac0fa1f0c20509e6a8bb + manifestHash: 03852185a7f76734edc29188f38b11b0a69d211f name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.18.0-alpha.2 + version: 1.18.0-alpha.3 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -57,19 +57,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: 8fe461c2c25819f45f4a49aaa9eabc0118df9ecd + manifestHash: 9215321bd31881305f4a6e96a7d7bfb722d9388c name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.18.0-alpha.2 + version: 1.18.0-alpha.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: fb4ca0b799e7abed37996848a889513f586a1539 + manifestHash: 05888879a235e345795776c9678acf2f15e92c56 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.18.0-alpha.2 + version: 1.18.0-alpha.3 - 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 959dc8a549..46dcad02fd 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: 9c35881670887d269f0eac0fa1f0c20509e6a8bb + manifestHash: 03852185a7f76734edc29188f38b11b0a69d211f name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.18.0-alpha.2 + version: 1.18.0-alpha.3 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -57,19 +57,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: 8fe461c2c25819f45f4a49aaa9eabc0118df9ecd + manifestHash: 9215321bd31881305f4a6e96a7d7bfb722d9388c name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.18.0-alpha.2 + version: 1.18.0-alpha.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: fb4ca0b799e7abed37996848a889513f586a1539 + manifestHash: 05888879a235e345795776c9678acf2f15e92c56 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.18.0-alpha.2 + version: 1.18.0-alpha.3 - 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 b3e382b751..c418fe2114 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.18.0-alpha.2" - KOPS_CI_VERSION = "1.18.0-alpha.3" + KOPS_RELEASE_VERSION = "1.18.0-alpha.3" + KOPS_CI_VERSION = "1.18.0-alpha.4" ) // GitVersion should be replaced by the makefile