From 2d61ab087610d7b7a06113c1562cdce0269759a3 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 23 Aug 2020 10:58:31 +0300 Subject: [PATCH 1/3] Bump kops to v1.19.0-alpha.3 --- Makefile | 6 +++--- pkg/model/components/kubeapiserver/model.go | 2 +- .../kubeapiserver/tests/minimal/tasks.yaml | 2 +- upup/models/bindata.go | 18 +++++++++--------- .../k8s-1.12.yaml.template | 6 +++--- .../k8s-1.6.yaml.template | 6 +++--- .../k8s-1.16.yaml.template | 6 +++--- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 4 ++-- .../amazonvpc/manifest.yaml | 12 ++++++------ .../awsiamauthenticator/manifest.yaml | 12 ++++++------ .../dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 +++--- ...kops-controller.addons.k8s.io-k8s-1.16.yaml | 6 +++--- .../cilium/manifest.yaml | 12 ++++++------ .../dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 +++--- ...kops-controller.addons.k8s.io-k8s-1.16.yaml | 6 +++--- .../simple/manifest.yaml | 12 ++++++------ .../weave/manifest.yaml | 12 ++++++------ version.go | 4 ++-- 18 files changed, 69 insertions(+), 69 deletions(-) diff --git a/Makefile b/Makefile index 7562aef077535..34dc4d644f95f 100644 --- a/Makefile +++ b/Makefile @@ -52,11 +52,11 @@ unexport KOPS_BASE_URL KOPS_CLUSTER_NAME KOPS_RUN_OBSOLETE_VERSION KOPS_STATE_ST unexport SKIP_REGION_CHECK S3_ACCESS_KEY_ID S3_ENDPOINT S3_REGION S3_SECRET_ACCESS_KEY # Keep in sync with upup/models/cloudup/resources/addons/dns-controller/ -DNS_CONTROLLER_TAG=1.19.0-alpha.2 +DNS_CONTROLLER_TAG=1.19.0-alpha.3 # Keep in sync with upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/ -KOPS_CONTROLLER_TAG=1.19.0-alpha.2 +KOPS_CONTROLLER_TAG=1.19.0-alpha.3 # Keep in sync with pkg/model/components/kubeapiserver/model.go -KUBE_APISERVER_HEALTHCHECK_TAG=1.19.0-alpha.2 +KUBE_APISERVER_HEALTHCHECK_TAG=1.19.0-alpha.3 VERSION=$(shell tools/get_version.sh | grep VERSION | awk '{print $$2}') diff --git a/pkg/model/components/kubeapiserver/model.go b/pkg/model/components/kubeapiserver/model.go index 844abce1a5740..e8be90786d1b2 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: kope/kube-apiserver-healthcheck:1.19.0-alpha.2 + image: kope/kube-apiserver-healthcheck:1.19.0-alpha.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 15e1814d95f29..d37c433c4f6e8 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: kope/kube-apiserver-healthcheck:1.19.0-alpha.2 + image: kope/kube-apiserver-healthcheck:1.19.0-alpha.3 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/upup/models/bindata.go b/upup/models/bindata.go index bf53cdd1c173e..5810caba08870 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -1961,7 +1961,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-alpha.2 + version: v1.19.0-alpha.3 spec: replicas: 1 strategy: @@ -1974,7 +1974,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-alpha.2 + version: v1.19.0-alpha.3 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: @@ -1988,7 +1988,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: kope/dns-controller:1.19.0-alpha.2 + image: kope/dns-controller:1.19.0-alpha.3 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" @@ -2097,7 +2097,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-alpha.2 + version: v1.19.0-alpha.3 spec: replicas: 1 selector: @@ -2108,7 +2108,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.19.0-alpha.2 + version: v1.19.0-alpha.3 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' # For 1.6, we keep the old tolerations in case of a downgrade to 1.5 @@ -2124,7 +2124,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: kope/dns-controller:1.19.0-alpha.2 + image: kope/dns-controller:1.19.0-alpha.3 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" @@ -2502,7 +2502,7 @@ metadata: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.19.0-alpha.2 + version: v1.19.0-alpha.3 spec: selector: matchLabels: @@ -2516,7 +2516,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.19.0-alpha.2 + version: v1.19.0-alpha.3 spec: priorityClassName: system-node-critical tolerations: @@ -2529,7 +2529,7 @@ spec: serviceAccount: kops-controller containers: - name: kops-controller - image: kope/kops-controller:1.19.0-alpha.2 + image: kope/kops-controller:1.19.0-alpha.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 4b5bd8abc470c..3aa3dd88bd3de 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.2 + version: v1.19.0-alpha.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-alpha.2 + version: v1.19.0-alpha.3 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: @@ -33,7 +33,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: kope/dns-controller:1.19.0-alpha.2 + image: kope/dns-controller:1.19.0-alpha.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 afed34b3563fe..93804a3735563 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.2 + version: v1.19.0-alpha.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-alpha.2 + version: v1.19.0-alpha.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: kope/dns-controller:1.19.0-alpha.2 + image: kope/dns-controller:1.19.0-alpha.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 4866f9302bca1..b05c93ffda0d3 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.2 + version: v1.19.0-alpha.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-alpha.2 + version: v1.19.0-alpha.3 spec: priorityClassName: system-node-critical tolerations: @@ -46,7 +46,7 @@ spec: serviceAccount: kops-controller containers: - name: kops-controller - image: kope/kops-controller:1.19.0-alpha.2 + image: kope/kops-controller:1.19.0-alpha.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 79b4e24d9c7c6..6ffce6b9c01d0 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -124,7 +124,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { { key := "kops-controller.addons.k8s.io" - version := "1.19.0-alpha.2" + version := "1.19.0-alpha.3" { location := key + "/k8s-1.16.yaml" @@ -372,7 +372,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { if externalDNS == nil || !externalDNS.Disable { { key := "dns-controller.addons.k8s.io" - version := "1.19.0-alpha.2" + version := "1.19.0-alpha.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 d3cccf81d986c..45bc798c50b93 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: 7a7039ba3b0e9c0027e486902fba3c6d266cbb46 + manifestHash: 32a6a0057d0d1930c0089120b4d0593bb0f109de name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.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: efb6c7b28be1e4cfe493f01b4a9f81a54f69f120 + manifestHash: a3f11d5dccd7f62f41e808a5b3cb7b85f931fec7 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: ba7fda2da673525d3ff898636fa2d9d2ea16dffa + manifestHash: a59ae2cef3464a9c7b4a29788e030e5bac6274e7 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.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 120d20c24cdfe..53c3e8b5b0a84 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: 7a7039ba3b0e9c0027e486902fba3c6d266cbb46 + manifestHash: 32a6a0057d0d1930c0089120b4d0593bb0f109de name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.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: efb6c7b28be1e4cfe493f01b4a9f81a54f69f120 + manifestHash: a3f11d5dccd7f62f41e808a5b3cb7b85f931fec7 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: ba7fda2da673525d3ff898636fa2d9d2ea16dffa + manifestHash: a59ae2cef3464a9c7b4a29788e030e5bac6274e7 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.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 c2537a8fc7767..62e88a885e1f0 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.2 + version: v1.19.0-alpha.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-alpha.2 + version: v1.19.0-alpha.3 spec: containers: - command: @@ -34,7 +34,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: kope/dns-controller:1.19.0-alpha.2 + image: kope/dns-controller:1.19.0-alpha.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 cd2920e40e0aa..76cf026f0e444 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.2 + version: v1.19.0-alpha.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-alpha.2 + version: v1.19.0-alpha.3 spec: containers: - command: - /kops-controller - --v=2 - --conf=/etc/kubernetes/kops-controller/config/config.yaml - image: kope/kops-controller:1.19.0-alpha.2 + image: kope/kops-controller:1.19.0-alpha.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 992b2e201c2c4..7af1e4f96f20a 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: 7a7039ba3b0e9c0027e486902fba3c6d266cbb46 + manifestHash: 32a6a0057d0d1930c0089120b4d0593bb0f109de name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.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: efb6c7b28be1e4cfe493f01b4a9f81a54f69f120 + manifestHash: a3f11d5dccd7f62f41e808a5b3cb7b85f931fec7 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: ba7fda2da673525d3ff898636fa2d9d2ea16dffa + manifestHash: a59ae2cef3464a9c7b4a29788e030e5bac6274e7 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.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 c2537a8fc7767..62e88a885e1f0 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.2 + version: v1.19.0-alpha.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-alpha.2 + version: v1.19.0-alpha.3 spec: containers: - command: @@ -34,7 +34,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: kope/dns-controller:1.19.0-alpha.2 + image: kope/dns-controller:1.19.0-alpha.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 cd2920e40e0aa..76cf026f0e444 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.2 + version: v1.19.0-alpha.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-alpha.2 + version: v1.19.0-alpha.3 spec: containers: - command: - /kops-controller - --v=2 - --conf=/etc/kubernetes/kops-controller/config/config.yaml - image: kope/kops-controller:1.19.0-alpha.2 + image: kope/kops-controller:1.19.0-alpha.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 7449805e34f1e..c346740e7ce63 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: 7a7039ba3b0e9c0027e486902fba3c6d266cbb46 + manifestHash: 32a6a0057d0d1930c0089120b4d0593bb0f109de name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.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: efb6c7b28be1e4cfe493f01b4a9f81a54f69f120 + manifestHash: a3f11d5dccd7f62f41e808a5b3cb7b85f931fec7 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: ba7fda2da673525d3ff898636fa2d9d2ea16dffa + manifestHash: a59ae2cef3464a9c7b4a29788e030e5bac6274e7 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.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 b60b5ed880d7c..a198fd2deec65 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: 7a7039ba3b0e9c0027e486902fba3c6d266cbb46 + manifestHash: 32a6a0057d0d1930c0089120b4d0593bb0f109de name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.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: efb6c7b28be1e4cfe493f01b4a9f81a54f69f120 + manifestHash: a3f11d5dccd7f62f41e808a5b3cb7b85f931fec7 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: ba7fda2da673525d3ff898636fa2d9d2ea16dffa + manifestHash: a59ae2cef3464a9c7b4a29788e030e5bac6274e7 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.19.0-alpha.2 + version: 1.19.0-alpha.3 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml diff --git a/version.go b/version.go index c0caac77979d8..31e32483891aa 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.2" - KOPS_CI_VERSION = "1.19.0-alpha.3" + KOPS_RELEASE_VERSION = "1.19.0-alpha.3" + KOPS_CI_VERSION = "1.19.0-alpha.4" ) // GitVersion should be replaced by the makefile From c52a21f9ba7cb394fc258bff2a570c2019b27177 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 23 Aug 2020 11:51:00 +0300 Subject: [PATCH 2/3] Update shellcheck to v0.7.1 --- hack/verify-shellcheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/verify-shellcheck.sh b/hack/verify-shellcheck.sh index 4ba8e003b559c..1d2319e5300d0 100755 --- a/hack/verify-shellcheck.sh +++ b/hack/verify-shellcheck.sh @@ -22,7 +22,7 @@ set -o pipefail # required version for this script, if not installed on the host we will # use the official docker image instead. keep this in sync with SHELLCHECK_IMAGE -SHELLCHECK_VERSION="0.7.0" +SHELLCHECK_VERSION="0.7.1" # upstream shellcheck latest stable image as of October 23rd, 2019 SHELLCHECK_IMAGE="koalaman/shellcheck-alpine:v0.7.0@sha256:24bbf52aae6eaa27accc9f61de32d30a1498555e6ef452966d0702ff06f38ecb" From 92a3676e51a204ab34b942510e7ee0cb0f1d9c00 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 23 Aug 2020 11:58:37 +0300 Subject: [PATCH 3/3] Ignore untracked files in "git status" --- hack/verify-bindata.sh | 2 +- hack/verify-generate.sh | 2 +- hack/verify-gomod.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/verify-bindata.sh b/hack/verify-bindata.sh index 845c4001827cb..445f180066db4 100755 --- a/hack/verify-bindata.sh +++ b/hack/verify-bindata.sh @@ -24,7 +24,7 @@ cd "${KOPS_ROOT}" make update-bindata -changes=$(git status --porcelain || true) +changes=$(git status --porcelain --untracked-files=no || true) if [ -n "${changes}" ]; then echo "ERROR: bindata is not up to date; please run: make update-bindata" echo "git diff:" diff --git a/hack/verify-generate.sh b/hack/verify-generate.sh index 8f59c8a72b603..e292aefcdad4f 100755 --- a/hack/verify-generate.sh +++ b/hack/verify-generate.sh @@ -24,7 +24,7 @@ cd "${KOPS_ROOT}" make crds -changed_files=$(git status --porcelain || true) +changed_files=$(git status --porcelain --untracked-files=no || true) if [ -n "${changed_files}" ]; then echo "Detected that generation is needed; run 'make crds'" echo "changed files:" diff --git a/hack/verify-gomod.sh b/hack/verify-gomod.sh index d7e76e0540ba7..aeb4bf58bf922 100755 --- a/hack/verify-gomod.sh +++ b/hack/verify-gomod.sh @@ -24,7 +24,7 @@ cd "${KOPS_ROOT}" make gomod -changes=$(git status --porcelain || true) +changes=$(git status --porcelain go.mod go.sum vendor/ || true) if [ -n "${changes}" ]; then echo "ERROR: go modules are not up to date; please run: make gomod" echo "changed files:"