Merge pull request #1315 from SUSE/uaa-helm

Add ability to configure UAA settings when deploying UI through helm chart
cloudfoundry · Oct 25, 2017 · 9307aad · 9307aad
2 parents 578ebf6 + f65f8a4
commit 9307aad
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/deploy/kubernetes/README.md b/deploy/kubernetes/README.md
@@ -136,6 +136,30 @@ To login use the following credentials detailed [here](../../docs/access.md).
 
 > Note: For some environments like Minikube, you are not given an IP Address - it may show as `<nodes>`. In this case, run `kubectl cluster-info` and use the IP address of your node shown in the output of this command.
 
+## Specifying UAA configuration
+
+When deploying with SCF, the `scf-config-values.yaml` (see [SCF Wiki link](https://github.com/SUSE/scf/wiki/How-to-Install-SCF#configuring-the-deployment)) can be supplied when installing Stratos UI.
+```
+$ helm install stratos-ui/console  -f scf-config-values.yaml
+```
+
+Alternatively, you can supply the following configuration. Edit according to your environment and save to a file called `uaa-config.yaml`.
+```
+uaa:
+  protocol: https://
+  port: 2793
+  host: uaa.cf-dev.io
+  consoleClient:  cf
+  consoleClientSecret: 
+  consoleAdminIdentifier: cloud_controller.admin 
+  skipSSLValidation: false
+```
+
+To install stratos-ui with the above specified configuration:
+```
+$ helm install stratos-ui/console -f uaa-config.yaml
+```
+
 ## UAA for Testing
 A UAA Helm chart has been provided to quickly bring up an UAA instance for testing the console.
 

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
@@ -97,11 +97,10 @@ spec:
      {{- end }}
      {{- if not .Values.noShared }}
       - image: {{.Values.dockerRegistry}}/{{.Values.dockerOrg}}/{{.Values.images.proxy}}:{{.Values.consoleVersion}}
-        name: proxy
      {{- else }}
       - image: {{.Values.dockerRegistry}}/{{.Values.dockerOrg}}/{{.Values.images.proxyNoShared}}:{{.Values.consoleVersion}}
-        name: proxy
      {{- end }}
+        name: proxy
         env:
         - name: DB_USER
           value: "{{ .Values.mariadb.mariadbUser }}"
@@ -175,6 +174,29 @@ spec:
         {{- if .Values.socksProxy }}
           value: {{.Values.socksProxy}}
         {{- end }}
+        {{- if .Values.env.UAA_HOST }}  
+        - name: UAA_ENDPOINT 
+          value: https://scf.{{.Values.env.UAA_HOST}}:{{.Values.env.UAA_PORT}}
+        - name: CONSOLE_CLIENT 
+          value: cf
+        - name: CONSOLE_CLIENT_SECRET 
+          value: {{.Values.env.UAA_ADMIN_CLIENT_SECRET}}
+        - name: CONSOLE_ADMIN_SCOPE 
+          value: cloud_controller.admin
+        - name: SKIP_SSL_VALIDATION 
+          value: "true"
+        {{- else if .Values.uaa.host }}  
+        - name: UAA_ENDPOINT 
+          value: {{default "https://" .Values.uaa.protocol}}{{.Values.uaa.host}}:{{.Values.uaa.port}}
+        - name: CONSOLE_CLIENT 
+          value: {{.Values.uaa.consoleClient}}
+        - name: CONSOLE_CLIENT_SECRET 
+          value: {{.Values.uaa.consoleClientSecret}}
+        - name: CONSOLE_ADMIN_SCOPE 
+          value: {{.Values.uaa.consoleAdminIdentifier}}
+        - name: SKIP_SSL_VALIDATION 
+          value: {{default "true" .Values.uaa.skipSSLValidation | quote}}
+        {{- end }}
         ports:
         - containerPort: 3003
           name: proxy

diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
@@ -53,3 +53,16 @@ mariadb:
 #    storageClass: default
   metrics:
     enabled: false
+uaa:
+  protocol: https://
+  port: 
+  host: 
+  consoleClient:  
+  consoleClientSecret: 
+  consoleAdminIdentifier: 
+  skipSSLValidation: false
+ # SCF values compatability 
+env:
+  UAA_HOST: 
+  UAA_ADMIN_CLIENT_SECRET: 
+  UAA_PORT: