From 0eb626fcdde48864fc592d2d4efac676dfdc4de7 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 16 Sep 2020 09:27:49 +0300 Subject: [PATCH] Release 1.19.0-alpha.4 --- Makefile | 27 ++++++++++--------- hack/set-version | 1 + 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 +-- 24 files changed, 109 insertions(+), 105 deletions(-) diff --git a/Makefile b/Makefile index 3abaa9a651..145047ab60 100644 --- a/Makefile +++ b/Makefile @@ -67,11 +67,14 @@ 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=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}') +DNS_CONTROLLER_TAG=1.19.0-alpha.4 +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=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}') +KOPS_CONTROLLER_TAG=1.19.0-alpha.4 +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=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}') +KUBE_APISERVER_HEALTHCHECK_TAG=1.19.0-alpha.4 +KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}') # Go exports: @@ -359,9 +362,9 @@ bazel-crossbuild-dns-controller: .PHONY: dns-controller-push dns-controller-push: - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //dns-controller/cmd/dns-controller:push-image-plain - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //dns-controller/cmd/dns-controller:push-image-amd64 - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //dns-controller/cmd/dns-controller:push-image-arm64 + DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //dns-controller/cmd/dns-controller:push-image-plain + DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //dns-controller/cmd/dns-controller:push-image-amd64 + DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //dns-controller/cmd/dns-controller:push-image-arm64 # -------------------------------------------------- # development targets @@ -806,15 +809,15 @@ crds: .PHONY: kops-controller-push kops-controller-push: - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kops-controller:push-image-plain - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kops-controller:push-image-amd64 - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kops-controller:push-image-arm64 + DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kops-controller:push-image-plain + DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kops-controller:push-image-amd64 + DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kops-controller:push-image-arm64 #------------------------------------------------------ # kube-apiserver-healthcheck .PHONY: kube-apiserver-healthcheck-push kube-apiserver-healthcheck-push: - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kube-apiserver-healthcheck:push-image-plain - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kube-apiserver-healthcheck:push-image-amd64 - DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kube-apiserver-healthcheck:push-image-arm64 + DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kube-apiserver-healthcheck:push-image-plain + DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kube-apiserver-healthcheck:push-image-amd64 + DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kube-apiserver-healthcheck:push-image-arm64 diff --git a/hack/set-version b/hack/set-version index 699b0a6cd8..7ac5f82bac 100755 --- a/hack/set-version +++ b/hack/set-version @@ -51,6 +51,7 @@ sed -i -e "s@DNS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@DNS_CONTROLLER_TAG=${NEW sed -i -e "s@KOPS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@KOPS_CONTROLLER_TAG=${NEW_RELEASE_VERSION}@g" Makefile sed -i -e "s@KUBE_APISERVER_HEALTHCHECK_TAG=${KOPS_RELEASE_VERSION}@KUBE_APISERVER_HEALTHCHECK_TAG=${NEW_RELEASE_VERSION}@g" Makefile sed -i -e "s@\"${KOPS_RELEASE_VERSION}\"@\"${NEW_RELEASE_VERSION}\"@g" upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +sed -i -e "s@${KOPS_RELEASE_VERSION}@${NEW_RELEASE_VERSION}@g" upup/pkg/fi/cloudup/urls_test.go git grep -l k8s.gcr.io/kops/dns-controller | xargs -I {} sed -i -e "s@dns-controller:${KOPS_RELEASE_VERSION}@dns-controller:${NEW_RELEASE_VERSION}@g" {} git grep -l "version..v${KOPS_RELEASE_VERSION}" upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/ | xargs -I {} sed -i -e "s@version: v${KOPS_RELEASE_VERSION}@version: v${NEW_RELEASE_VERSION}@g" {} diff --git a/pkg/model/components/kubeapiserver/model.go b/pkg/model/components/kubeapiserver/model.go index 69e6e93457..bf003fcab3 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-alpha.3 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-alpha.4 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 7301ec797c..1335f0dcae 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-alpha.3 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-alpha.4 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/upup/models/bindata.go b/upup/models/bindata.go index 44c79b62e7..ad7599fcc2 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -2187,7 +2187,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-alpha.3 + version: v1.19.0-alpha.4 spec: replicas: 1 strategy: @@ -2200,7 +2200,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-alpha.3 + version: v1.19.0-alpha.4 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: @@ -2214,7 +2214,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3 + image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" @@ -2323,7 +2323,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-alpha.3 + version: v1.19.0-alpha.4 spec: replicas: 1 selector: @@ -2334,7 +2334,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-alpha.3 + version: v1.19.0-alpha.4 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' # For 1.6, we keep the old tolerations in case of a downgrade to 1.5 @@ -2350,7 +2350,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3 + image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" @@ -2728,7 +2728,7 @@ metadata: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.19.0-alpha.3 + version: v1.19.0-alpha.4 spec: selector: matchLabels: @@ -2742,7 +2742,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.19.0-alpha.3 + version: v1.19.0-alpha.4 spec: priorityClassName: system-node-critical tolerations: @@ -2755,7 +2755,7 @@ spec: serviceAccount: kops-controller containers: - name: kops-controller - image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.3 + image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.4 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 d11219f48a..b976e07534 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4 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 58badbc66b..7c45ca8774 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4 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 260d062a95..382bcca253 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-alpha.3 + version: v1.19.0-alpha.4 spec: selector: matchLabels: @@ -33,7 +33,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.19.0-alpha.3 + version: v1.19.0-alpha.4 spec: priorityClassName: system-node-critical tolerations: @@ -46,7 +46,7 @@ spec: serviceAccount: kops-controller containers: - name: kops-controller - image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.3 + image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.4 volumeMounts: {{ if .UseHostCertificates }} - mountPath: /etc/ssl/certs diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 0f38353552..b1e29c0224 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-alpha.3" + version := "1.19.0-alpha.4" { 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-alpha.3" + version := "1.19.0-alpha.4" { 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-alpha.3" + version := "1.19.0-alpha.4" { 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 fe9191f866..f81c1c6bcd 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: 892363f3724b8af9a564d5ef3efd010418bad7b7 + manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - 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: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246 + manifestHash: bb0c5b13c5f82799b956e37f55dd05483ebf4a04 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62 + manifestHash: c3d3784d1204b1b57d1a9f2c6b0794cdae8352ae name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - 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 89de50b344..c1f7a48872 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: 892363f3724b8af9a564d5ef3efd010418bad7b7 + manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - 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: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246 + manifestHash: bb0c5b13c5f82799b956e37f55dd05483ebf4a04 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62 + manifestHash: c3d3784d1204b1b57d1a9f2c6b0794cdae8352ae name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - 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 4ff7647163..8bcf9a5303 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4 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 f1bb6a709d..146da3823d 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.4 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 f1619994b3..299b1a545c 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: 892363f3724b8af9a564d5ef3efd010418bad7b7 + manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - 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: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246 + manifestHash: bb0c5b13c5f82799b956e37f55dd05483ebf4a04 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62 + manifestHash: c3d3784d1204b1b57d1a9f2c6b0794cdae8352ae name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - 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 b618f7c380..dd2dbd0627 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-alpha.3 + version: 1.19.0-alpha.4 - 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 505c3aca88..c8c56255fd 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + version: v1.19.0-alpha.4 spec: containers: - command: @@ -38,7 +38,7 @@ spec: value: arn:aws:iam:::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-alpha.3 + image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4 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 f1bb6a709d..146da3823d 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.4 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 be56243a62..e9cfac355c 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: 892363f3724b8af9a564d5ef3efd010418bad7b7 + manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - 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-alpha.3 + version: 1.19.0-alpha.4 - 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: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246 + manifestHash: bb0c5b13c5f82799b956e37f55dd05483ebf4a04 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: bcd96c6ebb616cb060250132b9bf802f59f7446b + manifestHash: 767e92b277dad99d830ddfa0dfc37f15731f4b8e name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - 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 4ff7647163..8bcf9a5303 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4 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 f1bb6a709d..146da3823d 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + version: v1.19.0-alpha.4 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-alpha.3 + image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.4 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 286efe5a92..d8a48b62a9 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: 892363f3724b8af9a564d5ef3efd010418bad7b7 + manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - 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: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246 + manifestHash: bb0c5b13c5f82799b956e37f55dd05483ebf4a04 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62 + manifestHash: c3d3784d1204b1b57d1a9f2c6b0794cdae8352ae name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - 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 4c906a5a60..13f4219699 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: 892363f3724b8af9a564d5ef3efd010418bad7b7 + manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95 name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - 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: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246 + manifestHash: bb0c5b13c5f82799b956e37f55dd05483ebf4a04 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62 + manifestHash: c3d3784d1204b1b57d1a9f2c6b0794cdae8352ae name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.3 + version: 1.19.0-alpha.4 - 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 94b656dde6..6dcaf60fd2 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-alpha.3/images/protokube-linux-amd64", - "https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-linux-amd64", - "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-linux-amd64", + "https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.4/images/protokube-linux-amd64", + "https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.4/images-protokube-linux-amd64", + "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.4/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-alpha.3/images/protokube-linux-arm64", - "https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-linux-arm64", - "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-linux-arm64", + "https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.4/images/protokube-linux-arm64", + "https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.4/images-protokube-linux-arm64", + "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.4/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-alpha.3/linux/amd64/nodeup", - "https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/nodeup-linux-amd64", - "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/linux/amd64/nodeup", + "https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.4/linux/amd64/nodeup", + "https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.4/nodeup-linux-amd64", + "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.4/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-alpha.3/linux/arm64/nodeup", - "https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/nodeup-linux-arm64", - "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/linux/arm64/nodeup", + "https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.4/linux/arm64/nodeup", + "https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.4/nodeup-linux-arm64", + "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.4/linux/arm64/nodeup", }, }, } diff --git a/version.go b/version.go index 31e3248389..e0d1f00508 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-alpha.3" - KOPS_CI_VERSION = "1.19.0-alpha.4" + KOPS_RELEASE_VERSION = "1.19.0-alpha.4" + KOPS_CI_VERSION = "1.19.0-alpha.5" ) // GitVersion should be replaced by the makefile