diff --git a/Makefile b/Makefile index 7132e520ee..095de3b462 100644 --- a/Makefile +++ b/Makefile @@ -64,13 +64,13 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always) # 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.21.0-alpha.3 +DNS_CONTROLLER_TAG=1.22.0-alpha.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.21.0-alpha.3 +KOPS_CONTROLLER_TAG=1.22.0-alpha.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.21.0-alpha.3 +KUBE_APISERVER_HEALTHCHECK_TAG=1.22.0-alpha.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 e4a599fa15..24c0aa13f1 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.21.0-alpha.3 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-alpha.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 e51a207bf7..68339c2eb9 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.21.0-alpha.3 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-alpha.1 livenessProbe: httpGet: host: 127.0.0.1 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 b47c2f989a..fe7aa106ce 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.21.0-alpha.3 + version: v1.22.0-alpha.1 spec: replicas: 1 strategy: @@ -19,7 +19,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.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.21.0-alpha.3 + image: k8s.gcr.io/kops/dns-controller:1.22.0-alpha.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 74f6f161d1..73659aa290 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.21.0-alpha.3 + version: v1.22.0-alpha.1 spec: selector: matchLabels: @@ -31,7 +31,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 {{ if UseKopsControllerForNodeBootstrap }} annotations: dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }} @@ -49,7 +49,7 @@ spec: serviceAccount: kops-controller containers: - name: kops-controller - image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.3 + image: k8s.gcr.io/kops/kops-controller:1.22.0-alpha.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 2a9c1b503a..aa779e9489 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go @@ -211,7 +211,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann { key := "kops-controller.addons.k8s.io" - version := "1.21.0-alpha.3" + version := "1.22.0-alpha.1" { location := key + "/k8s-1.16.yaml" @@ -386,7 +386,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann if externalDNS == nil || !externalDNS.Disable { { key := "dns-controller.addons.k8s.io" - version := "1.21.0-alpha.3" + version := "1.22.0-alpha.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 9704d7fb34..80f6bf6162 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml @@ -7,12 +7,12 @@ spec: - id: k8s-1.16 kubernetesVersion: '>=1.16.0-alpha.0' manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: a9b3e339b0da476af01be54bcfd68064cb3219e0 + manifestHash: d72db834feceb637342b58e910479e68f9071db2 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4 name: core.addons.k8s.io @@ -48,11 +48,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d178237538d133182002c9826af8ead1b863b6f6 + manifestHash: 582aff25d26f9c6826feb43459bbd4d936c16b4a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.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 bc3f27166e..3edb844db1 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -7,12 +7,12 @@ spec: - id: k8s-1.16 kubernetesVersion: '>=1.16.0-alpha.0' manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: a9b3e339b0da476af01be54bcfd68064cb3219e0 + manifestHash: d72db834feceb637342b58e910479e68f9071db2 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4 name: core.addons.k8s.io @@ -48,11 +48,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d178237538d133182002c9826af8ead1b863b6f6 + manifestHash: 582aff25d26f9c6826feb43459bbd4d936c16b4a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.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 675808d72a..dce8d55179 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml @@ -7,12 +7,12 @@ spec: - id: k8s-1.16 kubernetesVersion: '>=1.16.0-alpha.0' manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: 13c4c6fca314d4349070ed8f9f1f58f284bfebfe + manifestHash: e225462a29ef1cf9c6201f1375cd2511f7a1f665 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4 name: core.addons.k8s.io @@ -41,11 +41,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d178237538d133182002c9826af8ead1b863b6f6 + manifestHash: 582aff25d26f9c6826feb43459bbd4d936c16b4a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.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 886ebf4876..a773f5e7d7 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml @@ -7,12 +7,12 @@ spec: - id: k8s-1.16 kubernetesVersion: '>=1.16.0-alpha.0' manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: 13c4c6fca314d4349070ed8f9f1f58f284bfebfe + manifestHash: e225462a29ef1cf9c6201f1375cd2511f7a1f665 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4 name: core.addons.k8s.io @@ -41,11 +41,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d178237538d133182002c9826af8ead1b863b6f6 + manifestHash: 582aff25d26f9c6826feb43459bbd4d936c16b4a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.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 b2fccc0c32..99d5e34829 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,11 +4,11 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: dns-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 name: dns-controller namespace: kube-system spec: @@ -25,7 +25,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 spec: containers: - command: @@ -38,7 +38,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.3 + image: k8s.gcr.io/kops/dns-controller:1.22.0-alpha.1 name: dns-controller resources: requests: @@ -63,7 +63,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: dns-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io name: dns-controller @@ -77,7 +77,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: dns-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io name: kops:dns-controller @@ -111,7 +111,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: dns-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io name: kops:dns-controller 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 81d4cfdff2..53af24e739 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 @@ -7,7 +7,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -21,11 +21,11 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.3 + image: k8s.gcr.io/kops/kops-controller:1.22.0-alpha.1 name: kops-controller resources: requests: @@ -89,7 +89,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -103,7 +103,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -126,7 +126,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -147,7 +147,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -194,7 +194,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index 762cfe48c4..8a353c5942 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -7,12 +7,12 @@ spec: - id: k8s-1.16 kubernetesVersion: '>=1.16.0-alpha.0' manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: a9b3e339b0da476af01be54bcfd68064cb3219e0 + manifestHash: d72db834feceb637342b58e910479e68f9071db2 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4 name: core.addons.k8s.io @@ -48,11 +48,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d178237538d133182002c9826af8ead1b863b6f6 + manifestHash: 582aff25d26f9c6826feb43459bbd4d936c16b4a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.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 4b7d691b0f..328f79b280 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.21.0-alpha.3 + version: 1.22.0-alpha.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/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml index ddf06f861e..5b106dc493 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml @@ -4,11 +4,11 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: dns-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 name: dns-controller namespace: kube-system spec: @@ -25,7 +25,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 spec: containers: - command: @@ -42,7 +42,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.21.0-alpha.3 + image: k8s.gcr.io/kops/dns-controller:1.22.0-alpha.1 name: dns-controller resources: requests: @@ -82,7 +82,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: dns-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io name: dns-controller @@ -96,7 +96,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: dns-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io name: kops:dns-controller @@ -130,7 +130,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: dns-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io name: kops:dns-controller diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml index 81d4cfdff2..53af24e739 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml @@ -7,7 +7,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -21,11 +21,11 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.3 + image: k8s.gcr.io/kops/kops-controller:1.22.0-alpha.1 name: kops-controller resources: requests: @@ -89,7 +89,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -103,7 +103,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -126,7 +126,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -147,7 +147,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -194,7 +194,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml index ab6b03948a..80cb60cb35 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml @@ -7,12 +7,12 @@ spec: - id: k8s-1.16 kubernetesVersion: '>=1.16.0-alpha.0' manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: a9b3e339b0da476af01be54bcfd68064cb3219e0 + manifestHash: d72db834feceb637342b58e910479e68f9071db2 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4 name: core.addons.k8s.io @@ -48,11 +48,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 498237014e0d454dab24f4ad84e61b5db6a711ed + manifestHash: e8b80aac79ee32924e2ccb01aa9475bfa46db908 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.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 b2fccc0c32..99d5e34829 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,11 +4,11 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: dns-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 name: dns-controller namespace: kube-system spec: @@ -25,7 +25,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 spec: containers: - command: @@ -38,7 +38,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.3 + image: k8s.gcr.io/kops/dns-controller:1.22.0-alpha.1 name: dns-controller resources: requests: @@ -63,7 +63,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: dns-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io name: dns-controller @@ -77,7 +77,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: dns-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io name: kops:dns-controller @@ -111,7 +111,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: dns-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io name: kops:dns-controller 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 d8392758af..5154689b70 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 @@ -7,7 +7,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -21,11 +21,11 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 name: kops-controller namespace: kube-system spec: @@ -39,7 +39,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.21.0-alpha.3 + version: v1.22.0-alpha.1 spec: containers: - command: @@ -49,7 +49,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.3 + image: k8s.gcr.io/kops/kops-controller:1.22.0-alpha.1 name: kops-controller resources: requests: @@ -91,7 +91,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -105,7 +105,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -128,7 +128,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -149,7 +149,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller @@ -196,7 +196,7 @@ metadata: creationTimestamp: null labels: addon.kops.k8s.io/name: kops-controller.addons.k8s.io - addon.kops.k8s.io/version: 1.21.0-alpha.3 + addon.kops.k8s.io/version: 1.22.0-alpha.1 app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io name: kops-controller diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 356d6a7d72..0de5b11f70 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -7,12 +7,12 @@ spec: - id: k8s-1.16 kubernetesVersion: '>=1.16.0-alpha.0' manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: 13c4c6fca314d4349070ed8f9f1f58f284bfebfe + manifestHash: e225462a29ef1cf9c6201f1375cd2511f7a1f665 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4 name: core.addons.k8s.io @@ -41,11 +41,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d178237538d133182002c9826af8ead1b863b6f6 + manifestHash: 582aff25d26f9c6826feb43459bbd4d936c16b4a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.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 e8f046e51c..04334d181b 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -7,12 +7,12 @@ spec: - id: k8s-1.16 kubernetesVersion: '>=1.16.0-alpha.0' manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: 13c4c6fca314d4349070ed8f9f1f58f284bfebfe + manifestHash: e225462a29ef1cf9c6201f1375cd2511f7a1f665 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4 name: core.addons.k8s.io @@ -41,11 +41,11 @@ spec: version: 1.5.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: d178237538d133182002c9826af8ead1b863b6f6 + manifestHash: 582aff25d26f9c6826feb43459bbd4d936c16b4a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.21.0-alpha.3 + version: 1.22.0-alpha.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 44bc5896ae..2ee9f525dd 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.21.0-alpha.3/images/protokube-linux-amd64", - "https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.3/images-protokube-linux-amd64", - "https://kubeupv2.s3.amazonaws.com/kops/1.21.0-alpha.3/images/protokube-linux-amd64", + "https://artifacts.k8s.io/binaries/kops/1.22.0-alpha.1/images/protokube-linux-amd64", + "https://github.com/kubernetes/kops/releases/download/v1.22.0-alpha.1/images-protokube-linux-amd64", + "https://kubeupv2.s3.amazonaws.com/kops/1.22.0-alpha.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.21.0-alpha.3/images/protokube-linux-arm64", - "https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.3/images-protokube-linux-arm64", - "https://kubeupv2.s3.amazonaws.com/kops/1.21.0-alpha.3/images/protokube-linux-arm64", + "https://artifacts.k8s.io/binaries/kops/1.22.0-alpha.1/images/protokube-linux-arm64", + "https://github.com/kubernetes/kops/releases/download/v1.22.0-alpha.1/images-protokube-linux-arm64", + "https://kubeupv2.s3.amazonaws.com/kops/1.22.0-alpha.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.21.0-alpha.3/linux/amd64/nodeup", - "https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.3/nodeup-linux-amd64", - "https://kubeupv2.s3.amazonaws.com/kops/1.21.0-alpha.3/linux/amd64/nodeup", + "https://artifacts.k8s.io/binaries/kops/1.22.0-alpha.1/linux/amd64/nodeup", + "https://github.com/kubernetes/kops/releases/download/v1.22.0-alpha.1/nodeup-linux-amd64", + "https://kubeupv2.s3.amazonaws.com/kops/1.22.0-alpha.1/linux/amd64/nodeup", }, }, { url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/arm64/nodeup", expected: []string{ - "https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.3/linux/arm64/nodeup", - "https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.3/nodeup-linux-arm64", - "https://kubeupv2.s3.amazonaws.com/kops/1.21.0-alpha.3/linux/arm64/nodeup", + "https://artifacts.k8s.io/binaries/kops/1.22.0-alpha.1/linux/arm64/nodeup", + "https://github.com/kubernetes/kops/releases/download/v1.22.0-alpha.1/nodeup-linux-arm64", + "https://kubeupv2.s3.amazonaws.com/kops/1.22.0-alpha.1/linux/arm64/nodeup", }, }, } diff --git a/version.go b/version.go index b81a5ef28d..c623c48098 100644 --- a/version.go +++ b/version.go @@ -21,8 +21,8 @@ var Version = KOPS_RELEASE_VERSION // These constants are parsed by build tooling - be careful about changing the formats const ( - KOPS_RELEASE_VERSION = "1.21.0-alpha.3" - KOPS_CI_VERSION = "1.21.0-alpha.4" + KOPS_RELEASE_VERSION = "1.22.0-alpha.1" + KOPS_CI_VERSION = "1.22.0-alpha.2" ) // GitVersion should be replaced by the makefile