From 03b08530cb398fab24a21162f99671b71abd32aa Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sun, 5 Mar 2017 22:04:57 -0500 Subject: [PATCH] Upgrade kubectl embedded in protokube to 1.6.0 Also revert #2037 This was causing tests to fail. The dns manifest is only used on 1.6 and above. This PR should _not_ be cherry-picked to a release branch, at least not until kubectl is verified stable. --- images/protokube-builder/onbuild.sh | 2 +- .../addons/kube-dns.addons.k8s.io/v1.6.0.yaml.template | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/images/protokube-builder/onbuild.sh b/images/protokube-builder/onbuild.sh index 748276a40f..4e943e0963 100755 --- a/images/protokube-builder/onbuild.sh +++ b/images/protokube-builder/onbuild.sh @@ -34,5 +34,5 @@ cp /go/bin/channels /src/.build/artifacts/ # channels uses protokube cd /src/.build/artifacts/ -curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/bin/linux/amd64/kubectl +curl -O https://storage.googleapis.com/kubernetes-release/release/v1.6.0-beta.1/bin/linux/amd64/kubectl chmod +x kubectl diff --git a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/v1.6.0.yaml.template b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/v1.6.0.yaml.template index f9bef72a65..bb61bd30b5 100644 --- a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/v1.6.0.yaml.template +++ b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/v1.6.0.yaml.template @@ -228,11 +228,3 @@ spec: - name: dns-tcp port: 53 protocol: TCP - ---- - -apiVersion: v1 -kind: ConfigMap -metadata: - name: kube-dns - namespace: kube-system