reformat

Author: zhaohehuhu

charts/kyuubi/templates/kyuubi-service.yaml

@@ -37,8 +37,11 @@ spec:
       {{- end }}
   selector:
     {{- include "kyuubi.selectorLabels" $ | nindent 4 }}
-  {{- with $frontend.service.sessionAffinity }}
-  {{- toYaml . | nindent 4 }}
+  {{- if ($frontend.service.sessionAffinity) }}
+  sessionAffinity: {{ $frontend.service.sessionAffinity }}
+  {{- end }}
+  {{- with $frontend.service.sessionAffinityConfig }}
+  sessionAffinityConfig: {{- toYaml . | nindent 4 }}
   {{- end }}
 ---
 {{- end }}

charts/kyuubi/values.yaml

@@ -85,13 +85,12 @@ server:
       port: "{{ .Values.server.thriftBinary.port }}"
       nodePort: ~
       annotations: {}
-      #candidates are ClientIP or None, ClientIP is required to set if session affinity is enabled
-      #default timeout is 10800s
-      sessionAffinity: {}
-        #sessionAffinity: ClientIP
-        #sessionAffinityConfig:
-        #  clientIP:
-        #    timeoutSeconds: 10800s
+      # candidates are ClientIP or None, ClientIP is required to set if session affinity is enabled
+      # default timeout is 10800s
+      sessionAffinity: ~
+      sessionAffinityConfig: {}
+      #  clientIP:
+      #   timeoutSeconds: 10800
 
   # Thrift HTTP protocol (HiveServer2 compatible)
   thriftHttp:
@@ -102,13 +101,12 @@ server:
       port: "{{ .Values.server.thriftHttp.port }}"
       nodePort: ~
       annotations: {}
-      #candidates are ClientIP or None, ClientIP is required to set if session affinity is enabled
-      #default timeout is 10800s
-      sessionAffinity: {}
-        #sessionAffinity: ClientIP
-        #sessionAffinityConfig:
-        #  clientIP:
-        #    timeoutSeconds: 10800s
+      # candidates are ClientIP or None, ClientIP is required to set if session affinity is enabled
+      # default timeout is 10800s
+      sessionAffinity: ~
+      sessionAffinityConfig: {}
+      #  clientIP:
+      #   timeoutSeconds: 10800
 
   # REST API protocol (experimental)
   rest:
@@ -119,13 +117,12 @@ server:
       port: "{{ .Values.server.rest.port }}"
       nodePort: ~
       annotations: {}
-      #candidates are ClientIP or None, ClientIP is required to set if session affinity is enabled
-      #default timeout is 10800s
-      sessionAffinity: {}
-        #sessionAffinity: ClientIP
-        #sessionAffinityConfig:
-        #  clientIP:
-        #    timeoutSeconds: 10800s
+      # candidates are ClientIP or None, ClientIP is required to set if session affinity is enabled
+      # default timeout is 10800s
+      sessionAffinity: ~
+      sessionAffinityConfig: {}
+      #  clientIP:
+      #   timeoutSeconds: 10800
 
   # MySQL compatible text protocol (experimental)
   mysql:
@@ -136,13 +133,12 @@ server:
       port: "{{ .Values.server.mysql.port }}"
       nodePort: ~
       annotations: {}
-      #candidates are ClientIP or None, ClientIP is required to set if session affinity is enabled
-      #default timeout is 10800s
-      sessionAffinity: {}
-        #sessionAffinity: ClientIP
-        #sessionAffinityConfig:
-        #  clientIP:
-        #    timeoutSeconds: 10800s
+      # candidates are ClientIP or None, ClientIP is required to set if session affinity is enabled
+      # default timeout is 10800s
+      sessionAffinity: ~
+      sessionAffinityConfig: {}
+      #  clientIP:
+      #   timeoutSeconds: 10800
 
 monitoring:
   # Exposes metrics in Prometheus format