Move default properties from 'kyuubi-defaults.conf' to --conf args

apache · Jul 24, 2024 · 513cb9a · 513cb9a
1 parent 063ac86
commit 513cb9a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/charts/kyuubi/templates/kyuubi-statefulset.yaml b/charts/kyuubi/templates/kyuubi-statefulset.yaml
@@ -59,8 +59,21 @@ spec:
           {{- with .Values.command }}
           command: {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
-          {{- with .Values.args }}
+          {{- if .Values.args }}
           args: {{- tpl (toYaml .) $ | nindent 12 }}
+          {{- else }}
+          args:
+            - ./bin/kyuubi
+            - run
+            - --conf kyuubi.kubernetes.namespace={{ .Release.Namespace }}
+            - --conf kyuubi.frontend.connection.url.use.hostname=false
+            - --conf kyuubi.frontend.thrift.binary.bind.port={{ .Values.server.thriftBinary.port }}
+            - --conf kyuubi.frontend.thrift.http.bind.port={{ .Values.server.thriftHttp.port }}
+            - --conf kyuubi.frontend.rest.bind.port={{ .Values.server.rest.port }}
+            - --conf kyuubi.frontend.mysql.bind.port={{ .Values.server.mysql.port }}
+            - --conf kyuubi.frontend.protocols={{ include "kyuubi.frontend.protocols" . }}
+            - --conf kyuubi.metrics.enabled={{ .Values.monitoring.prometheus.enabled }}
+            - --conf kyuubi.metrics.reporters={{ .Values.metricsReporters }}
           {{- end }}
           env:
             - name: KYUUBI_CONF_DIR

diff --git a/charts/kyuubi/values.yaml b/charts/kyuubi/values.yaml
@@ -156,19 +156,11 @@ kyuubiConf:
   # $KYUUBI_CONF_DIR directory
   dir: /opt/kyuubi/conf
   # Configuration files from the specified keys (file name) and values (file content)
-  files:
-    'kyuubi-defaults.conf': |
-      ## Helm chart dependent configuration
-      kyuubi.kubernetes.namespace={{ .Release.Namespace }}
-      kyuubi.frontend.connection.url.use.hostname=false
-      kyuubi.frontend.thrift.binary.bind.port={{ .Values.server.thriftBinary.port }}
-      kyuubi.frontend.thrift.http.bind.port={{ .Values.server.thriftHttp.port }}
-      kyuubi.frontend.rest.bind.port={{ .Values.server.rest.port }}
-      kyuubi.frontend.mysql.bind.port={{ .Values.server.mysql.port }}
-      kyuubi.frontend.protocols={{ include "kyuubi.frontend.protocols" . }}
-      # Metrics
-      kyuubi.metrics.enabled={{ .Values.monitoring.prometheus.enabled }}
-      kyuubi.metrics.reporters={{ .Values.metricsReporters }}
+  files: []
+  #files:
+  #  'kyuubi-defaults.conf': |
+  #    kyuubi.authentication=NONE
+  #    kyuubi.engine.share.level=USER
 
   # Configuration files from the list of existing ConfigMaps and Secrets
   filesFrom: []