Merge branch 'parametrize-ui' into 'enterprise'

misc: Parametrizing the UI deploy configuration

See merge request dkinternal/observability/dataops-observability!56

Author: ci bot

deploy/charts/observability-app/templates/observability-ui.yaml

@@ -30,21 +30,6 @@ spec:
       serviceAccountName: {{ include "observability.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.observability_ui.podSecurityContext | nindent 8 }}
-      {{- if or .Values.observability_ui.environmentJson .Values.observability_ui.manifestJson }}
-      volumes:
-        - name: {{ include "observability.observability_ui.name" . }}-configmap-volume
-          configMap:
-            name: {{ include "observability.observability_ui.name" . }}-configmap
-            items:
-            {{- if .Values.observability_ui.environmentJson }}
-              - key: "environment.json"
-                path: "environment.json"
-            {{- end }}
-            {{- if .Values.observability_ui.manifestJson }}
-              - key: "module-federation.manifest.json"
-                path: "module-federation.manifest.json"
-            {{- end }}
-      {{- end }}
       containers:
         - name: {{ include "observability.observability_ui.name" . }}
           securityContext:
@@ -58,31 +43,21 @@ spec:
           resources:
             {{- toYaml .Values.observability_ui.resources | nindent 12 }}
           env:
-            {{- if .Values.observability_api.hostname }}
+            - name: OBSERVABILITY_API_BASE_URL
+              value: {{ .Values.observability_ui.api_base_url | quote }}
+            - name: OBSERVABILITY_AUTH_METHOD
+              value: {{ .Values.observability_ui.auth_method | quote }}
+            {{- if .Values.observability_ui.hostname }}
             - name: OBSERVABILITY_API_HOSTNAME
               value: {{ tpl .Values.observability_api.hostname . | quote }}
             {{- end }}
             {{- if not (quote .Values.observability_ui.csp_extra | empty) }}
             - name: OBSERVABILITY_CSP_EXTRA
               value: {{ tpl .Values.observability_ui.csp_extra . | quote }}
             {{- end }}
-          {{- if or .Values.observability_ui.environmentJson .Values.observability_ui.manifestJson .Values.extraVolumeMounts }}
+          {{- with .Values.extraVolumeMounts }}
           volumeMounts:
-            {{- if .Values.observability_ui.environmentJson }}
-            - mountPath: /observability_ui/shell/environments/environment.json
-              name: {{ include "observability.observability_ui.name" . }}-configmap-volume
-              readOnly: true
-              subPath: environment.json
-            {{- end }}
-            {{- if .Values.observability_ui.manifestJson }}
-            - mountPath: /observability_ui/shell/assets/module-federation.manifest.json
-              name: {{ include "observability.observability_ui.name" . }}-configmap-volume
-              readOnly: true
-              subPath: module-federation.manifest.json
-            {{- end }}
-            {{- with .Values.extraVolumeMounts }}
             {{ toYaml . | nindent 12 }}
-            {{- end }}
           {{- end }}
       {{- with .Values.extraVolumes }}
       volumes:
@@ -122,21 +97,4 @@ spec:
       {{- end }}
   selector:
     {{- include "observability.observability_ui.selectorLabels" . | nindent 4 }}
-{{- if or .Values.observability_ui.environmentJson .Values.observability_ui.manifestJson }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "observability.observability_ui.name" . }}-configmap
-  labels:
-    {{- include "observability.labels" . | nindent 4 }}
-    {{- include "observability.observability_ui.selectorLabels" . | nindent 4 }}
-data:
-  {{- if .Values.observability_ui.environmentJson }}
-  environment.json: {{ .Values.observability_ui.environmentJson | toPrettyJson | quote }}
-  {{- end }}
-  {{- if .Values.observability_ui.manifestJson }}
-  module-federation.manifest.json: {{ .Values.observability_ui.manifestJson | toPrettyJson | quote }}
-  {{- end }}
-{{- end }}
 {{- end }}

deploy/charts/observability-app/values.yaml

@@ -24,6 +24,8 @@ observability_ui:
     type: NodePort
     port: 8082
     nodePort: 8082
+  api_base_url: "/api"
+  auth_method: "sso"
   podSecurityContext:
     sysctls:
       - name: net.core.somaxconn
@@ -32,7 +34,6 @@ observability_ui:
   nodeSelector: { }
   tolerations: [ ]
   affinity: { }
-  environmentJson: {"apiBaseUrl": "/api"}
 
 observability_api:
   enable: true

deploy/docker/observability-ui.dockerfile

@@ -18,5 +18,7 @@ ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
 
 COPY --from=build-image --chown=nginx:nginx /observability_ui/dist /observability_ui
 COPY --from=build-image --chown=nginx:nginx /observability_ui/nginx.conf /etc/nginx/templates/nginx.conf.template
+COPY --from=build-image --chown=nginx:nginx \
+    /observability_ui/config-observability-docker.sh /docker-entrypoint.d/40-configure-observability.sh
 
 RUN mv /observability_ui/auth /observability_ui/shell/

observability_ui/apps/shell/src/module-federation.manifest.prod.json

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+/usr/bin/envsubst <<EOT > /observability_ui/shell/environments/environment.json
+{
+  "apiBaseUrl": "${OBSERVABILITY_API_BASE_URL:-/api}"
+}
+EOT
+
+cat <<EOT > /observability_ui/shell/assets/module-federation.manifest.json
+{
+  "basic-auth": {
+    "routePath": "authentication",
+    "remoteEntry": "/auth/remoteEntry.js",
+    "remoteName": "basic-auth",
+    "exposedModule": "./Authentication",
+    "exposedModuleName": "AuthenticationModule"
+  }
+}
+EOT

observability_ui/config-observability-docker.sh

@@ -5,7 +5,6 @@
   "scripts": {
     "start": "nx serve-mfe",
     "build": "yarn lerna run make:linkable && yarn link @observability/ui && yarn nx build-mfe",
-    "postbuild": "cp apps/shell/src/module-federation.manifest.prod.json dist/shell/assets/module-federation.manifest.json",
     "build:ci": "nx reset && yarn build",
     "test": "jest",
     "postinstall": "lerna run make:linkable && yarn link @observability/ui",

observability_ui/package.json

@@ -30,7 +30,7 @@
 
 from scripts.invocations.common import MINIKUBE_PROFILE, check_env_tools, get_docker_env, get_host_env
 
-KUBE_VERSION = os.environ.get("INVOKE_KUBE_VERSION", "v1.29")
+KUBE_VERSION = os.environ.get("INVOKE_KUBE_VERSION", "v1.33.5")
 NAMESPACE = "datakitchen"
 HELM_SVC_FOLDER = os.path.join("deploy", "charts", "observability-services")
 HELM_APP_FOLDER = os.path.join("deploy", "charts", "observability-app")