airship/promenade
Code Issues Proposed changes

Update tiller version to 2.10.0

Browse Source 
This also makes a corresponding update to the Makefile to address a bug
with which $(HELM) is being used that was exposed during local testing.

Change-Id: I08da45c1f232960c58ab482053befed83da6fdd6
This commit is contained in:
Mark Burnett 2018-08-30 15:54:07 -05:00
parent 9e2a74e319
commit 0233c30ffb
10 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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/*/.))

2
examples/basic/Genesis.yaml
View File

@ -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

2
examples/basic/HostSystem.yaml
View File

@ -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:

2
examples/basic/armada-resources.yaml
View File

@ -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

2
examples/complete/Genesis.yaml
View File

@ -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

2
examples/complete/HostSystem.yaml
View File

@ -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:

2
examples/complete/armada-resources.yaml
View File

@ -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

4
tools/gate/default-config-env
View File

@ -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

2
tools/helm_install.sh
View File

@ -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 {

4
tools/registry/IMAGES
View File

@ -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