Add env variables (#21)

Signed-off-by: Simon Misencik <[email protected]>
FRINXio · May 17, 2022 · 3d181d6 · 3d181d6
1 parent 90a6574
commit 3d181d6
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 34 deletions.
diff --git a/charts/frinx-frontend/Chart.yaml b/charts/frinx-frontend/Chart.yaml
@@ -3,7 +3,14 @@ name: frinx-frontend
 description: A Helm chart for Kubernetes deployment of the Frinx UI
 icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4
 type: application
-version: 1.0.0
-appVersion: "1.0.6"
+version: 1.1.0
+appVersion: "0.1.2-gamma"
 maintainers:
   - name: FRINX
+annotations:
+  artifacthub.io/changes: |
+    - kind: added
+      description: Add env variable
+      links:
+        - name: GitHub PR
+          url: https://github.com/FRINXio/helm-charts/pull/21
diff --git a/charts/frinx-frontend/README.md b/charts/frinx-frontend/README.md
@@ -59,3 +59,21 @@ helm uninstall [RELEASE_NAME]
 | `nodeSelector` | Node labels for pod assignment | `{}` |
 | `tolerations` | Toleration labels for pod assignment | `[]` |
 | `affinity` | Affinity settings for pod assignment | `{}` |
+
+| `env.AUTH_REDIRECT_SCHEME` | AUTH_REDIRECT_SCHEME env variable | `"http"` |
+| `env.AUTH_ENABLED` | AUTH_ENABLED env variable | `false` |
+| `env.URL_BASENAME` | URL_BASENAME env variable | `"/frinxui"` |
+| `env.UNIFLOW_ENABLED` | UNIFLOW_ENABLED env variable | `true` |
+| `env.CONDUCTOR_API_URL` | CONDUCTOR_API_URL env variable | `"/api/uniflow"` |
+| `env.UNIFLOW_API_DOCS_URL` | UNIFLOW_API_DOCS_URL env variable | `"/api/uniflow/docs"` |
+| `env.UNICONFIG_ENABLED` | UNICONFIG_ENABLED env variable | `true` |
+| `env.UNICONFIG_API_DOCS_URL` | UNICONFIG_API_DOCS_URL env variable | `"/api/uniflow/docs-uniconfig"` |
+| `env.INVENTORY_ENABLED` | INVENTORY_ENABLED env variable | `true` |
+| `env.INVENTORY_API_URL` | INVENTORY_API_URL env variable | `"/api/inventory"` |
+| `env.UNIRESOURCE_ENABLED` | UNIRESOURCE_ENABLED env variable | `true` |
+| `env.UNIRESOURCE_API_URL` | UNIRESOURCE_API_URL env variable | `"/api/uniresource"` |
+| `env.UNISTORE_API_URL` | UNISTORE_API_URL env variable | `"/api/unistore"` |
+| `env.GAMMA_ENABLED` | GAMMA_ENABLED env variable | `false` |
+| `env.AUTH_CLIENT_ID` | AUTH_CLIENT_ID env variable | `` |
+| `env.AUTH_REDIRECT_DOMAIN` | AUTH_REDIRECT_DOMAIN env variable | `localhost` |
+| `env.MSAL_AUTHORITY` | MSAL_AUTHORITY env variable | `https://login.microsoftonline.com/common/` |
diff --git a/charts/frinx-frontend/config/config.json b/charts/frinx-frontend/config/config.json
diff --git a/charts/frinx-frontend/templates/deployment.yaml b/charts/frinx-frontend/templates/deployment.yaml
@@ -20,13 +20,6 @@ spec:
       labels:
         {{- include "frinx-frontend.selectorLabels" . | nindent 8 }}
     spec:
-      volumes:
-        - name: config
-          configMap:
-            name: {{ template "frinx-frontend.fullname" . }}-configmap
-            items:
-            - key: config.json
-              path: config.json
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -46,12 +39,10 @@ spec:
               containerPort: 8888
               protocol: TCP
           env:
-            - name: TLS_PROTOCOL
-              value: "http"
-          volumeMounts:
-            - name: config
-              mountPath: /usr/share/nginx/html/config.json
-              subPath: config.json
+          {{- range $key, $val := .Values.env }}
+            - name: {{ $key | quote }}
+              value: {{ $val | quote }}
+          {{- end }}
           livenessProbe:
             httpGet:
               path: /

diff --git a/charts/frinx-frontend/values.yaml b/charts/frinx-frontend/values.yaml
@@ -77,3 +77,22 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+env:
+  AUTH_REDIRECT_SCHEME: "http"
+  AUTH_ENABLED: false
+  URL_BASENAME: "/frinxui"
+  UNIFLOW_ENABLED: true
+  CONDUCTOR_API_URL: "/api/uniflow"
+  UNIFLOW_API_DOCS_URL: "/api/uniflow/docs"
+  UNICONFIG_ENABLED: true
+  UNICONFIG_API_DOCS_URL: "/api/uniflow/docs-uniconfig"
+  INVENTORY_ENABLED: true
+  INVENTORY_API_URL: "/api/inventory"
+  UNIRESOURCE_ENABLED: true
+  UNIRESOURCE_API_URL: "/api/uniresource"
+  UNISTORE_API_URL: "/api/unistore"
+  GAMMA_ENABLED: false
+  AUTH_CLIENT_ID:
+  AUTH_REDIRECT_DOMAIN: localhost
+  MSAL_AUTHORITY: https://login.microsoftonline.com/common/