From b7c25f9a98ab646547fba6220e8e706693fab436 Mon Sep 17 00:00:00 2001
From: Justin SB <justinsb@google.com>
Date: Thu, 7 Nov 2019 22:05:20 -0500
Subject: [PATCH] Release 1.14.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 | 2 +-
.../bootstrapchannelbuilder/cilium/manifest.yaml | 12 ++++++------
.../kopeio-vxlan/manifest.yaml | 12 ++++++------
.../bootstrapchannelbuilder/simple/manifest.yaml | 12 ++++++------
.../bootstrapchannelbuilder/weave/manifest.yaml | 12 ++++++------
version.go | 4 ++--
10 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/Makefile b/Makefile
index 040d2ffb9c..ae4ac2693d 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,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
+DNS_CONTROLLER_TAG=1.14.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 49d0753280..4c4a2fec15 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
+ version: v1.14.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
+ version: v1.14.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
+ image: kope/dns-controller:1.14.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 632868a53b..dceefc7da6 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
+ version: v1.14.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
+ version: v1.14.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
+ image: kope/dns-controller:1.14.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 bd6715d861..4a6d39fc44 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
+ version: v1.14.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
+ version: v1.14.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
+ image: kope/dns-controller:1.14.1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
index 51421915cc..68ebaff828 100644
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -390,7 +390,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if externalDNS == nil || !externalDNS.Disable {
{
key := "dns-controller.addons.k8s.io"
- version := "1.14.0"
+ version := "1.14.1"
{
location := key + "/pre-k8s-1.6.yaml"
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
index ab3c877923..b9ba96fee1 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: ea51fd4d4ba87cc6536dad5e5e453b79b8361b8b
+ manifestHash: 588add512066653ed9791198e20a29aea2904ee5
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.14.0
+ version: 1.14.1
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
- manifestHash: 21539a8fe3f60cff4604521235c4f48c04ba1644
+ manifestHash: d1da30b3cfe07747f74fe808e58b04082708ed07
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.14.0
+ version: 1.14.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
- manifestHash: a9243888d806afd5d01d3c4055ef049b054e47be
+ manifestHash: 6c29db0e12070b472e959f76d466d545816ac13d
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.14.0
+ version: 1.14.1
- 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/kopeio-vxlan/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
index ac5a802acd..b53c41aa7e 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: ea51fd4d4ba87cc6536dad5e5e453b79b8361b8b
+ manifestHash: 588add512066653ed9791198e20a29aea2904ee5
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.14.0
+ version: 1.14.1
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
- manifestHash: 21539a8fe3f60cff4604521235c4f48c04ba1644
+ manifestHash: d1da30b3cfe07747f74fe808e58b04082708ed07
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.14.0
+ version: 1.14.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
- manifestHash: a9243888d806afd5d01d3c4055ef049b054e47be
+ manifestHash: 6c29db0e12070b472e959f76d466d545816ac13d
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.14.0
+ version: 1.14.1
- 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 6989dd324e..0d09406464 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: ea51fd4d4ba87cc6536dad5e5e453b79b8361b8b
+ manifestHash: 588add512066653ed9791198e20a29aea2904ee5
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.14.0
+ version: 1.14.1
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
- manifestHash: 21539a8fe3f60cff4604521235c4f48c04ba1644
+ manifestHash: d1da30b3cfe07747f74fe808e58b04082708ed07
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.14.0
+ version: 1.14.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
- manifestHash: a9243888d806afd5d01d3c4055ef049b054e47be
+ manifestHash: 6c29db0e12070b472e959f76d466d545816ac13d
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.14.0
+ version: 1.14.1
- 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 ce07033464..eadf7c7513 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: ea51fd4d4ba87cc6536dad5e5e453b79b8361b8b
+ manifestHash: 588add512066653ed9791198e20a29aea2904ee5
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.14.0
+ version: 1.14.1
- id: k8s-1.6
kubernetesVersion: '>=1.6.0 <1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
- manifestHash: 21539a8fe3f60cff4604521235c4f48c04ba1644
+ manifestHash: d1da30b3cfe07747f74fe808e58b04082708ed07
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.14.0
+ version: 1.14.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
- manifestHash: a9243888d806afd5d01d3c4055ef049b054e47be
+ manifestHash: 6c29db0e12070b472e959f76d466d545816ac13d
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
- version: 1.14.0
+ version: 1.14.1
- id: v1.7.0
kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
diff --git a/version.go b/version.go
index 1a63339654..77549389fb 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"
- KOPS_CI_VERSION = "1.14.1"
+ KOPS_RELEASE_VERSION = "1.14.1"
+ KOPS_CI_VERSION = "1.14.2"
)
// GitVersion should be replaced by the makefile
--
GitLab