From c80fe730bdbdc3d27d67bb643a25854eff461367 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sat, 21 Nov 2020 23:09:09 +0200 Subject: [PATCH] Release 1.19.0-beta.2 --- Makefile | 6 ++--- pkg/model/components/kubeapiserver/model.go | 2 +- .../kubeapiserver/tests/minimal/tasks.yaml | 2 +- upup/models/bindata.go | 18 +++++++------- .../k8s-1.12.yaml.template | 6 ++--- .../k8s-1.6.yaml.template | 6 ++--- .../k8s-1.16.yaml.template | 6 ++--- .../pkg/fi/cloudup/bootstrapchannelbuilder.go | 6 ++--- .../amazonvpc/manifest.yaml | 12 +++++----- .../awsiamauthenticator/manifest.yaml | 12 +++++----- ...dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 ++--- ...ops-controller.addons.k8s.io-k8s-1.16.yaml | 6 ++--- .../cilium/manifest.yaml | 12 +++++----- .../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 | 14 +++++------ ...dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 ++--- ...ops-controller.addons.k8s.io-k8s-1.16.yaml | 6 ++--- .../simple/manifest.yaml | 12 +++++----- .../weave/manifest.yaml | 12 +++++----- upup/pkg/fi/cloudup/urls_test.go | 24 +++++++++---------- version.go | 4 ++-- 23 files changed, 96 insertions(+), 96 deletions(-) diff --git a/Makefile b/Makefile index c7db5b0290164..42c606b880396 100644 --- a/Makefile +++ b/Makefile @@ -67,13 +67,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.19.0-beta.1 +DNS_CONTROLLER_TAG=1.19.0-beta.2 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.19.0-beta.1 +KOPS_CONTROLLER_TAG=1.19.0-beta.2 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.19.0-beta.1 +KUBE_APISERVER_HEALTHCHECK_TAG=1.19.0-beta.2 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 1be2000893ff1..4d66dc9f39874 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.19.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-beta.2 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 abf7cabd65e2b..4311fc2485892 100644 --- a/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml +++ b/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml @@ -14,7 +14,7 @@ Contents: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/upup/models/bindata.go b/upup/models/bindata.go index d4411046ea92a..454ef4c80cf54 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -2212,7 +2212,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-beta.1 + version: v1.19.0-beta.2 spec: replicas: 1 strategy: @@ -2225,7 +2225,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-beta.1 + version: v1.19.0-beta.2 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: @@ -2239,7 +2239,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" @@ -2348,7 +2348,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-beta.1 + version: v1.19.0-beta.2 spec: replicas: 1 selector: @@ -2359,7 +2359,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-beta.1 + version: v1.19.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 @@ -2375,7 +2375,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" @@ -2753,7 +2753,7 @@ metadata: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.19.0-beta.1 + version: v1.19.0-beta.2 spec: selector: matchLabels: @@ -2767,7 +2767,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.19.0-beta.1 + version: v1.19.0-beta.2 {{ if UseKopsControllerForNodeBootstrap }} annotations: dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }} @@ -2785,7 +2785,7 @@ spec: serviceAccount: kops-controller containers: - name: kops-controller - image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.2 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 dc01207ae7485..9c9927df46d7e 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.19.0-beta.1 + version: v1.19.0-beta.2 spec: replicas: 1 strategy: @@ -19,7 +19,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-beta.1 + version: v1.19.0-beta.2 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.19.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.19.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 80d00e25a147a..da2b5fe790222 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.19.0-beta.1 + version: v1.19.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.19.0-beta.1 + version: v1.19.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: k8s.gcr.io/kops/dns-controller:1.19.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.19.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 b38b8bfa6ff9d..bc65f80d82c7c 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.19.0-beta.1 + version: v1.19.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.19.0-beta.1 + version: v1.19.0-beta.2 {{ 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.19.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.19.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 c27ed50c4584f..4d6bd5945c06b 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -172,7 +172,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann { key := "kops-controller.addons.k8s.io" - version := "1.19.0-beta.1" + version := "1.19.0-beta.2" { location := key + "/k8s-1.16.yaml" @@ -191,7 +191,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann if featureflag.PublicJWKS.Enabled() { key := "anonymous-issuer-discovery.addons.k8s.io" - version := "1.19.0-beta.1" + version := "1.19.0-beta.2" { location := key + "/k8s-1.16.yaml" @@ -439,7 +439,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann if externalDNS == nil || !externalDNS.Disable { { key := "dns-controller.addons.k8s.io" - version := "1.19.0-beta.1" + version := "1.19.0-beta.2" { 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 631e3586f461c..a03d4ac93d3b5 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: 5ed0e7436ab350bb4e287e27f7e5aa2fb1eaf8f9 + manifestHash: 5b7765907ec5720081c13c0cab2d32b99053e7c8 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.0-beta.2 - 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: 8db00eba7dbdec5e18e4692f3b35760146d8fa4c + manifestHash: 8ea4cfe1b036ac2c03f570066799a5e13928db04 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.0-beta.2 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: ce7de4257bc531869a3bcc20ef50bd183dc9dcf0 + manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.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/awsiamauthenticator/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml index 6874be56d1a71..48a9ce0dc7d79 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: 5a0a74b65c83649d0a494311a55e7c39a98475a6 + manifestHash: 68aa7f9ecd2d264b5b1dbc5c72d161420f455427 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.0-beta.2 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -50,19 +50,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: 8db00eba7dbdec5e18e4692f3b35760146d8fa4c + manifestHash: 8ea4cfe1b036ac2c03f570066799a5e13928db04 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.0-beta.2 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: ce7de4257bc531869a3bcc20ef50bd183dc9dcf0 + manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.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 37aa49d101b32..d288c4daa10fb 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.19.0-beta.1 + version: v1.19.0-beta.2 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.19.0-beta.1 + version: v1.19.0-beta.2 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.19.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.19.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 c97928cdbcf7d..3871b7b86ac26 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.19.0-beta.1 + version: v1.19.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.19.0-beta.1 + version: v1.19.0-beta.2 spec: containers: - command: - /kops-controller - --v=2 - --conf=/etc/kubernetes/kops-controller/config/config.yaml - image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.19.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 8112888d9d70c..06053ece08e6e 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: 5ed0e7436ab350bb4e287e27f7e5aa2fb1eaf8f9 + manifestHash: 5b7765907ec5720081c13c0cab2d32b99053e7c8 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.0-beta.2 - 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: 8db00eba7dbdec5e18e4692f3b35760146d8fa4c + manifestHash: 8ea4cfe1b036ac2c03f570066799a5e13928db04 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.0-beta.2 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: ce7de4257bc531869a3bcc20ef50bd183dc9dcf0 + manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.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/jwks/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml index 1a38470be1f69..945e6a2de8e37 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.19.0-beta.1 + version: 1.19.0-beta.2 - 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 ad3db799f2b98..1af53c90d7428 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.19.0-beta.1 + version: v1.19.0-beta.2 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.19.0-beta.1 + version: v1.19.0-beta.2 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.19.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2 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 c97928cdbcf7d..3871b7b86ac26 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.19.0-beta.1 + version: v1.19.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.19.0-beta.1 + version: v1.19.0-beta.2 spec: containers: - command: - /kops-controller - --v=2 - --conf=/etc/kubernetes/kops-controller/config/config.yaml - image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.2 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 857029d0299e8..532c35b50769e 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: 5ed0e7436ab350bb4e287e27f7e5aa2fb1eaf8f9 + manifestHash: 5b7765907ec5720081c13c0cab2d32b99053e7c8 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.0-beta.2 - 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.19.0-beta.1 + version: 1.19.0-beta.2 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -65,19 +65,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: 8db00eba7dbdec5e18e4692f3b35760146d8fa4c + manifestHash: 8ea4cfe1b036ac2c03f570066799a5e13928db04 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.0-beta.2 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 85434c74cf83a50ba33843ed7bafce5cb5891fdb + manifestHash: 3d1dd61bf3c70c46e30db8014bd3a0ff6efe6301 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.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 37aa49d101b32..d288c4daa10fb 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.19.0-beta.1 + version: v1.19.0-beta.2 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.19.0-beta.1 + version: v1.19.0-beta.2 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.19.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.19.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 76d52bab77b98..1a67d15ae7610 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.19.0-beta.1 + version: v1.19.0-beta.2 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.19.0-beta.1 + version: v1.19.0-beta.2 spec: containers: - command: - /kops-controller - --v=2 - --conf=/etc/kubernetes/kops-controller/config/config.yaml - image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.19.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 605f9b664626b..0fbab9869a10b 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: 5a0a74b65c83649d0a494311a55e7c39a98475a6 + manifestHash: 68aa7f9ecd2d264b5b1dbc5c72d161420f455427 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.0-beta.2 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -50,19 +50,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: 8db00eba7dbdec5e18e4692f3b35760146d8fa4c + manifestHash: 8ea4cfe1b036ac2c03f570066799a5e13928db04 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.0-beta.2 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: ce7de4257bc531869a3bcc20ef50bd183dc9dcf0 + manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.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 c89525a8af81d..f9dbd8699952e 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: 5ed0e7436ab350bb4e287e27f7e5aa2fb1eaf8f9 + manifestHash: 5b7765907ec5720081c13c0cab2d32b99053e7c8 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.0-beta.2 - 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: 8db00eba7dbdec5e18e4692f3b35760146d8fa4c + manifestHash: 8ea4cfe1b036ac2c03f570066799a5e13928db04 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.0-beta.2 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: ce7de4257bc531869a3bcc20ef50bd183dc9dcf0 + manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.1 + version: 1.19.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/urls_test.go b/upup/pkg/fi/cloudup/urls_test.go index 61018523ed81d..06aec5e993cdd 100644 --- a/upup/pkg/fi/cloudup/urls_test.go +++ b/upup/pkg/fi/cloudup/urls_test.go @@ -35,33 +35,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.19.0-beta.1/images/protokube-linux-amd64", - "https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.1/images-protokube-linux-amd64", - "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.1/images/protokube-linux-amd64", + "https://artifacts.k8s.io/binaries/kops/1.19.0-beta.2/images/protokube-linux-amd64", + "https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.2/images-protokube-linux-amd64", + "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.2/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.19.0-beta.1/images/protokube-linux-arm64", - "https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.1/images-protokube-linux-arm64", - "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.1/images/protokube-linux-arm64", + "https://artifacts.k8s.io/binaries/kops/1.19.0-beta.2/images/protokube-linux-arm64", + "https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.2/images-protokube-linux-arm64", + "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.2/images/protokube-linux-arm64", }, }, { url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/amd64/nodeup", expected: []string{ - "https://artifacts.k8s.io/binaries/kops/1.19.0-beta.1/linux/amd64/nodeup", - "https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.1/nodeup-linux-amd64", - "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.1/linux/amd64/nodeup", + "https://artifacts.k8s.io/binaries/kops/1.19.0-beta.2/linux/amd64/nodeup", + "https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.2/nodeup-linux-amd64", + "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.2/linux/amd64/nodeup", }, }, { url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/arm64/nodeup", expected: []string{ - "https://artifacts.k8s.io/binaries/kops/1.19.0-beta.1/linux/arm64/nodeup", - "https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.1/nodeup-linux-arm64", - "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.1/linux/arm64/nodeup", + "https://artifacts.k8s.io/binaries/kops/1.19.0-beta.2/linux/arm64/nodeup", + "https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.2/nodeup-linux-arm64", + "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.2/linux/arm64/nodeup", }, }, } diff --git a/version.go b/version.go index 04624414c94d5..551fbbb42d5a8 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.19.0-beta.1" - KOPS_CI_VERSION = "1.19.0-beta.2" + KOPS_RELEASE_VERSION = "1.19.0-beta.2" + KOPS_CI_VERSION = "1.19.0-beta.3" ) // GitVersion should be replaced by the makefile