diff --git a/Makefile b/Makefile index ffe1c3a5dc78d..8615f4fb5f985 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.2 +DNS_CONTROLLER_TAG=1.19.0-beta.3 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.2 +KOPS_CONTROLLER_TAG=1.19.0-beta.3 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.2 +KUBE_APISERVER_HEALTHCHECK_TAG=1.19.0-beta.3 KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}') diff --git a/docs/release-process.md b/docs/release-process.md index 0cf6ad8b85cd7..0c0530c48dc55 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -164,7 +164,7 @@ Create container promotion PR: ``` cd ${GOPATH}/src/k8s.io/k8s.io -git co -b kops_images_${VERSION} +git checkout -b kops_images_${VERSION} cd k8s.gcr.io/images/k8s-staging-kops echo "" >> images.yaml @@ -194,8 +194,8 @@ Create binary promotion PR: ``` cd ${GOPATH}/src/k8s.io/k8s.io -git co master -git co -b kops_artifacts_${VERSION} +git checkout master +git checkout -b kops_artifacts_${VERSION} mkdir -p ./k8s-staging-kops/kops/releases/${VERSION}/ gsutil rsync -r gs://k8s-staging-kops/kops/releases/${VERSION}/ ./k8s-staging-kops/kops/releases/${VERSION}/ diff --git a/pkg/model/components/kubeapiserver/model.go b/pkg/model/components/kubeapiserver/model.go index 4d66dc9f39874..b66e2936135ac 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.2 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-beta.3 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 4311fc2485892..c36f06590f0b1 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.2 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-beta.3 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/upup/models/bindata.go b/upup/models/bindata.go index cbec7ef80fd43..d3da23b59400d 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -2210,7 +2210,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-beta.2 + version: v1.19.0-beta.3 spec: replicas: 1 strategy: @@ -2223,7 +2223,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-beta.2 + version: v1.19.0-beta.3 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: @@ -2237,7 +2237,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2 + image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.3 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" @@ -2346,7 +2346,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-beta.2 + version: v1.19.0-beta.3 spec: replicas: 1 selector: @@ -2357,7 +2357,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-beta.2 + version: v1.19.0-beta.3 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' # For 1.6, we keep the old tolerations in case of a downgrade to 1.5 @@ -2373,7 +2373,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2 + image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.3 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" @@ -2751,7 +2751,7 @@ metadata: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.19.0-beta.2 + version: v1.19.0-beta.3 spec: selector: matchLabels: @@ -2765,7 +2765,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.19.0-beta.2 + version: v1.19.0-beta.3 {{ if UseKopsControllerForNodeBootstrap }} annotations: dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }} @@ -2783,7 +2783,7 @@ spec: serviceAccount: kops-controller containers: - name: kops-controller - image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.2 + image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.3 volumeMounts: {{ if .UseHostCertificates }} - mountPath: /etc/ssl/certs diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template index 9c9927df46d7e..3d22684395210 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.2 + version: v1.19.0-beta.3 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.2 + version: v1.19.0-beta.3 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.2 + image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.3 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template index da2b5fe790222..37b140b19b711 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.2 + version: v1.19.0-beta.3 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.2 + version: v1.19.0-beta.3 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' # For 1.6, we keep the old tolerations in case of a downgrade to 1.5 @@ -33,7 +33,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2 + image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.3 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" diff --git a/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template index bc65f80d82c7c..2b722c554656a 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.2 + version: v1.19.0-beta.3 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.2 + version: v1.19.0-beta.3 {{ 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.2 + image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.3 volumeMounts: {{ if .UseHostCertificates }} - mountPath: /etc/ssl/certs diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 6358ff6e7e7bc..adbca8fbff0ff 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.2" + version := "1.19.0-beta.3" { 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.2" + version := "1.19.0-beta.3" { 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.2" + version := "1.19.0-beta.3" { location := key + "/k8s-1.6.yaml" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index bf0f64b464f30..1d4b995829795 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: 5b7765907ec5720081c13c0cab2d32b99053e7c8 + manifestHash: ab5b9c27062ceec773719f25fe727d4459f8c8ec name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -57,19 +57,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: 8ea4cfe1b036ac2c03f570066799a5e13928db04 + manifestHash: ea252e459da01e9db6401a9e37ea6f70114bb820 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440 + manifestHash: 835e6b9944ab3c39ce3e7e99bb290a2ddaa2222c name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml index 48a9ce0dc7d79..6594d81052e15 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: 68aa7f9ecd2d264b5b1dbc5c72d161420f455427 + manifestHash: 06a474c5820eca550fc93835350e3ea43fc501cc name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - 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: 8ea4cfe1b036ac2c03f570066799a5e13928db04 + manifestHash: ea252e459da01e9db6401a9e37ea6f70114bb820 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440 + manifestHash: 835e6b9944ab3c39ce3e7e99bb290a2ddaa2222c name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml index d288c4daa10fb..22bab67037fd1 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.2 + version: v1.19.0-beta.3 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.2 + version: v1.19.0-beta.3 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.2 + image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.3 name: dns-controller resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml index 3871b7b86ac26..5ee0012df4982 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.2 + version: v1.19.0-beta.3 name: kops-controller namespace: kube-system spec: @@ -29,14 +29,14 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.19.0-beta.2 + version: v1.19.0-beta.3 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.2 + image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.3 name: kops-controller resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index 09475c35b08eb..d97ab24ffb897 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: 5b7765907ec5720081c13c0cab2d32b99053e7c8 + manifestHash: ab5b9c27062ceec773719f25fe727d4459f8c8ec name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -57,19 +57,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: 8ea4cfe1b036ac2c03f570066799a5e13928db04 + manifestHash: ea252e459da01e9db6401a9e37ea6f70114bb820 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440 + manifestHash: 835e6b9944ab3c39ce3e7e99bb290a2ddaa2222c name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml index 945e6a2de8e37..5cfe574e81b46 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.2 + version: 1.19.0-beta.3 - 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 1af53c90d7428..775ece9c21c18 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.2 + version: v1.19.0-beta.3 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.2 + version: v1.19.0-beta.3 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.2 + image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.3 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 3871b7b86ac26..5ee0012df4982 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.2 + version: v1.19.0-beta.3 name: kops-controller namespace: kube-system spec: @@ -29,14 +29,14 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.19.0-beta.2 + version: v1.19.0-beta.3 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.2 + image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.3 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 532c35b50769e..f0c7e6456084c 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: 5b7765907ec5720081c13c0cab2d32b99053e7c8 + manifestHash: ab5b9c27062ceec773719f25fe727d4459f8c8ec name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - 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.2 + version: 1.19.0-beta.3 - 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: 8ea4cfe1b036ac2c03f570066799a5e13928db04 + manifestHash: ea252e459da01e9db6401a9e37ea6f70114bb820 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 3d1dd61bf3c70c46e30db8014bd3a0ff6efe6301 + manifestHash: 0a0fa1f4037f765b45c64e78a48d8d534d470e5a name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml index d288c4daa10fb..22bab67037fd1 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.2 + version: v1.19.0-beta.3 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.2 + version: v1.19.0-beta.3 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.2 + image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.3 name: dns-controller resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml index 1a67d15ae7610..3857a0356b16a 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.2 + version: v1.19.0-beta.3 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.2 + version: v1.19.0-beta.3 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.2 + image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.3 name: kops-controller resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 0fbab9869a10b..38b76f7b40a4c 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: 68aa7f9ecd2d264b5b1dbc5c72d161420f455427 + manifestHash: 06a474c5820eca550fc93835350e3ea43fc501cc name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - 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: 8ea4cfe1b036ac2c03f570066799a5e13928db04 + manifestHash: ea252e459da01e9db6401a9e37ea6f70114bb820 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440 + manifestHash: 835e6b9944ab3c39ce3e7e99bb290a2ddaa2222c name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index f9dbd8699952e..449845b446842 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: 5b7765907ec5720081c13c0cab2d32b99053e7c8 + manifestHash: ab5b9c27062ceec773719f25fe727d4459f8c8ec name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -57,19 +57,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: 8ea4cfe1b036ac2c03f570066799a5e13928db04 + manifestHash: ea252e459da01e9db6401a9e37ea6f70114bb820 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440 + manifestHash: 835e6b9944ab3c39ce3e7e99bb290a2ddaa2222c name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-beta.2 + version: 1.19.0-beta.3 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml diff --git a/upup/pkg/fi/cloudup/urls_test.go b/upup/pkg/fi/cloudup/urls_test.go index 06aec5e993cdd..cdddc73c80f5b 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.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", + "https://artifacts.k8s.io/binaries/kops/1.19.0-beta.3/images/protokube-linux-amd64", + "https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.3/images-protokube-linux-amd64", + "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.3/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.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", + "https://artifacts.k8s.io/binaries/kops/1.19.0-beta.3/images/protokube-linux-arm64", + "https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.3/images-protokube-linux-arm64", + "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.3/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.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", + "https://artifacts.k8s.io/binaries/kops/1.19.0-beta.3/linux/amd64/nodeup", + "https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.3/nodeup-linux-amd64", + "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.3/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.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", + "https://artifacts.k8s.io/binaries/kops/1.19.0-beta.3/linux/arm64/nodeup", + "https://github.com/kubernetes/kops/releases/download/v1.19.0-beta.3/nodeup-linux-arm64", + "https://kubeupv2.s3.amazonaws.com/kops/1.19.0-beta.3/linux/arm64/nodeup", }, }, } diff --git a/version.go b/version.go index 551fbbb42d5a8..98336da7ce82f 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.2" - KOPS_CI_VERSION = "1.19.0-beta.3" + KOPS_RELEASE_VERSION = "1.19.0-beta.3" + KOPS_CI_VERSION = "1.19.0-beta.4" ) // GitVersion should be replaced by the makefile