add apiserver configuration

charts/clearml/templates/configmap-apiserver.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.apiserver.additionalConfigs -}}
+{{- if .Values.apiserver.configuration.additionalConfigs -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{- include "clearml.labels" . | nindent 4 }}
 data:
-  {{- range $key, $val := .Values.apiserver.additionalConfigs }}
+  {{- range $key, $val := .Values.apiserver.configuration.additionalConfigs }}
   {{ $key }}: |
     {{- $val | nindent 4 }}
   {{- end }}

charts/clearml/values.yaml

@@ -105,35 +105,38 @@ apiserver:
   affinity: {}
 
   # -- additional configurations that can be used by api server; check examples in values.yaml file
-  additionalConfigs: {}
-    # services.conf: |
-    #   tasks {
-    #     non_responsive_tasks_watchdog {
-    #       # In-progress tasks that haven't been updated for at least 'value' seconds will be stopped by the watchdog
-    #       threshold_sec: 21000
-    #       # Watchdog will sleep for this number of seconds after each cycle
-    #       watch_interval_sec: 900
-    #     }
-    #   }
-    # apiserver.conf: |
-    #   auth {
-    #     fixed_users {
-    #       enabled: true
-    #       pass_hashed: false
-    #       users: [
-    #         {
-    #           username: "jane"
-    #           password: "12345678"
-    #           name: "Jane Doe"
-    #         },
-    #         {
-    #           username: "john"
-    #           password: "12345678"
-    #           name: "John Doe"
-    #         },
-    #       ]
-    #     }
-    #   }
+  configuration:
+    configRefName: ""
+    secretRefName: ""
+    additionalConfigs: {}
+      # services.conf: |
+      #   tasks {
+      #     non_responsive_tasks_watchdog {
+      #       # In-progress tasks that haven't been updated for at least 'value' seconds will be stopped by the watchdog
+      #       threshold_sec: 21000
+      #       # Watchdog will sleep for this number of seconds after each cycle
+      #       watch_interval_sec: 900
+      #     }
+      #   }
+      # apiserver.conf: |
+      #   auth {
+      #     fixed_users {
+      #       enabled: true
+      #       pass_hashed: false
+      #       users: [
+      #         {
+      #           username: "jane"
+      #           password: "12345678"
+      #           name: "Jane Doe"
+      #         },
+      #         {
+      #           username: "john"
+      #           password: "12345678"
+      #           name: "John Doe"
+      #         },
+      #       ]
+      #     }
+      #   }
 
 fileserver:
   service: