From ea779042ca2fa5d08d922c9cdd98efb900181b04 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Thu, 7 Nov 2019 23:44:03 -0500 Subject: [PATCH] Release 1.16.0-alpha.1 --- Makefile | 2 +- .../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 ++-- .../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 ++-- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Makefile b/Makefile index c98f692a93..7e9164fe12 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ 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.15.0-alpha.1 +DNS_CONTROLLER_TAG=1.16.0-alpha.1 # Keep in sync with upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/ KOPS_CONTROLLER_TAG=1.15.0-alpha.1 diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template index 4e7dd7eb35..2006eaf189 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.15.0-alpha.1 + version: v1.16.0-alpha.1 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.15.0-alpha.1 + version: v1.16.0-alpha.1 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: @@ -31,7 +31,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: kope/dns-controller:1.15.0-alpha.1 + image: kope/dns-controller:1.16.0-alpha.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 b8a3547dbc..a8bbf40e88 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.15.0-alpha.1 + version: v1.16.0-alpha.1 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.15.0-alpha.1 + version: v1.16.0-alpha.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.15.0-alpha.1 + image: kope/dns-controller:1.16.0-alpha.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 7a7e384ca4..6f1c5a7188 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.15.0-alpha.1 + version: v1.16.0-alpha.1 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.15.0-alpha.1 + version: v1.16.0-alpha.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.15.0-alpha.1 + image: kope/dns-controller:1.16.0-alpha.1 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 6ca98d173b..43f4fff96a 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.15.0-alpha.1" + version := "1.16.0-alpha.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.15.0-alpha.1" + version := "1.16.0-alpha.1" { location := key + "/pre-k8s-1.6.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 b90111e9ef..587e743ada 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.15.0-alpha.1 + version: v1.16.0-alpha.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.15.0-alpha.1 + version: v1.16.0-alpha.1 spec: containers: - command: @@ -29,7 +29,7 @@ spec: - --zone=*/Z1AFAKE1ZON3YO - --zone=*/* - -v=2 - image: kope/dns-controller:1.15.0-alpha.1 + image: kope/dns-controller:1.16.0-alpha.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 3e6483e7bb..71df6585ca 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.15.0-alpha.1 + version: 1.16.0-alpha.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: 84e0835d9f5536f46c32831515ad78765fc0f999 + manifestHash: 39d21dcd13873ecb7aa18e40ec656cd6d0719438 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.15.0-alpha.1 + version: 1.16.0-alpha.1 - id: k8s-1.6 kubernetesVersion: '>=1.6.0 <1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: bcb803e1f22d4850bb55c51698e59d00f890927c + manifestHash: 7a763df472e5c4ad8c2044b6867aa548778ee745 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.15.0-alpha.1 + version: 1.16.0-alpha.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 9e8470bf6146aa708347b7f1b695d02c93868c47 + manifestHash: 8a8f531d13c821e8a2f8d134835cd715dffa59ff name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.15.0-alpha.1 + version: 1.16.0-alpha.1 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml index b90111e9ef..587e743ada 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.15.0-alpha.1 + version: v1.16.0-alpha.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.15.0-alpha.1 + version: v1.16.0-alpha.1 spec: containers: - command: @@ -29,7 +29,7 @@ spec: - --zone=*/Z1AFAKE1ZON3YO - --zone=*/* - -v=2 - image: kope/dns-controller:1.15.0-alpha.1 + image: kope/dns-controller:1.16.0-alpha.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 072bf0db75..5b2beb9ccc 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.15.0-alpha.1 + version: 1.16.0-alpha.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: 84e0835d9f5536f46c32831515ad78765fc0f999 + manifestHash: 39d21dcd13873ecb7aa18e40ec656cd6d0719438 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.15.0-alpha.1 + version: 1.16.0-alpha.1 - id: k8s-1.6 kubernetesVersion: '>=1.6.0 <1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: bcb803e1f22d4850bb55c51698e59d00f890927c + manifestHash: 7a763df472e5c4ad8c2044b6867aa548778ee745 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.15.0-alpha.1 + version: 1.16.0-alpha.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 9e8470bf6146aa708347b7f1b695d02c93868c47 + manifestHash: 8a8f531d13c821e8a2f8d134835cd715dffa59ff name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.15.0-alpha.1 + version: 1.16.0-alpha.1 - id: v1.15.0 kubernetesVersion: '>=1.15.0' manifest: storage-aws.addons.k8s.io/v1.15.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index db5a4a299e..9a783255ae 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.15.0-alpha.1 + version: 1.16.0-alpha.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: 84e0835d9f5536f46c32831515ad78765fc0f999 + manifestHash: 39d21dcd13873ecb7aa18e40ec656cd6d0719438 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.15.0-alpha.1 + version: 1.16.0-alpha.1 - id: k8s-1.6 kubernetesVersion: '>=1.6.0 <1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml - manifestHash: bcb803e1f22d4850bb55c51698e59d00f890927c + manifestHash: 7a763df472e5c4ad8c2044b6867aa548778ee745 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.15.0-alpha.1 + version: 1.16.0-alpha.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 9e8470bf6146aa708347b7f1b695d02c93868c47 + manifestHash: 8a8f531d13c821e8a2f8d134835cd715dffa59ff name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.15.0-alpha.1 + version: 1.16.0-alpha.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 ce188c0f21..01395a6591 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.15.0-alpha.1" - KOPS_CI_VERSION = "1.15.0-alpha.2" + KOPS_RELEASE_VERSION = "1.16.0-alpha.1" + KOPS_CI_VERSION = "1.16.0-alpha.2" ) // GitVersion should be replaced by the makefile