Tag alpha4, dns-controller 1.5.1

kubernetes · Jan 21, 2017 · a60d798 · a60d798
1 parent a0a59f3
commit a60d798
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ GOVERSION=1.7.4
 MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))
 
 # Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
-DNS_CONTROLLER_TAG=1.5.0
+DNS_CONTROLLER_TAG=1.5.1
 
 ifndef VERSION
   # To keep both CI and end-users building from source happy,
@@ -43,7 +43,7 @@ ifndef VERSION
   # We expect that if you are uploading nodeup/protokube, you will set
   # VERSION (along with S3_BUCKET), either directly or by setting CI=1
   ifndef CI
-    VERSION=1.5.0-alpha3
+    VERSION=1.5.0-alpha4
   else
     VERSION := git-$(shell git describe --always)
   endif

diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/addon.yaml b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/addon.yaml
@@ -3,8 +3,8 @@ metadata:
   name: dns-controller
 spec:
   addons:
-  - version: 1.5.0
+  - version: 1.5.1
     selector:
       k8s-addon: dns-controller.addons.k8s.io
-    manifest: v1.5.0.yaml
+    manifest: v1.5.1.yaml
 
diff --git a/...roller.addons.k8s.io/v1.5.0.yaml.template → ...roller.addons.k8s.io/v1.5.1.yaml.template b/...roller.addons.k8s.io/v1.5.0.yaml.template → ...roller.addons.k8s.io/v1.5.1.yaml.template
@@ -6,7 +6,7 @@ metadata:
   labels:
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.5.0
+    version: v1.5.1
 spec:
   replicas: 1
   selector:
@@ -17,7 +17,7 @@ spec:
       labels:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
-        version: v1.5.0
+        version: v1.5.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.5.0
+        image: kope/dns-controller:1.5.1
         command:
 {{ range $arg := DnsControllerArgv }}
         - "{{ $arg }}"

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -115,7 +115,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	{
 		key := "dns-controller.addons.k8s.io"
-		version := "1.5.0"
+		version := "1.5.1"
 
 		location := key + "/v" + version + ".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
@@ -19,11 +19,11 @@ spec:
     selector:
       k8s-addon: limit-range.addons.k8s.io
     version: 1.5.0
-  - manifest: dns-controller.addons.k8s.io/v1.5.0.yaml
+  - manifest: dns-controller.addons.k8s.io/v1.5.1.yaml
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
-    version: 1.5.0
+    version: 1.5.1
   - manifest: storage-aws.addons.k8s.io/v1.5.0.yaml
     name: storage-aws.addons.k8s.io
     selector:

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
@@ -19,11 +19,11 @@ spec:
     selector:
       k8s-addon: limit-range.addons.k8s.io
     version: 1.5.0
-  - manifest: dns-controller.addons.k8s.io/v1.5.0.yaml
+  - manifest: dns-controller.addons.k8s.io/v1.5.1.yaml
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
-    version: 1.5.0
+    version: 1.5.1
   - manifest: storage-aws.addons.k8s.io/v1.5.0.yaml
     name: storage-aws.addons.k8s.io
     selector: