Move to tiller 2.14.0

This version fixes manifest validation [0], so a couple invalid
manifests are fixed in this patchset as well.

[0]: 32d7f1a3fc

Change-Id: I0cbdf21cf016271bef2d8a541687ce3ab28081ce
This commit is contained in:
Sean Eagan 2019-05-17 13:54:19 -05:00
parent 8c9be2b5b1
commit 184d114062
18 changed files with 18 additions and 23 deletions

View File

@ -73,7 +73,6 @@ metadata:
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: Role kind: Role
namespace: {{ $envAll.Release.Namespace }}
name: {{ $serviceAccountName }}-{{ $envAll.Release.Namespace }} name: {{ $serviceAccountName }}-{{ $envAll.Release.Namespace }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount

View File

@ -77,8 +77,6 @@ spec:
mountPath: /tmp/etc mountPath: /tmp/etc
- name: host - name: host
mountPath: /host mountPath: /host
securityContext:
readOnlyRootFilesystem: true
volumes: volumes:
- name: haproxy-bin - name: haproxy-bin
configMap: configMap:

View File

@ -93,5 +93,3 @@ spec:
- name: etc - name: etc
hostPath: hostPath:
path: {{ .Values.conf.haproxy.host_config_dir }} path: {{ .Values.conf.haproxy.host_config_dir }}
securityContext:
readOnlyRootFilesystem: true

View File

@ -39,7 +39,7 @@ Here is a complete sample document:
images: images:
armada: quay.io/airshipit/armada:latest armada: quay.io/airshipit/armada:latest
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.13.1 tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
kubernetes: kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6

View File

@ -22,7 +22,7 @@ Sample Document
images: images:
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
helm: helm:
helm: lachlanevenson/k8s-helm:v2.13.1 helm: lachlanevenson/k8s-helm:v2.14.0
kubernetes: kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6
packages: packages:

View File

@ -45,7 +45,7 @@ data:
images: images:
armada: quay.io/airshipit/armada:master armada: quay.io/airshipit/armada:master
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.13.1 tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
kubernetes: kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6

View File

@ -67,7 +67,7 @@ data:
images: images:
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
helm: helm:
helm: lachlanevenson/k8s-helm:v2.13.1 helm: lachlanevenson/k8s-helm:v2.14.0
kubernetes: kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6
packages: packages:

View File

@ -1152,7 +1152,7 @@ data:
values: values:
images: images:
tags: tags:
tiller: gcr.io/kubernetes-helm/tiller:v2.13.1 tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
labels: labels:
node_selector_key: ucp-control-plane node_selector_key: ucp-control-plane
node_selector_value: enabled node_selector_value: enabled

View File

@ -31,7 +31,7 @@ data:
images: images:
armada: quay.io/airshipit/armada:master armada: quay.io/airshipit/armada:master
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.13.1 tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
kubernetes: kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6

View File

@ -33,7 +33,7 @@ data:
images: images:
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
helm: helm:
helm: lachlanevenson/k8s-helm:v2.13.1 helm: lachlanevenson/k8s-helm:v2.14.0
kubernetes: kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6
packages: packages:

View File

@ -1687,7 +1687,7 @@ data:
values: values:
images: images:
tags: tags:
tiller: gcr.io/kubernetes-helm/tiller:v2.13.1 tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
labels: labels:
node_selector_key: ucp-control-plane node_selector_key: ucp-control-plane
node_selector_value: enabled node_selector_value: enabled

View File

@ -103,7 +103,7 @@ VALID_DOCS = [
'images': { 'images': {
'armada': 'quay.io/airshipit/armada:master', 'armada': 'quay.io/airshipit/armada:master',
'helm': { 'helm': {
'tiller': 'gcr.io/kubernetes-helm/tiller:v2.13.1' 'tiller': 'gcr.io/kubernetes-helm/tiller:v2.14.0'
}, },
'kubernetes': { 'kubernetes': {
'apiserver': 'apiserver':
@ -162,7 +162,7 @@ VALID_DOCS = [
'images': { 'images': {
'haproxy': 'haproxy:1.8.3', 'haproxy': 'haproxy:1.8.3',
'helm': { 'helm': {
'helm': 'lachlanevenson/k8s-helm:v2.13.1' 'helm': 'lachlanevenson/k8s-helm:v2.14.0'
}, },
'kubernetes': { 'kubernetes': {
'kubectl': 'kubectl':

View File

@ -32,7 +32,7 @@ data:
images: images:
armada: quay.io/airshipit/armada:master armada: quay.io/airshipit/armada:master
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.13.1 tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
kubernetes: kubernetes:
apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6 apiserver: gcr.io/google_containers/hyperkube-amd64:v1.11.6
controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6 controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.11.6

View File

@ -37,7 +37,7 @@ data:
images: images:
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
helm: helm:
helm: lachlanevenson/k8s-helm:v2.13.1 helm: lachlanevenson/k8s-helm:v2.14.0
kubernetes: kubernetes:
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.11.6
packages: packages:

View File

@ -1002,7 +1002,7 @@ data:
values: values:
images: images:
tags: tags:
tiller: gcr.io/kubernetes-helm/tiller:v2.13.1 tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
labels: labels:
node_selector_key: ucp-control-plane node_selector_key: ucp-control-plane
node_selector_value: enabled node_selector_value: enabled

View File

@ -7,7 +7,7 @@ IMAGE_COREDNS=coredns/coredns:1.1.3
IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
IMAGE_ETCD=quay.io/coreos/etcd:v3.2.18 IMAGE_ETCD=quay.io/coreos/etcd:v3.2.18
IMAGE_HAPROXY=haproxy:1.8.3 IMAGE_HAPROXY=haproxy:1.8.3
IMAGE_HELM=lachlanevenson/k8s-helm:v2.13.1 IMAGE_HELM=lachlanevenson/k8s-helm:v2.14.0
IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.11.6 IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.11.6
IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.13.1 IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.14.0
KUBELET_URL=https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz KUBELET_URL=https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz

View File

@ -17,7 +17,7 @@
set -x set -x
HELM=$1 HELM=$1
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz"} HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.14.0-linux-amd64.tar.gz"}
function install_helm_binary { function install_helm_binary {

View File

@ -4,8 +4,8 @@ gcr.io/google_containers/hyperkube-amd64,v1.11.6,hyperkube
gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64 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-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/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64
gcr.io/kubernetes-helm/tiller,v2.13.1,tiller gcr.io/kubernetes-helm/tiller,v2.14.0,tiller
lachlanevenson/k8s-helm,v2.13.1,helm lachlanevenson/k8s-helm,v2.14.0,helm
quay.io/airshipit/armada,master,armada quay.io/airshipit/armada,master,armada
quay.io/calico/cni,v1.11.0,calico-cni quay.io/calico/cni,v1.11.0,calico-cni
quay.io/calico/ctl,v1.6.1,calico-ctl quay.io/calico/ctl,v1.6.1,calico-ctl