From d49ac2268a77513073399239e54c17659cdf5a03 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 22 Mar 2018 00:06:32 -0400 Subject: [PATCH] Release 1.9.0-alpha.2 --- Makefile | 6 +++--- tools/get_workspace_status.sh | 4 ++-- .../dns-controller.addons.k8s.io/k8s-1.6.yaml.template | 6 +++--- .../dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template | 6 +++--- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 2 +- .../bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml | 4 ++-- .../tests/bootstrapchannelbuilder/simple/manifest.yaml | 4 ++-- .../tests/bootstrapchannelbuilder/weave/manifest.yaml | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index c449e6004e..51ade83c0e 100644 --- a/Makefile +++ b/Makefile @@ -51,12 +51,12 @@ 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.9.0-alpha.1 +DNS_CONTROLLER_TAG=1.9.0-alpha.2 # Keep in sync with logic in get_workspace_status # Update variables in tools/get_workplace_status.sh for the bazel build -KOPS_RELEASE_VERSION = 1.9.0-alpha.1 -KOPS_CI_VERSION = 1.9.0-alpha.2 +KOPS_RELEASE_VERSION = 1.9.0-alpha.2 +KOPS_CI_VERSION = 1.9.0-alpha.3 # kops local location KOPS = ${LOCAL}/kops diff --git a/tools/get_workspace_status.sh b/tools/get_workspace_status.sh index e8b6a53933..e18362fe98 100755 --- a/tools/get_workspace_status.sh +++ b/tools/get_workspace_status.sh @@ -47,8 +47,8 @@ GITSHA=$(git describe --always) # These variables need to match the values in our Makefile # When we cut a new release we need to increment these accordingly -KOPS_RELEASE_VERSION=1.9.0-alpha.1 -KOPS_CI_VERSION=1.9.0-alpha.2 +KOPS_RELEASE_VERSION=1.9.0-alpha.2 +KOPS_CI_VERSION=1.9.0-alpha.3 if [[ -z "${VERSION}" ]]; then if [[ -z "${CI}" ]]; then 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 ea91ea657d..139eb86efc 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.9.0-alpha.1 + version: v1.9.0-alpha.2 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.9.0-alpha.1 + version: v1.9.0-alpha.2 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.9.0-alpha.1 + image: kope/dns-controller:1.9.0-alpha.2 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 ccfcd9dda5..2a1dbb1603 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.9.0-alpha.1 + version: v1.9.0-alpha.2 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.9.0-alpha.1 + version: v1.9.0-alpha.2 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.9.0-alpha.1 + image: kope/dns-controller:1.9.0-alpha.2 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 8f5d25dd78..62645b133a 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -184,7 +184,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri if externalDNS == nil || !externalDNS.Disable { { key := "dns-controller.addons.k8s.io" - version := "1.9.0-alpha.1" + version := "1.9.0-alpha.2" { location := key + "/pre-k8s-1.6.yaml" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml index 69aaac0a8c..1c00e7f194 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml @@ -41,14 +41,14 @@ spec: name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.9.0-alpha.1 + version: 1.9.0-alpha.2 - id: k8s-1.6 kubernetesVersion: '>=1.6.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.9.0-alpha.1 + version: 1.9.0-alpha.2 - id: v1.7.0 kubernetesVersion: '>=1.7.0' manifest: storage-aws.addons.k8s.io/v1.7.0.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index ca52543e6b..b8df723c2d 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -41,14 +41,14 @@ spec: name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.9.0-alpha.1 + version: 1.9.0-alpha.2 - id: k8s-1.6 kubernetesVersion: '>=1.6.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.9.0-alpha.1 + version: 1.9.0-alpha.2 - id: v1.7.0 kubernetesVersion: '>=1.7.0' manifest: storage-aws.addons.k8s.io/v1.7.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 b76d26f992..cf0b713d47 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -41,14 +41,14 @@ spec: name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.9.0-alpha.1 + version: 1.9.0-alpha.2 - id: k8s-1.6 kubernetesVersion: '>=1.6.0' manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.9.0-alpha.1 + version: 1.9.0-alpha.2 - id: v1.7.0 kubernetesVersion: '>=1.7.0' manifest: storage-aws.addons.k8s.io/v1.7.0.yaml