From e5bad4db81bf0d26d0df6cb0e98dc76281a35bc5 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 23 Feb 2021 09:04:56 +0200 Subject: [PATCH] Release 1.20.0-beta.1 --- Makefile | 6 ++--- pkg/model/components/kubeapiserver/model.go | 2 +- .../kubeapiserver/tests/minimal/tasks.yaml | 2 +- upup/models/bindata.go | 12 +++++----- .../k8s-1.12.yaml.template | 6 ++--- .../k8s-1.16.yaml.template | 6 ++--- .../bootstrapchannelbuilder.go | 6 ++--- .../amazonvpc-containerd/manifest.yaml | 8 +++---- .../amazonvpc/manifest.yaml | 8 +++---- .../awscloudcontroller/manifest.yaml | 8 +++---- .../awsiamauthenticator/manifest.yaml | 8 +++---- ...dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 ++--- ...ops-controller.addons.k8s.io-k8s-1.16.yaml | 6 ++--- .../cilium/manifest.yaml | 8 +++---- .../jwks/manifest.yaml | 2 +- ...dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 ++--- ...ops-controller.addons.k8s.io-k8s-1.16.yaml | 6 ++--- .../public-jwks/manifest.yaml | 10 ++++---- ...dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 ++--- ...ops-controller.addons.k8s.io-k8s-1.16.yaml | 6 ++--- .../simple/manifest.yaml | 8 +++---- .../weave/manifest.yaml | 8 +++---- upup/pkg/fi/cloudup/urls_test.go | 24 +++++++++---------- version.go | 4 ++-- 24 files changed, 86 insertions(+), 86 deletions(-) diff --git a/Makefile b/Makefile index 9443c58243e4e..47c7cf342178e 100644 --- a/Makefile +++ b/Makefile @@ -66,13 +66,13 @@ PROTOKUBE_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_PROTOKUBE_TAG # We lock the versions of our controllers also # We need to keep in sync with: # upup/models/cloudup/resources/addons/dns-controller/ -DNS_CONTROLLER_TAG=1.20.0-alpha.2 +DNS_CONTROLLER_TAG=1.20.0-beta.1 DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}') # upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/ -KOPS_CONTROLLER_TAG=1.20.0-alpha.2 +KOPS_CONTROLLER_TAG=1.20.0-beta.1 KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}') # pkg/model/components/kubeapiserver/model.go -KUBE_APISERVER_HEALTHCHECK_TAG=1.20.0-alpha.2 +KUBE_APISERVER_HEALTHCHECK_TAG=1.20.0-beta.1 KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}') diff --git a/pkg/model/components/kubeapiserver/model.go b/pkg/model/components/kubeapiserver/model.go index ba1fdac163380..8948429e92d2a 100644 --- a/pkg/model/components/kubeapiserver/model.go +++ b/pkg/model/components/kubeapiserver/model.go @@ -95,7 +95,7 @@ kind: Pod spec: containers: - name: healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.20.0-alpha.2 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.20.0-beta.1 livenessProbe: httpGet: # The sidecar serves a healthcheck on the same port, diff --git a/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml b/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml index 22a6f0896b83f..caef9eae4ffe4 100644 --- a/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml +++ b/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml @@ -12,7 +12,7 @@ Contents: | - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.20.0-alpha.2 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.20.0-beta.1 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/upup/models/bindata.go b/upup/models/bindata.go index 568770c1fc5fd..3a14b906a0ec5 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -29238,7 +29238,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.20.0-alpha.2 + version: v1.20.0-beta.1 spec: replicas: 1 strategy: @@ -29251,7 +29251,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.20.0-alpha.2 + version: v1.20.0-beta.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: @@ -29265,7 +29265,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: k8s.gcr.io/kops/dns-controller:1.20.0-alpha.2 + image: k8s.gcr.io/kops/dns-controller:1.20.0-beta.1 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" @@ -29537,7 +29537,7 @@ metadata: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.20.0-alpha.2 + version: v1.20.0-beta.1 spec: selector: matchLabels: @@ -29551,7 +29551,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.20.0-alpha.2 + version: v1.20.0-beta.1 {{ if UseKopsControllerForNodeBootstrap }} annotations: dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }} @@ -29569,7 +29569,7 @@ spec: serviceAccount: kops-controller containers: - name: kops-controller - image: k8s.gcr.io/kops/kops-controller:1.20.0-alpha.2 + image: k8s.gcr.io/kops/kops-controller:1.20.0-beta.1 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 02598b157029e..a603ce0653473 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.20.0-alpha.2 + version: v1.20.0-beta.1 spec: replicas: 1 strategy: @@ -19,7 +19,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.20.0-alpha.2 + version: v1.20.0-beta.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: @@ -33,7 +33,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: k8s.gcr.io/kops/dns-controller:1.20.0-alpha.2 + image: k8s.gcr.io/kops/dns-controller:1.20.0-beta.1 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 ddbc940c0c96b..4a4e06087b83d 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.20.0-alpha.2 + version: v1.20.0-beta.1 spec: selector: matchLabels: @@ -33,7 +33,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.20.0-alpha.2 + version: v1.20.0-beta.1 {{ if UseKopsControllerForNodeBootstrap }} annotations: dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }} @@ -51,7 +51,7 @@ spec: serviceAccount: kops-controller containers: - name: kops-controller - image: k8s.gcr.io/kops/kops-controller:1.20.0-alpha.2 + image: k8s.gcr.io/kops/kops-controller:1.20.0-beta.1 volumeMounts: {{ if .UseHostCertificates }} - mountPath: /etc/ssl/certs diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go index c2c2055fb03dd..eb565fd51a9cf 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go @@ -209,7 +209,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann { key := "kops-controller.addons.k8s.io" - version := "1.20.0-alpha.2" + version := "1.20.0-beta.1" { location := key + "/k8s-1.16.yaml" @@ -228,7 +228,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann if featureflag.PublicJWKS.Enabled() { key := "anonymous-issuer-discovery.addons.k8s.io" - version := "1.20.0-alpha.2" + version := "1.20.0-beta.1" { location := key + "/k8s-1.16.yaml" @@ -402,7 +402,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann if externalDNS == nil || !externalDNS.Disable { { key := "dns-controller.addons.k8s.io" - version := "1.20.0-alpha.2" + version := "1.20.0-beta.1" { location := key + "/k8s-1.12.yaml" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml index 235b74a7a1942..1a21b79707a73 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/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: da1b535bde00a6d8c8867d7eb5466f49bb549523 + manifestHash: eb47753637f2527da44b97a4048a2c8fe8eff904 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -47,11 +47,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d + manifestHash: 6dd8708e4042a1876cff7a087379500688b86e0a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - 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/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index c305d40a87168..8103212cf9f41 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: da1b535bde00a6d8c8867d7eb5466f49bb549523 + manifestHash: eb47753637f2527da44b97a4048a2c8fe8eff904 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -47,11 +47,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d + manifestHash: 6dd8708e4042a1876cff7a087379500688b86e0a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - 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/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index d6258a1e07b52..502ddf977d9d9 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/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: 56e24f1a62bc259aef0f634ab6e036e2ec553cfd + manifestHash: 6f53b6d3c9574edf9223342e8045f17b2f0e9b56 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -40,11 +40,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d + manifestHash: 6dd8708e4042a1876cff7a087379500688b86e0a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - 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/awsiamauthenticator/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml index 133761b3f5c17..41799d41bf90a 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/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: 56e24f1a62bc259aef0f634ab6e036e2ec553cfd + manifestHash: 6f53b6d3c9574edf9223342e8045f17b2f0e9b56 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -40,11 +40,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d + manifestHash: 6dd8708e4042a1876cff7a087379500688b86e0a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - 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 4ca08675a6a16..02df31a685eaf 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.20.0-alpha.2 + version: v1.20.0-beta.1 name: dns-controller namespace: kube-system spec: @@ -21,7 +21,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.20.0-alpha.2 + version: v1.20.0-beta.1 spec: containers: - command: @@ -34,7 +34,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.20.0-alpha.2 + image: k8s.gcr.io/kops/dns-controller:1.20.0-beta.1 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 846924d3b2dd6..08ed4a3e6e174 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.20.0-alpha.2 + version: v1.20.0-beta.1 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.20.0-alpha.2 + version: v1.20.0-beta.1 spec: containers: - command: - /kops-controller - --v=2 - --conf=/etc/kubernetes/kops-controller/config/config.yaml - image: k8s.gcr.io/kops/kops-controller:1.20.0-alpha.2 + image: k8s.gcr.io/kops/kops-controller:1.20.0-beta.1 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 02c429ef6e214..e788e3c6468d8 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: da1b535bde00a6d8c8867d7eb5466f49bb549523 + manifestHash: eb47753637f2527da44b97a4048a2c8fe8eff904 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -47,11 +47,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d + manifestHash: 6dd8708e4042a1876cff7a087379500688b86e0a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - 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/jwks/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml index be2e89f99b686..dce509f0d83a0 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml @@ -19,7 +19,7 @@ spec: name: anonymous-access.addons.k8s.io selector: k8s-addon: anonymous-access.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/dns-controller.addons.k8s.io-k8s-1.12.yaml index 3679d92671d5a..13f5f5238db02 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/dns-controller.addons.k8s.io-k8s-1.12.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/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.20.0-alpha.2 + version: v1.20.0-beta.1 name: dns-controller namespace: kube-system spec: @@ -21,7 +21,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.20.0-alpha.2 + version: v1.20.0-beta.1 spec: containers: - command: @@ -38,7 +38,7 @@ spec: value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: k8s.gcr.io/kops/dns-controller:1.20.0-alpha.2 + image: k8s.gcr.io/kops/dns-controller:1.20.0-beta.1 name: dns-controller resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/kops-controller.addons.k8s.io-k8s-1.16.yaml index 846924d3b2dd6..08ed4a3e6e174 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/kops-controller.addons.k8s.io-k8s-1.16.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/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.20.0-alpha.2 + version: v1.20.0-beta.1 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.20.0-alpha.2 + version: v1.20.0-beta.1 spec: containers: - command: - /kops-controller - --v=2 - --conf=/etc/kubernetes/kops-controller/config/config.yaml - image: k8s.gcr.io/kops/kops-controller:1.20.0-alpha.2 + image: k8s.gcr.io/kops/kops-controller:1.20.0-beta.1 name: kops-controller resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml index f144ee636147d..fa0d44f4f5576 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/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: da1b535bde00a6d8c8867d7eb5466f49bb549523 + manifestHash: eb47753637f2527da44b97a4048a2c8fe8eff904 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - id: k8s-1.16 kubernetesVersion: '>=1.16.0-alpha.0' manifest: anonymous-issuer-discovery.addons.k8s.io/k8s-1.16.yaml @@ -19,7 +19,7 @@ spec: name: anonymous-issuer-discovery.addons.k8s.io selector: k8s-addon: anonymous-issuer-discovery.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -55,11 +55,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 38adb18d34859a112ab1122ea089fea558ec7893 + manifestHash: f7255846299a89f8d500c0805c34e5d3e59d0d43 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - 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 4ca08675a6a16..02df31a685eaf 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.20.0-alpha.2 + version: v1.20.0-beta.1 name: dns-controller namespace: kube-system spec: @@ -21,7 +21,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.20.0-alpha.2 + version: v1.20.0-beta.1 spec: containers: - command: @@ -34,7 +34,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.20.0-alpha.2 + image: k8s.gcr.io/kops/dns-controller:1.20.0-beta.1 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 a89f63adee13c..4e8d4b8798743 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.20.0-alpha.2 + version: v1.20.0-beta.1 name: kops-controller namespace: kube-system spec: @@ -31,14 +31,14 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.20.0-alpha.2 + version: v1.20.0-beta.1 spec: containers: - command: - /kops-controller - --v=2 - --conf=/etc/kubernetes/kops-controller/config/config.yaml - image: k8s.gcr.io/kops/kops-controller:1.20.0-alpha.2 + image: k8s.gcr.io/kops/kops-controller:1.20.0-beta.1 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 68947c8c97464..97578476b524b 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: 56e24f1a62bc259aef0f634ab6e036e2ec553cfd + manifestHash: 6f53b6d3c9574edf9223342e8045f17b2f0e9b56 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -40,11 +40,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d + manifestHash: 6dd8708e4042a1876cff7a087379500688b86e0a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - 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 bb80447ffe383..bc8bd80610413 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: 56e24f1a62bc259aef0f634ab6e036e2ec553cfd + manifestHash: 6f53b6d3c9574edf9223342e8045f17b2f0e9b56 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -40,11 +40,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d + manifestHash: 6dd8708e4042a1876cff7a087379500688b86e0a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.20.0-alpha.2 + version: 1.20.0-beta.1 - 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/urls_test.go b/upup/pkg/fi/cloudup/urls_test.go index 411f35c2dfb75..dcdb2a605cfa9 100644 --- a/upup/pkg/fi/cloudup/urls_test.go +++ b/upup/pkg/fi/cloudup/urls_test.go @@ -36,33 +36,33 @@ func Test_BuildMirroredAsset(t *testing.T) { { url: "https://kubeupv2.s3.amazonaws.com/kops/%s/images/protokube-linux-amd64", expected: []string{ - "https://artifacts.k8s.io/binaries/kops/1.20.0-alpha.2/images/protokube-linux-amd64", - "https://github.com/kubernetes/kops/releases/download/v1.20.0-alpha.2/images-protokube-linux-amd64", - "https://kubeupv2.s3.amazonaws.com/kops/1.20.0-alpha.2/images/protokube-linux-amd64", + "https://artifacts.k8s.io/binaries/kops/1.20.0-beta.1/images/protokube-linux-amd64", + "https://github.com/kubernetes/kops/releases/download/v1.20.0-beta.1/images-protokube-linux-amd64", + "https://kubeupv2.s3.amazonaws.com/kops/1.20.0-beta.1/images/protokube-linux-amd64", }, }, { url: "https://kubeupv2.s3.amazonaws.com/kops/%s/images/protokube-linux-arm64", expected: []string{ - "https://artifacts.k8s.io/binaries/kops/1.20.0-alpha.2/images/protokube-linux-arm64", - "https://github.com/kubernetes/kops/releases/download/v1.20.0-alpha.2/images-protokube-linux-arm64", - "https://kubeupv2.s3.amazonaws.com/kops/1.20.0-alpha.2/images/protokube-linux-arm64", + "https://artifacts.k8s.io/binaries/kops/1.20.0-beta.1/images/protokube-linux-arm64", + "https://github.com/kubernetes/kops/releases/download/v1.20.0-beta.1/images-protokube-linux-arm64", + "https://kubeupv2.s3.amazonaws.com/kops/1.20.0-beta.1/images/protokube-linux-arm64", }, }, { url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/amd64/nodeup", expected: []string{ - "https://artifacts.k8s.io/binaries/kops/1.20.0-alpha.2/linux/amd64/nodeup", - "https://github.com/kubernetes/kops/releases/download/v1.20.0-alpha.2/nodeup-linux-amd64", - "https://kubeupv2.s3.amazonaws.com/kops/1.20.0-alpha.2/linux/amd64/nodeup", + "https://artifacts.k8s.io/binaries/kops/1.20.0-beta.1/linux/amd64/nodeup", + "https://github.com/kubernetes/kops/releases/download/v1.20.0-beta.1/nodeup-linux-amd64", + "https://kubeupv2.s3.amazonaws.com/kops/1.20.0-beta.1/linux/amd64/nodeup", }, }, { url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/arm64/nodeup", expected: []string{ - "https://artifacts.k8s.io/binaries/kops/1.20.0-alpha.2/linux/arm64/nodeup", - "https://github.com/kubernetes/kops/releases/download/v1.20.0-alpha.2/nodeup-linux-arm64", - "https://kubeupv2.s3.amazonaws.com/kops/1.20.0-alpha.2/linux/arm64/nodeup", + "https://artifacts.k8s.io/binaries/kops/1.20.0-beta.1/linux/arm64/nodeup", + "https://github.com/kubernetes/kops/releases/download/v1.20.0-beta.1/nodeup-linux-arm64", + "https://kubeupv2.s3.amazonaws.com/kops/1.20.0-beta.1/linux/arm64/nodeup", }, }, } diff --git a/version.go b/version.go index 577f6c098522e..62427bf1fce1c 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.20.0-alpha.2" - KOPS_CI_VERSION = "1.20.0-alpha.3" + KOPS_RELEASE_VERSION = "1.20.0-beta.1" + KOPS_CI_VERSION = "1.20.0-beta.2" ) // GitVersion should be replaced by the makefile