From 3d7c567f8c404602e94176f3e60fe94b3da6004a Mon Sep 17 00:00:00 2001 From: Mark Burnett Date: Wed, 16 Aug 2017 10:53:18 -0500 Subject: [PATCH] Update versions for testing - Tiller and helm to 2.5.0 - Kubernetes to 1.6.8 Tiller 2.5 adds a verbosity flag which we are using, so the older version not having this flag is causing test failures. Kubernetes 1.6.4 seems to not be assigning IPs to static pods, therefore they don't properly get added to services (in particular, this effects the calico-etcd service). Change-Id: I9d8a55dc2b5d248eb6bd3c820fe33f0f827bc83d --- Dockerfile | 6 +++--- example/vagrant-input-config.yaml | 10 +++++----- tools/promenade-config.yaml | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index e199aad6..cdbb6576 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,9 +15,9 @@ FROM python:3.6 ENV CNI_VERSION=v0.5.2 \ - HELM_VERSION=v2.4.2 \ - KUBECTL_VERSION=v1.6.4 \ - KUBELET_VERSION=v1.6.4 + HELM_VERSION=v2.5.0 \ + KUBECTL_VERSION=v1.6.8 \ + KUBELET_VERSION=v1.6.8 VOLUME /etc/promenade VOLUME /target diff --git a/example/vagrant-input-config.yaml b/example/vagrant-input-config.yaml index 86804388..99b1a0df 100644 --- a/example/vagrant-input-config.yaml +++ b/example/vagrant-input-config.yaml @@ -67,16 +67,16 @@ spec: node: quay.io/calico/node:v1.3.0 policy-controller: quay.io/calico/kube-policy-controller:v0.6.0 kubernetes: - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.6.4 - controller-manager: quay.io/attcomdev/kube-controller-manager:v1.6.4 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.6.8 + controller-manager: quay.io/attcomdev/kube-controller-manager:v1.6.8 dns: dnsmasq: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.2 kubedns: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.2 sidecar: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.2 etcd: quay.io/coreos/etcd:v3.2.1 - kubectl: gcr.io/google_containers/hyperkube-amd64:v1.6.4 - proxy: gcr.io/google_containers/hyperkube-amd64:v1.6.4 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.6.4 + kubectl: gcr.io/google_containers/hyperkube-amd64:v1.6.8 + proxy: gcr.io/google_containers/hyperkube-amd64:v1.6.8 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.6.8 promenade: quay.io/attcomdev/promenade:latest tiller: gcr.io/kubernetes-helm/tiller:v2.5.0 packages: diff --git a/tools/promenade-config.yaml b/tools/promenade-config.yaml index 634c476a..c6089e33 100644 --- a/tools/promenade-config.yaml +++ b/tools/promenade-config.yaml @@ -70,18 +70,18 @@ spec: node: quay.io/calico/node:v1.3.0 policy-controller: quay.io/calico/kube-policy-controller:v0.6.0 kubernetes: - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.6.4 - controller-manager: quay.io/attcomdev/kube-controller-manager:v1.6.4 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.6.8 + controller-manager: quay.io/attcomdev/kube-controller-manager:v1.6.8 dns: dnsmasq: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.2 kubedns: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.2 sidecar: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.2 etcd: quay.io/coreos/etcd:v3.2.1 - kubectl: gcr.io/google_containers/hyperkube-amd64:v1.6.4 - proxy: gcr.io/google_containers/hyperkube-amd64:v1.6.4 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.6.4 + kubectl: gcr.io/google_containers/hyperkube-amd64:v1.6.8 + proxy: gcr.io/google_containers/hyperkube-amd64:v1.6.8 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.6.8 promenade: quay.io/attcomdev/promenade:latest - tiller: gcr.io/kubernetes-helm/tiller:v2.4.2 + tiller: gcr.io/kubernetes-helm/tiller:v2.5.0 packages: docker: docker.io=1.12.6-0ubuntu1~16.04.1 dnsmasq: dnsmasq=2.75-1ubuntu0.16.04.2