Use existing config map or secret for api-server config (#95)

* adapt ingress

* update docs

* remove idea

* fix imagepullsecret error

* add apiserver configuration

* add apiserver configuration

* add apiserver configuration

charts/clearml/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "4.1.2"
+version: "4.1.3"
 appVersion: "1.6.0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg

charts/clearml/README.md

@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes
 
-![Version: 4.1.2](https://img.shields.io/badge/Version-4.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square)
+![Version: 4.1.3](https://img.shields.io/badge/Version-4.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square)
 
 MLOps platform
 
@@ -129,10 +129,10 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| apiserver.additionalConfigs | object | `{}` | additional configurations that can be used by api server; check examples in values.yaml file |
 | apiserver.affinity | object | `{}` |  |
 | apiserver.authCookiesMaxAge | int | `864000` | Amount of seconds the authorization cookie will last in user browser |
 | apiserver.configDir | string | `"/opt/clearml/config"` |  |
+| apiserver.configuration | object | `{"additionalConfigs":{},"configRefName":"","secretRefName":""}` | additional configurations that can be used by api server; check examples in values.yaml file |
 | apiserver.extraEnvs | list | `[]` |  |
 | apiserver.image.pullPolicy | string | `"IfNotPresent"` |  |
 | apiserver.image.repository | string | `"allegroai/clearml"` |  |

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/templates/deployment-apiserver.yaml

@@ -130,18 +130,26 @@ spec:
             httpGet:
               path: /debug.ping
               port: 8008
-          {{- if .Values.apiserver.additionalConfigs }}
+          {{- if or .Values.apiserver.configuration.additionalConfigs .Values.apiserver.configuration.configRefName  .Values.apiserver.configuration.secretRefName }}
           volumeMounts:
            - name: apiserver-config
              mountPath: /opt/clearml/config
           {{- end }}
           resources:
             {{- toYaml .Values.apiserver.resources | nindent 12 }}
-      {{- if .Values.apiserver.additionalConfigs }}
+      {{- if or .Values.apiserver.configuration.additionalConfigs .Values.apiserver.configuration.configRefName  .Values.apiserver.configuration.secretRefName }}
       volumes:
         - name: apiserver-config
+          {{- if or .Values.apiserver.configuration.configRefName }}
+          configMap:
+            name: {{ .Values.apiserver.configuration.configRefName }}
+          {{- else if or .Values.apiserver.configuration.secretRefName }}
+          secret:
+            secretName: {{ .Values.apiserver.configuration.secretRefName }}
+          {{- else if or .Values.apiserver.configuration.additionalConfigs }}
           configMap:
             name: "{{ include "clearml.fullname" . }}-apiserver-configmap"
+          {{- end }}
       {{- end }}
       {{- with .Values.apiserver.nodeSelector }}
       nodeSelector:

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: {}
+  configuration:
-    # services.conf: |
+    configRefName: ""
-    #   tasks {
+    secretRefName: ""
-    #     non_responsive_tasks_watchdog {
+    additionalConfigs: {}
-    #       # In-progress tasks that haven't been updated for at least 'value' seconds will be stopped by the watchdog
+      # services.conf: |
-    #       threshold_sec: 21000
+      #   tasks {
-    #       # Watchdog will sleep for this number of seconds after each cycle
+      #     non_responsive_tasks_watchdog {
-    #       watch_interval_sec: 900
+      #       # 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
-    # apiserver.conf: |
+      #       watch_interval_sec: 900
-    #   auth {
+      #     }
-    #     fixed_users {
+      #   }
-    #       enabled: true
+      # apiserver.conf: |
-    #       pass_hashed: false
+      #   auth {
-    #       users: [
+      #     fixed_users {
-    #         {
+      #       enabled: true
-    #           username: "jane"
+      #       pass_hashed: false
-    #           password: "12345678"
+      #       users: [
-    #           name: "Jane Doe"
+      #         {
-    #         },
+      #           username: "jane"
-    #         {
+      #           password: "12345678"
-    #           username: "john"
+      #           name: "Jane Doe"
-    #           password: "12345678"
+      #         },
-    #           name: "John Doe"
+      #         {
-    #         },
+      #           username: "john"
-    #       ]
+      #           password: "12345678"
-    #     }
+      #           name: "John Doe"
-    #   }
+      #         },
+      #       ]
+      #     }
+      #   }
 
 fileserver:
   service: