Merge pull request #1295 from SUSE/helm-fixes

Helm chart: Switch to `noShared` mode by default to support more setups
cloudfoundry · Oct 25, 2017 · 30f9f3b · 30f9f3b
2 parents b1f566f + 2a636aa
commit 30f9f3b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/deploy/kubernetes/README.md b/deploy/kubernetes/README.md
@@ -43,13 +43,24 @@ helm install stratos-ui/console --namespace=console --name my-console
 
 > You can change the namespace (--namespace) and the release name (--name) to values of your choice.
 
-This will create a Console instance named `my-console` in a namespace called `console` in your Kubernetes cluster. If you are deploying into a cluster that is not configured with a dynamic storage provisioner like `glusterfs` or `ceph`. You should specify the `noShared` override when installing the chart. 
+This will create a Console instance named `my-console` in a namespace called `console` in your Kubernetes cluster.
+
+After the install, you should be able to access the Console in a web browser by following [the instructions](#accessing-the-console) below.
+
+#### Using a Load Balancer
+If your Kubernetes deployment supports automatic configuration of a load balancer (i.e Google Container Engine), specify the parameters `useLb=true` when installing.
 
 ```
-helm install --set noShared=true stratos-ui/console --namespace=console --name my-console
+helm install stratos-ui/console --namespace=console --name my-console --set useLb=true
 ```
 
-After the install, you should be able to access the Console in a web browser by following [the instructions](#accessing-the-console) below.
+#### Specifying an External IP
+
+If the kubernetes cluster supports external IPs for services (see [ Service External IPs](https://kubernetes.io/docs/concepts/services-networking/service/#external-ips)), then the following arguments can be provided. In this following example the dashboard will be available at `https://192.168.100.100:5000`.
+
+```
+helm install stratos-ui/console --namespace=console --name my-console --set console.externalIP=192.168.100.100 console.port=5000
+```
 
 #### Upgrading your deployment
 
@@ -173,8 +184,6 @@ storageClass: persistent
 mariadb:
   persistence:
     storageClass: persistent
-# Set the following only if the cluster is not using a clustered filesystem
-noShared: true
 ```
 
 Run Helm with the override:

diff --git a/deploy/kubernetes/console/templates/pre-install.yaml b/deploy/kubernetes/console/templates/pre-install.yaml
@@ -15,7 +15,11 @@ metadata:
     "helm.sh/hook-weight": "-1"
 spec:
   accessModes:
+{{- if .Values.noShared }}
     - ReadWriteOnce
+{{- else }}
+    - ReadWriteMany
+{{- end }}
   resources:
     requests:
       storage: 1Mi
@@ -36,7 +40,11 @@ metadata:
     "helm.sh/hook-weight": "-1"
 spec:
   accessModes:
+{{- if .Values.noShared }}
     - ReadWriteOnce
+{{- else }}
+    - ReadWriteMany
+{{- end }}
   resources:
     requests:
       storage: 1Mi

diff --git a/deploy/kubernetes/console/templates/service.yaml b/deploy/kubernetes/console/templates/service.yaml
@@ -27,4 +27,4 @@ spec:
 {{- if .Values.console.externalIP }}
   externalIPs:
   -  {{ .Values.console.externalIP }}
-{{- end }}
+{{- end }}
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
@@ -17,7 +17,7 @@ useLb: false
 console:
   port: 443
 # externalIP: 127.0.0.1
-noShared: false
+noShared: true
 images:
   console: stratos-console
   proxy: stratos-proxy