From: Ciprian Barbu Date: Wed, 6 Mar 2019 14:12:01 +0000 (+0000) Subject: Merge "calico: Align IPv4 pool CIDR with k8s_master" X-Git-Tag: 1.0.0~41 X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=213fe20e6996b570081a86926ceafe4240ca983f;hp=a06c33c3c247eeeac2b75ef24e9f689ef0f866a2;p=iec.git Merge "calico: Align IPv4 pool CIDR with k8s_master" --- diff --git a/scripts/helm.sh b/scripts/helm.sh index 524a770..3f575d2 100755 --- a/scripts/helm.sh +++ b/scripts/helm.sh @@ -1,6 +1,7 @@ #!/bin/bash -ex VERSION='v2.12.3' +TILLER_SA_RBAC=~/tiller-rbac.yaml if [ "$(uname -m)" == 'aarch64' ]; then FLAVOR='linux-arm64' else @@ -16,3 +17,28 @@ if [ ! -e /usr/bin/helm ] || [ ! -e /usr/bin/tiller ]; then --transform "s|${FLAVOR}|/usr/bin|" "${FLAVOR}/"{helm,tiller} rm -f "/tmp/${TGZ_NAME}" fi + +if ! kubectl get serviceaccounts --namespace=kube-system | grep -q tiller; then + cat < "${TILLER_SA_RBAC}" +apiVersion: v1 +kind: ServiceAccount +metadata: + name: tiller + namespace: kube-system +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: tiller +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin +subjects: + - kind: ServiceAccount + name: tiller + namespace: kube-system +EOF + kubectl create -f "${TILLER_SA_RBAC}" + helm init --service-account tiller --tiller-image="jessestuart/tiller:${VERSION}" +fi