Updating PR with changes from review feedback

contiv · Dec 7, 2017 · 5fb8c41 · 5fb8c41
1 parent 70331b1
commit 5fb8c41
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 670 deletions.
diff --git a/install/k8s/install.sh b/install/k8s/install.sh
@@ -17,10 +17,8 @@ fi
 k8sversion=$($kubectl version --short | grep "Server Version")
 if [[ "$k8sversion" == *"v1.4"* ]] || [[ "$k8sversion" == *"v1.5"* ]]; then
  k8sfolder="k8s1.4"
-elif [[ "$k8sversion" == *"v1.6"* ]] || [[ "$k8sversion" == *"v1.7"* ]]; then
- k8sfolder="k8s1.6"
 else
- k8sfolder="k8s1.8"
+ k8sfolder="rbac"
 fi
 
 #

diff --git a/install/k8s/k8s1.8/aci_gw.yaml b/install/k8s/k8s1.8/aci_gw.yaml
diff --git a/install/k8s/k8s1.8/cleanup.yaml b/install/k8s/k8s1.8/cleanup.yaml
diff --git a/install/k8s/k8s1.8/contiv-grafana.yml b/install/k8s/k8s1.8/contiv-grafana.yml
diff --git a/install/k8s/k8s1.8/contiv-prometheus.yml b/install/k8s/k8s1.8/contiv-prometheus.yml