Merge pull request #2478 from justinsb/tag_160_beta1

Tag 1.6.0-beta.1
kubernetes · May 2, 2017 · 757f31e · 757f31e
2 parents b351696 + 81e8a90
commit 757f31e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -29,10 +29,10 @@ 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.0
+DNS_CONTROLLER_TAG=1.6.1
 
-KOPS_RELEASE_VERSION=1.6.0-alpha.2
-KOPS_CI_VERSION=1.6.0-alpha.3
+KOPS_RELEASE_VERSION=1.6.0-beta.1
+KOPS_CI_VERSION=1.6.0-beta.2
 
 GITSHA := $(shell cd ${GOPATH_1ST}/src/k8s.io/kops; git describe --always)
 

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
@@ -6,7 +6,7 @@ metadata:
   labels:
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.6.0
+    version: v1.6.1
 spec:
   replicas: 1
   selector:
@@ -17,7 +17,7 @@ spec:
       labels:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
-        version: v1.6.0
+        version: v1.6.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.6.0
+        image: kope/dns-controller:1.6.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
@@ -6,7 +6,7 @@ metadata:
   labels:
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.6.0
+    version: v1.6.1
 spec:
   replicas: 1
   selector:
@@ -17,7 +17,7 @@ spec:
       labels:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
-        version: v1.6.0
+        version: v1.6.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: {{ DnsControllerImage }}:1.6.0
+        image: {{ DnsControllerImage }}:1.6.1
         command:
 {{ range $arg := DnsControllerArgv }}
         - "{{ $arg }}"

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -139,7 +139,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	{
 		key := "dns-controller.addons.k8s.io"
-		version := "1.6.1-alpha.2"
+		version := "1.6.1"
 
 		{
 			location := key + "/pre-k8s-1.6.yaml"