From 7c84c48481eb5ec77c97359a95e0e9579aa13d64 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Sun, 8 Sep 2019 14:16:05 -0400 Subject: [PATCH] Release 1.15.0-alpha.1 --- Makefile | 4 ++-- images/utils-builder/extract.sh | 1 + .../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 | 2 +- .../dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 +++--- .../bootstrapchannelbuilder/cilium/manifest.yaml | 12 ++++++------ .../dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 +++--- .../kopeio-vxlan/manifest.yaml | 12 ++++++------ .../dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 +++--- .../bootstrapchannelbuilder/simple/manifest.yaml | 12 ++++++------ .../weave/dns-controller.addons.k8s.io-k8s-1.12.yaml | 6 +++--- .../bootstrapchannelbuilder/weave/manifest.yaml | 12 ++++++------ version.go | 4 ++-- 15 files changed, 51 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index 80644775556b4..f6f2b2f69159d 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,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.14.0-alpha.1 +DNS_CONTROLLER_TAG=1.15.0-alpha.1 # Keep in sync with logic in get_workspace_status # TODO: just invoke tools/get_workspace_status.sh? @@ -295,7 +295,7 @@ crossbuild-in-docker: kops-dist: crossbuild-in-docker mkdir -p ${DIST} (${SHASUMCMD} ${DIST}/darwin/amd64/kops | cut -d' ' -f1) > ${DIST}/darwin/amd64/kops.sha1 - (${SHA256SUMCMD} ${DIST}/darwin/amd64/kops | cut -d' ' -f1) > ${DIST}/darwin/amd64/kops.sha1 + (${SHA256SUMCMD} ${DIST}/darwin/amd64/kops | cut -d' ' -f1) > ${DIST}/darwin/amd64/kops.sha256 (${SHASUMCMD} ${DIST}/linux/amd64/kops | cut -d' ' -f1) > ${DIST}/linux/amd64/kops.sha1 (${SHA256SUMCMD} ${DIST}/linux/amd64/kops | cut -d' ' -f1) > ${DIST}/linux/amd64/kops.sha256 (${SHASUMCMD} ${DIST}/windows/amd64/kops.exe | cut -d' ' -f1) > ${DIST}/windows/amd64/kops.exe.sha1 diff --git a/images/utils-builder/extract.sh b/images/utils-builder/extract.sh index a662b4c40414c..f80589d261080 100755 --- a/images/utils-builder/extract.sh +++ b/images/utils-builder/extract.sh @@ -26,4 +26,5 @@ tar cvfz /utils.tar.gz /utils cp /utils.tar.gz /dist/utils.tar.gz (sha1sum /dist/utils.tar.gz | cut -d' ' -f1) > /dist/utils.tar.gz.sha1 +(sha256sum /dist/utils.tar.gz | cut -d' ' -f1) > /dist/utils.tar.gz.sha256 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 e8ca1f36b28e2..4e7dd7eb35e77 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.14.0-alpha.1 + version: v1.15.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.14.0-alpha.1 + version: v1.15.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.14.0-alpha.1 + image: kope/dns-controller:1.15.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 15c0a529c209f..b8a3547dbc16c 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.14.0-alpha.1 + version: v1.15.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.14.0-alpha.1 + version: v1.15.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.14.0-alpha.1 + image: kope/dns-controller:1.15.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 5f953b7e204b8..7a7e384ca4912 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.14.0-alpha.1 + version: v1.15.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.14.0-alpha.1 + version: v1.15.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.14.0-alpha.1 + image: kope/dns-controller:1.15.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 a247f98281324..1edac15c0c05f 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -375,7 +375,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { if externalDNS == nil || !externalDNS.Disable { { key := "dns-controller.addons.k8s.io" - version := "1.14.0-alpha.1" + version := "1.15.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 b07e287813845..b90111e9efe22 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.14.0-alpha.1 + version: v1.15.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.14.0-alpha.1 + version: v1.15.0-alpha.1 spec: containers: - command: @@ -29,7 +29,7 @@ spec: - --zone=*/Z1AFAKE1ZON3YO - --zone=*/* - -v=2 - image: kope/dns-controller:1.14.0-alpha.1 + image: kope/dns-controller:1.15.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 83e2de7b781af..c78c9c53b3c9a 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -59,27 +59,27 @@ spec: - id: pre-k8s-1.6 kubernetesVersion: <1.6.0 manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml - manifestHash: 2673104015e7ff47f0058c3bb1e152eeac54d220 + manifestHash: 84e0835d9f5536f46c32831515ad78765fc0f999 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.14.0-alpha.1 + version: 1.15.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: 1e6ad361396158a93c3f59e939265f74bb003586 + manifestHash: bcb803e1f22d4850bb55c51698e59d00f890927c name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.14.0-alpha.1 + version: 1.15.0-alpha.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: aaf42d7dcff21f7e32177e933fde10cff8b03bc3 + manifestHash: 9e8470bf6146aa708347b7f1b695d02c93868c47 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.14.0-alpha.1 + version: 1.15.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/kopeio-vxlan/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/dns-controller.addons.k8s.io-k8s-1.12.yaml index 8d3a321fb2972..0ae3a19f0c059 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/dns-controller.addons.k8s.io-k8s-1.12.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/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.14.0-alpha.1 + version: v1.15.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.14.0-alpha.1 + version: v1.15.0-alpha.1 spec: containers: - command: @@ -38,7 +38,7 @@ spec: value: http://proxy.example.com - name: no_proxy value: noproxy.example.com,127.0.0.1,localhost,api.minimal.example.com,minimal.example.com,100.64.0.1,100.64.0.0/10,169.254.169.254,172.20.0.0/16 - image: kope/dns-controller:1.14.0-alpha.1 + image: kope/dns-controller:1.15.0-alpha.1 name: dns-controller resources: requests: 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 7067e3f6203fc..9ee425169b736 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml @@ -59,27 +59,27 @@ spec: - id: pre-k8s-1.6 kubernetesVersion: <1.6.0 manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml - manifestHash: 2673104015e7ff47f0058c3bb1e152eeac54d220 + manifestHash: 84e0835d9f5536f46c32831515ad78765fc0f999 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.14.0-alpha.1 + version: 1.15.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: 4ba33ea15d601523c39b18c2481376e7036a6dac + manifestHash: 6582fc26394e8de236fd85e7abc90dac84b63da5 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.14.0-alpha.1 + version: 1.15.0-alpha.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 91914c7727ec59000c4d759d83e6cdfe30cc6751 + manifestHash: d067439752e34e7658528f35936c9b7d30ac24cf name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.14.0-alpha.1 + version: 1.15.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 b07e287813845..b90111e9efe22 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.14.0-alpha.1 + version: v1.15.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.14.0-alpha.1 + version: v1.15.0-alpha.1 spec: containers: - command: @@ -29,7 +29,7 @@ spec: - --zone=*/Z1AFAKE1ZON3YO - --zone=*/* - -v=2 - image: kope/dns-controller:1.14.0-alpha.1 + image: kope/dns-controller:1.15.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 5e99abf44e0c6..0ed2096156058 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -59,27 +59,27 @@ spec: - id: pre-k8s-1.6 kubernetesVersion: <1.6.0 manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml - manifestHash: 2673104015e7ff47f0058c3bb1e152eeac54d220 + manifestHash: 84e0835d9f5536f46c32831515ad78765fc0f999 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.14.0-alpha.1 + version: 1.15.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: 1e6ad361396158a93c3f59e939265f74bb003586 + manifestHash: bcb803e1f22d4850bb55c51698e59d00f890927c name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.14.0-alpha.1 + version: 1.15.0-alpha.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: aaf42d7dcff21f7e32177e933fde10cff8b03bc3 + manifestHash: 9e8470bf6146aa708347b7f1b695d02c93868c47 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.14.0-alpha.1 + version: 1.15.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/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/dns-controller.addons.k8s.io-k8s-1.12.yaml index b07e287813845..b90111e9efe22 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/dns-controller.addons.k8s.io-k8s-1.12.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/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.14.0-alpha.1 + version: v1.15.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.14.0-alpha.1 + version: v1.15.0-alpha.1 spec: containers: - command: @@ -29,7 +29,7 @@ spec: - --zone=*/Z1AFAKE1ZON3YO - --zone=*/* - -v=2 - image: kope/dns-controller:1.14.0-alpha.1 + image: kope/dns-controller:1.15.0-alpha.1 name: dns-controller resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index 2237f6fa6b9cc..84f5ba7d53324 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -59,27 +59,27 @@ spec: - id: pre-k8s-1.6 kubernetesVersion: <1.6.0 manifest: dns-controller.addons.k8s.io/pre-k8s-1.6.yaml - manifestHash: 2673104015e7ff47f0058c3bb1e152eeac54d220 + manifestHash: 84e0835d9f5536f46c32831515ad78765fc0f999 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.14.0-alpha.1 + version: 1.15.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: 1e6ad361396158a93c3f59e939265f74bb003586 + manifestHash: bcb803e1f22d4850bb55c51698e59d00f890927c name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.14.0-alpha.1 + version: 1.15.0-alpha.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: aaf42d7dcff21f7e32177e933fde10cff8b03bc3 + manifestHash: 9e8470bf6146aa708347b7f1b695d02c93868c47 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io - version: 1.14.0-alpha.1 + version: 1.15.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 94edd907cf8e4..2e3feeb786d6f 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.14.0-alpha.1" - KOPS_CI_VERSION = "1.14.0-alpha.2" + KOPS_RELEASE_VERSION = "1.15.0-alpha.1" + KOPS_CI_VERSION = "1.15.0-alpha.2" ) // GitVersion should be replaced by the makefile