From: Cristina Pauna <cristina.pauna@enea.com>
Date: Thu, 7 Mar 2019 10:46:23 +0000 (+0000)
Subject: Merge "Add docs structure"
X-Git-Tag: 1.0.0~40
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=b7bfcaea7b65922d63d72706ba01d5ab4820cf2a;hp=3a3da864201f796debcd1ed5554255822240fccb;p=iec.git

Merge "Add docs structure"
---

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 <<EOF > "${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
diff --git a/scripts/setup-cni.sh b/scripts/setup-cni.sh
index 8b9730c..643f157 100755
--- a/scripts/setup-cni.sh
+++ b/scripts/setup-cni.sh
@@ -3,6 +3,7 @@ set -o xtrace
 set -e
 
 CLUSTER_IP=${1:-172.16.1.136} # Align with the value in our K8s setup script
+POD_NETWORK_CIDR=${2:-192.168.0.0/16}
 
 # Install the Etcd Database
 if [ "$(uname -m)" == 'aarch64' ]; then
@@ -20,7 +21,8 @@ kubectl apply -f "${SCRIPTS_DIR}/cni/calico/${ETCD_YAML}"
 kubectl apply -f "${SCRIPTS_DIR}/cni/calico/rbac.yaml"
 
 # Install Calico to system
-sed -i "s/10.96.232.136/${CLUSTER_IP}/" "${SCRIPTS_DIR}/cni/calico/calico.yaml"
+sed -i "s@10.96.232.136@${CLUSTER_IP}@; s@192.168.0.0/16@${POD_NETWORK_CIDR}@" \
+  "${SCRIPTS_DIR}/cni/calico/calico.yaml"
 kubectl apply -f "${SCRIPTS_DIR}/cni/calico/calico.yaml"
 
 # Remove the taints on master node