diff --git a/Makefile b/Makefile index d4b62f6e..a71b9d97 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,10 @@ BUILD_DIR := $(shell mktemp -d) DOCKER_REGISTRY ?= quay.io +HELM := $(BUILD_DIR)/helm IMAGE_PREFIX ?= airshipit IMAGE_NAME ?= promenade IMAGE_TAG ?= latest -HELM ?= helm PROXY ?= http://proxy.foo.com:8000 NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local USE_PROXY ?= false @@ -28,8 +28,6 @@ CHARTS := $(patsubst charts/%/.,%,$(wildcard charts/*/.)) IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} PYTHON_BASE_IMAGE ?= python:3.6 -HELM := $(BUILD_DIR)/helm -HELM ?= helm HELM_PIDFILE ?= $(abspath ./.helm-pid) CHARTS := $(patsubst charts/%/.,%,$(wildcard charts/*/.)) diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index bb67666f..f4387a04 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -32,7 +32,7 @@ data: images: armada: quay.io/airshipit/armada:master helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.9.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 kubernetes: apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2 diff --git a/examples/basic/HostSystem.yaml b/examples/basic/HostSystem.yaml index c0834848..728a3ce2 100644 --- a/examples/basic/HostSystem.yaml +++ b/examples/basic/HostSystem.yaml @@ -33,7 +33,7 @@ data: images: haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v2.9.1 + helm: lachlanevenson/k8s-helm:v2.10.0 kubernetes: kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2 packages: diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index 904c17d8..e803b8f2 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -1151,7 +1151,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.9.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 labels: node_selector_key: ucp-control-plane node_selector_value: enabled diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index 98036c66..850e81d1 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -30,7 +30,7 @@ data: images: armada: quay.io/airshipit/armada:master helm: - tiller: gcr.io/kubernetes-helm/tiller:v2.9.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 kubernetes: apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2 diff --git a/examples/complete/HostSystem.yaml b/examples/complete/HostSystem.yaml index f9d5432f..f6cd4e4b 100644 --- a/examples/complete/HostSystem.yaml +++ b/examples/complete/HostSystem.yaml @@ -33,7 +33,7 @@ data: images: haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v2.9.1 + helm: lachlanevenson/k8s-helm:v2.10.0 kubernetes: kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2 packages: diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index ad06f66f..6600d922 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -1687,7 +1687,7 @@ data: values: images: tags: - tiller: gcr.io/kubernetes-helm/tiller:v2.9.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 labels: node_selector_key: ucp-control-plane node_selector_value: enabled diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index fada491a..f7701157 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -7,7 +7,7 @@ IMAGE_COREDNS=coredns/coredns:1.1.2 IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 IMAGE_ETCD=quay.io/coreos/etcd:v3.2.14 IMAGE_HAPROXY=haproxy:1.8.3 -IMAGE_HELM=lachlanevenson/k8s-helm:v2.9.1 +IMAGE_HELM=lachlanevenson/k8s-helm:v2.10.0 IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.10.2 -IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.9.1 +IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.10.0 KUBELET_URL=https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz diff --git a/tools/helm_install.sh b/tools/helm_install.sh index f18eefb5..e8a2caae 100755 --- a/tools/helm_install.sh +++ b/tools/helm_install.sh @@ -17,7 +17,7 @@ set -x HELM=$1 -HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.9.1-linux-amd64.tar.gz"} +HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.10.0-linux-amd64.tar.gz"} function install_helm_binary { diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index efeff617..e2032255 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -4,8 +4,8 @@ gcr.io/google_containers/hyperkube-amd64,v1.10.2,hyperkube gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64 gcr.io/google_containers/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64 gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64 -gcr.io/kubernetes-helm/tiller,v2.9.1,tiller -lachlanevenson/k8s-helm,v2.9.1,helm +gcr.io/kubernetes-helm/tiller,v2.10.0,tiller +lachlanevenson/k8s-helm,v2.10.0,helm quay.io/airshipit/armada,master,armada quay.io/calico/cni,v1.11.0,calico-cni quay.io/calico/ctl,v1.6.1,calico-ctl