From 8571924843594811f6c895d6571cde8be08c3116 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Mon, 19 Jun 2017 13:38:51 -0400 Subject: [PATCH] Bump dns-controller version for fixes --- Makefile | 2 +- .../dns-controller.addons.k8s.io/k8s-1.6.yaml.template | 6 +++--- .../dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 212f769568..504dc5bc28 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ GOVERSION=1.8.1 MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))")) # Keep in sync with upup/models/cloudup/resources/addons/dns-controller/ -DNS_CONTROLLER_TAG=1.6.1 +DNS_CONTROLLER_TAG=1.6.2 KOPS_RELEASE_VERSION = 1.6.1 KOPS_CI_VERSION = 1.6.2-beta.1 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 ae265d4da7..6d7689511c 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.6.1 + version: v1.6.2 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.6.1 + version: v1.6.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.6.1 + image: kope/dns-controller:1.6.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 50ca81d32d..43640ed109 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.6.1 + version: v1.6.2 spec: replicas: 1 selector: @@ -17,7 +17,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.6.1 + version: v1.6.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: {{ DnsControllerImage }}:1.6.1 + image: {{ DnsControllerImage }}:1.6.2 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}"