Merge pull request kubernetes#2880 from justinsb/tag_17_alpha1

Bump dns-controller & kops for 1.7.0-alpha.1

Author: justinsb

Makefile

@@ -27,10 +27,10 @@ GOVERSION=1.8.3
 MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))
 
 # Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
-DNS_CONTROLLER_TAG=1.6.2
+DNS_CONTROLLER_TAG=1.7.0
 
-KOPS_RELEASE_VERSION = 1.6.2
-KOPS_CI_VERSION      = 1.6.3-beta.1
+KOPS_RELEASE_VERSION = 1.7.0-alpha.1
+KOPS_CI_VERSION      = 1.7.0-alpha.2
 
 # kops install location
 KOPS                 = ${GOPATH_1ST}/bin/kops

images/dns-controller-builder/Dockerfile

@@ -21,7 +21,7 @@ FROM debian:jessie
 RUN apt-get update && apt-get install --yes curl git gcc make
 
 # Install golang
-RUN curl -L https://storage.googleapis.com/golang/go1.7.3.linux-amd64.tar.gz | tar zx -C /usr/local
+RUN curl -L https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz | tar zx -C /usr/local
 ENV PATH $PATH:/usr/local/go/bin
 
 COPY onbuild.sh /onbuild.sh

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.2
+    version: v1.7.0
 spec:
   replicas: 1
   selector:
@@ -17,7 +17,7 @@ spec:
       labels:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
-        version: v1.6.2
+        version: v1.7.0
       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.2
+        image: kope/dns-controller:1.7.0
         command:
 {{ range $arg := DnsControllerArgv }}
         - "{{ $arg }}"

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.2
+    version: v1.7.0
 spec:
   replicas: 1
   selector:
@@ -17,7 +17,7 @@ spec:
       labels:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
-        version: v1.6.2
+        version: v1.7.0
       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.2
+        image: {{ DnsControllerImage }}:1.7.0
         command:
 {{ range $arg := DnsControllerArgv }}
         - "{{ $arg }}"

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

@@ -140,7 +140,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	{
 		key := "dns-controller.addons.k8s.io"
-		version := "1.6.1"
+		version := "1.7.0"
 
 		{
 			location := key + "/pre-k8s-1.6.yaml"

upup/pkg/fi/cloudup/networking_test.go

@@ -49,7 +49,7 @@ func Test_FindCNIAssetFromEnvironmentVariable(t *testing.T) {
 func Test_FindCNIAssetDefaultValue1_6(t *testing.T) {
 
 	cluster := &api.Cluster{Spec: api.ClusterSpec{}}
-	cluster.Spec.KubernetesVersion = "v1.6.2"
+	cluster.Spec.KubernetesVersion = "v1.7.0"
 	cniAsset, cniAssetHashString, err := findCNIAssets(cluster)
 
 	if err != nil {

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml

@@ -34,14 +34,14 @@ spec:
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
-    version: 1.6.1
+    version: 1.7.0
   - id: k8s-1.6
     kubernetesVersion: '>=1.6.0'
     manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
-    version: 1.6.1
+    version: 1.7.0
   - manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
     name: storage-aws.addons.k8s.io
     selector:

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml

@@ -34,14 +34,14 @@ spec:
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
-    version: 1.6.1
+    version: 1.7.0
   - id: k8s-1.6
     kubernetesVersion: '>=1.6.0'
     manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io
-    version: 1.6.1
+    version: 1.7.0
   - manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
     name: storage-aws.addons.k8s.io
     selector: