From 373955e90787d9e001f28f4de4304b1952cf2a64 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Wed, 29 Jan 2020 19:54:55 -0500 Subject: [PATCH] Release 1.16.0-beta.1 --- Makefile | 4 ++-- .../k8s-1.12.yaml.template | 6 +++--- .../k8s-1.6.yaml.template | 6 +++--- .../pre-k8s-1.6.yaml.template | 6 +++--- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 4 ++-- .../amazonvpc/manifest.yaml | 14 +++++++------- .../dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 +++--- .../bootstrapchannelbuilder/cilium/manifest.yaml | 14 +++++++------- .../dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 +++--- .../bootstrapchannelbuilder/simple/manifest.yaml | 14 +++++++------- .../bootstrapchannelbuilder/weave/manifest.yaml | 14 +++++++------- version.go | 4 ++-- 12 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Makefile b/Makefile index 71fdf9c1ccd65..a79353098ea1a 100644 --- a/Makefile +++ b/Makefile @@ -56,9 +56,9 @@ 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 VSPHERE_USERNAME VSPHERE_PASSWORD # Keep in sync with upup/models/cloudup/resources/addons/dns-controller/ -DNS_CONTROLLER_TAG=1.16.0-alpha.2 +DNS_CONTROLLER_TAG=1.16.0-beta.1 # Keep in sync with upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/ -KOPS_CONTROLLER_TAG=1.16.0-alpha.2 +KOPS_CONTROLLER_TAG=1.16.0-beta.1 # Keep in sync with logic in get_workspace_status # TODO: just invoke tools/get_workspace_status.sh? 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 96eb40b271cdb..93c75f9d5e142 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.16.0-alpha.2 + version: v1.16.0-beta.1 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.16.0-alpha.2 + version: v1.16.0-beta.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: @@ -32,7 +32,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: kope/dns-controller:1.16.0-alpha.2 + image: kope/dns-controller:1.16.0-beta.1 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 0217afa85a218..e898670a81631 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.16.0-alpha.2 + version: v1.16.0-beta.1 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.16.0-alpha.2 + version: v1.16.0-beta.1 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.16.0-alpha.2 + image: kope/dns-controller:1.16.0-beta.1 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template index bd9b3d01e2382..36b326ff08776 100644 --- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template +++ b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template @@ -6,7 +6,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.16.0-alpha.2 + version: v1.16.0-beta.1 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.16.0-alpha.2 + version: v1.16.0-beta.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]' @@ -28,7 +28,7 @@ spec: hostNetwork: true containers: - name: dns-controller - image: kope/dns-controller:1.16.0-alpha.2 + image: kope/dns-controller:1.16.0-beta.1 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 7c88665b55784..346dd3257b22b 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -117,7 +117,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { { key := "kops-controller.addons.k8s.io" - version := "1.16.0-alpha.2" + version := "1.16.0-beta.1" { location := key + "/k8s-1.16.yaml" @@ -396,7 +396,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { if externalDNS == nil || !externalDNS.Disable { { key := "dns-controller.addons.k8s.io" - version := "1.16.0-alpha.2" + version := "1.16.0-beta.1" { location := key + "/pre-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 a2fb6c1c7bb12..731d9f925ffa3 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -11,7 +11,7 @@ spec: name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -67,27 +67,27 @@ spec: - id: pre-k8s-1.6 kubernetesVersion: <1.6.0 manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml - manifestHash: 6d2c352741133a91c7f3c8b180ac2531ba99ef19 + manifestHash: 64f7a2d8f88073724bac77f635c2388e757993c3 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - id: k8s-1.6 kubernetesVersion: '>=1.6.0 <1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: f2db26feebbead9b072a3d986c9f5f3411e35eac + manifestHash: 765bb1835f820e7ae6cca89dbf1506704aba0322 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 939eda49f75bf3d16c6745366f73a870b43f9eeb + manifestHash: ff784e2a464c316f8b217b654e73eb1d070d89ca name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml index fcf1a6d614a74..a9c9c34a9da4d 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.16.0-alpha.2 + version: v1.16.0-beta.1 name: dns-controller namespace: kube-system spec: @@ -19,7 +19,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.16.0-alpha.2 + version: v1.16.0-beta.1 spec: containers: - command: @@ -29,7 +29,7 @@ spec: - --zone=*/Z1AFAKE1ZON3YO - --zone=*/* - -v=2 - image: kope/dns-controller:1.16.0-alpha.2 + image: kope/dns-controller:1.16.0-beta.1 name: dns-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 0bdb70007d980..f9e43b9dae7e8 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -11,7 +11,7 @@ spec: name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -67,27 +67,27 @@ spec: - id: pre-k8s-1.6 kubernetesVersion: <1.6.0 manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml - manifestHash: 6d2c352741133a91c7f3c8b180ac2531ba99ef19 + manifestHash: 64f7a2d8f88073724bac77f635c2388e757993c3 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - id: k8s-1.6 kubernetesVersion: '>=1.6.0 <1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: f2db26feebbead9b072a3d986c9f5f3411e35eac + manifestHash: 765bb1835f820e7ae6cca89dbf1506704aba0322 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 939eda49f75bf3d16c6745366f73a870b43f9eeb + manifestHash: ff784e2a464c316f8b217b654e73eb1d070d89ca name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml index fcf1a6d614a74..a9c9c34a9da4d 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.16.0-alpha.2 + version: v1.16.0-beta.1 name: dns-controller namespace: kube-system spec: @@ -19,7 +19,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.16.0-alpha.2 + version: v1.16.0-beta.1 spec: containers: - command: @@ -29,7 +29,7 @@ spec: - --zone=*/Z1AFAKE1ZON3YO - --zone=*/* - -v=2 - image: kope/dns-controller:1.16.0-alpha.2 + image: kope/dns-controller:1.16.0-beta.1 name: dns-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 5a2c8fed9aebd..63b7bc23ed44b 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -11,7 +11,7 @@ spec: name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -67,27 +67,27 @@ spec: - id: pre-k8s-1.6 kubernetesVersion: <1.6.0 manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml - manifestHash: 6d2c352741133a91c7f3c8b180ac2531ba99ef19 + manifestHash: 64f7a2d8f88073724bac77f635c2388e757993c3 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - id: k8s-1.6 kubernetesVersion: '>=1.6.0 <1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: f2db26feebbead9b072a3d986c9f5f3411e35eac + manifestHash: 765bb1835f820e7ae6cca89dbf1506704aba0322 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 939eda49f75bf3d16c6745366f73a870b43f9eeb + manifestHash: ff784e2a464c316f8b217b654e73eb1d070d89ca name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index 986cc897f1dea..cc16c8d4c188a 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -11,7 +11,7 @@ spec: name: kops-controller.addons.k8s.io selector: k8s-addon: kops-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - manifest: core.addons.k8s.io/v1.4.0.yaml manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 name: core.addons.k8s.io @@ -67,27 +67,27 @@ spec: - id: pre-k8s-1.6 kubernetesVersion: <1.6.0 manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml - manifestHash: 6d2c352741133a91c7f3c8b180ac2531ba99ef19 + manifestHash: 64f7a2d8f88073724bac77f635c2388e757993c3 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - id: k8s-1.6 kubernetesVersion: '>=1.6.0 <1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: f2db26feebbead9b072a3d986c9f5f3411e35eac + manifestHash: 765bb1835f820e7ae6cca89dbf1506704aba0322 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 939eda49f75bf3d16c6745366f73a870b43f9eeb + manifestHash: ff784e2a464c316f8b217b654e73eb1d070d89ca name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.16.0-alpha.2 + version: 1.16.0-beta.1 - 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 206302964b6ac..3dd9db2c192e1 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.16.0-alpha.2" - KOPS_CI_VERSION = "1.16.0-alpha.3" + KOPS_RELEASE_VERSION = "1.16.0-beta.1" + KOPS_CI_VERSION = "1.16.0-beta.2" ) // GitVersion should be replaced by the makefile