feat!: support each namespace config fields to be provided as value or via env var

Author: jhl-aa

helm-charts/pharia-kernel/templates/deployment.yaml

@@ -104,6 +104,17 @@ spec:
                   name: {{ .Values.global.phariaAIConfigMap }}
                   key: DOCUMENT_INDEX_URL
             {{- end }}
+            {{- if and .Values.defaultNamespacesEnabled .Values.global.phariaAIConfigMap }}
+            - name: NAMESPACES__ASSISTANT__CONFIG_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ .Values.global.phariaAIConfigMap }}
+                  key: PHARIA_ASSISTANT_API_SKILL_CONFIG
+            - name: NAMESPACES__ASSISTANT__REGISTRY__REGISTRY
+              value: "alephalpha.jfrog.io"
+            - name: NAMESPACES__ASSISTANT__REGISTRY__REPOSITORY
+              value: "assistant-skills"
+            {{- end }}
             {{- with .Values.env }}
             {{- toYaml . | nindent 12 }}
             {{- end }}

helm-charts/pharia-kernel/templates/operator-config.yaml

@@ -4,20 +4,33 @@ metadata:
   name: pharia-kernel-operator-config
 data:
   operator-config.toml: |
-    {{- $namespaces := .Values.defaultNamespacesEnabled | ternary (merge .Values.defaultNamespaces .Values.namespaces) .Values.namespaces -}}
-    {{- if $namespaces }}
-    {{- range $k, $v := $namespaces }}
+    {{- if .Values.namespaces }}
+    {{- range $k, $v := .Values.namespaces }}
+    {{- if or $v.config_url $v.config_access_token }}
     [namespaces.{{ $k }}]
+    {{- end }}
+    {{- if $v.config_url }}
     config_url = {{ $v.config_url | quote }}
-    {{- if $v.config_access_token_env_var }}
-    config_access_token_env_var = {{ $v.config_access_token_env_var | quote }}
     {{- end }}
+    {{- if $v.config_access_token }}
+    config_access_token = {{ $v.config_access_token | quote }}
+    {{- end }}
+    {{- if or $v.registry $v.repository $v.user $v.password }}
     [namespaces.{{ $k }}.registry]
     type = "oci"
+    {{- end }}
+    {{- if $v.registry }}
     registry = {{ $v.registry | quote }}
+    {{- end }}
+    {{- if $v.repository }}
     repository = {{ $v.repository | quote }}
-    user_env_var = {{ $v.user_env_var | quote }}
-    password_env_var = {{ $v.password_env_var | quote }}
+    {{- end }}
+    {{- if $v.user }}
+    user = {{ $v.user | quote }}
+    {{- end }}
+    {{- if $v.password }}
+    password = {{ $v.password | quote }}
+    {{- end }}
     {{ end }}
     {{- else }}
     [namespaces]

helm-charts/pharia-kernel/values.yaml

@@ -46,21 +46,23 @@ service:
   metricsProtocol: TCP
 serviceMonitor:
   enabled: false
-# -- If the default namespaces are enabled, the provided namespaces with existing keys are ignored
+# -- If the default namespaces are enabled, the provided namespaces with existing keys are overwritten
 defaultNamespacesEnabled: false
-defaultNamespaces:
-  assistant:
-    config_url: "http://pharia-assistant-api.pharia-ai.svc.cluster.local/skills/skill-config"
-    registry: alephalpha.jfrog.io
-    repository: assistant-skills
-    user_env_var: ALEPH_ALPHA_OCI_SKILL_REGISTRY_USER
-    password_env_var: ALEPH_ALPHA_OCI_SKILL_REGISTRY_PASSWORD
 # -- Active namespaces for Pharia Kernel. e.g.:
 # playground:
 #   config_url: "https://gitlab.aleph-alpha.de/api/v4/projects/997/repository/files/namespace.toml/raw?ref=main"
-#   config_access_token_env_var: "GITLAB_CONFIG_ACCESS_TOKEN"
+#   config_access_token: "GITLAB_CONFIG_ACCESS_TOKEN"
 #   registry: "registry.gitlab.aleph-alpha.de"
 #   repository: "engineering/pharia-kernel-playground/skills"
+#   user: "REGISTRY_USER"
+#   password: "REGISTRY_PASSWORD"
+# Each of the value can alternatively be provided as environment variables, which have higher precedence:
+# NAMESPACES__PLAYGROUND__CONFIG_URL
+# NAMESPACES__PLAYGROUND__CONFIG_ACCESS_TOKEN
+# NAMESPACES__PLAYGROUND__REGISTRY__REGISTRY
+# NAMESPACES__PLAYGROUND__REGISTRY__REPOSITORY
+# NAMESPACES__PLAYGROUND__REGISTRY__USER
+# NAMESPACES__PLAYGROUND__REGISTRY__PASSWORD
 namespaces: {}
 logLevel: info
 openTelemetryEndpoint: ""