Merge pull request #113 from Calcagiara/coreConfig

bump/feat(core): added configuration to core generated pods, changed …
scc-digitalhub · Sep 4, 2024 · 8be996d · 8be996d
2 parents 3704a59 + c98d82b
commit 8be996d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 11 deletions.
diff --git a/charts/core/Chart.yaml b/charts/core/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: core
 description: Core backend application for DigitalHub.
 type: application
-version: 0.2.3
-appVersion: "0.7.0-beta3"
+version: 0.2.4
+appVersion: "0.7.0-beta5"
 maintainers:
   - name: ffais
     url: https://github.com/ffais

diff --git a/charts/core/templates/configmap.yaml b/charts/core/templates/configmap.yaml
@@ -54,6 +54,7 @@ data:
   KANIKO_IMAGE_PREFIX: {{ .Values.registry.kaniko.imagePrefix | default .Release.Namespace }}
   DOCKER_REGISTRY_SECRET: {{ .Values.global.registry.secretName }}
 {{- end }}
+  KANIKO_ARGS: {{ .Values.kanikoArgs | quote }}
   DH_CORS_ORIGINS: {{ .Values.corsOrigin | quote }}
 {{- if .Values.keystore.secretName }}
   JWT_KEYSTORE_PATH: "/etc/keystore/{{ .Values.keystore.keyName }}"
@@ -67,3 +68,11 @@ data:
   K8S_TEMPLATES: {{ include "core.profiles" . | quote }}
 {{- end }}
   K8S_INIT_IMAGE: "{{ .Values.initImage.builderTool.image }}:{{ .Values.initImage.builderTool.tag }}"
+  K8S_ENABLE_METRICS: {{ .Values.additionalConfig.debug.enableMetrics | quote }}
+  K8S_ENABLE_LOGS: {{ .Values.additionalConfig.debug.enableLogs | quote }}
+  K8S_SEC_DISABLE_ROOT: {{ .Values.additionalConfig.security.disableRoot | quote }}
+  K8S_RESOURCE_CPU_DEFAULT: {{ .Values.additionalConfig.resources.cpuReq }}
+  K8S_RESOURCE_CPU_LIMIT: {{ .Values.additionalConfig.resources.cpuLim }}
+  K8S_RESOURCE_MEM_DEFAULT: {{ .Values.additionalConfig.resources.memReq }}
+  K8S_RESOURCE_MEM_LIMIT: {{ .Values.additionalConfig.resources.memLim }}
+  K8S_RESOURCE_GPU_KEY: {{ .Values.additionalConfig.resources.gpuKey }}
diff --git a/charts/core/templates/secret.yaml b/charts/core/templates/secret.yaml
@@ -11,11 +11,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: core-auth-creds
-  annotations:
-    "helm.sh/hook": pre-install
-    "helm.sh/hook-weight": "-4"
-    "helm.sh/hook-delete-policy": hook-failed
 type: Opaque
 data:
-  clientId: {{ randAlphaNum 24 | nospace | b64enc }}
-  clientSecret: {{ randAlphaNum 24 | nospace | b64enc }}
+  clientId: {{ .Values.coreAuthCreds.clientId | b64enc }}
+  clientSecret: {{ .Values.coreAuthCreds.clientSecret | b64enc }}
diff --git a/charts/core/values.yaml b/charts/core/values.yaml
@@ -160,9 +160,9 @@ runtime:
     tag: "0.7.0b3"
   python:
     image: "ghcr.io/scc-digitalhub/digitalhub-serverless/python-runtime"
-    tag3_9: "3.9-0.7.0b2"
-    tag3_10: "3.10-0.7.0b2"
-    tag3_11: "3.11-0.7.0b2"
+    tag3_9: "3.9-0.7.0b3"
+    tag3_10: "3.10-0.7.0b3"
+    tag3_11: "3.11-0.7.0b3"
 
 initImage:
   builderTool:
@@ -230,3 +230,22 @@ profiles: []
   #   path: test/template2.json
   # - name: template3
   #   path: test/template3.json
+
+coreAuthCreds:
+  clientId: ""
+  clientSecret: ""
+
+kanikoArgs: false
+
+additionalConfig:
+  debug:
+    enableMetrics: false
+    enableLogs: true
+  security:
+    disableRoot: true
+  resources:
+    cpuReq: ""
+    cpuLim: ""
+    memReq: ""
+    memLim: ""
+    gpuKey: ""