[fix] Update standalone dbconnector service type definition to match … (#232)

Author: jjlgao

charts/retool/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: retool
 description: A Helm chart for Kubernetes
 type: application
-version: 6.4.7
+version: 6.4.8
 maintainers:
   - name: Retool Engineering
     email: [email protected]

charts/retool/templates/deployment_backend.yaml

@@ -101,7 +101,7 @@ spec:
           {{- end }}
           - name: SERVICE_TYPE
             value: {{ join "," $serviceType }}
-          {{ if and ( include "retool_version_with_java_dbconnector_opt_out" . ) ( not $.Values.dbconnector.java.enabled ) }}
+          {{ if and (  not $.Values.dbconnector.enabled  ) ( and ( include "retool_version_with_java_dbconnector_opt_out" . ) ( not $.Values.dbconnector.java.enabled ) ) }}
           - name: DISABLE_JAVA_DBCONNECTOR
             value: "true"
           {{ end }}

charts/retool/templates/deployment_dbconnector.yaml

@@ -62,13 +62,16 @@ spec:
           {{- toYaml .Values.resources | nindent 10 }}
           {{- end }}
         env:
-          {{- if $.Values.dbconnector.java.enabled }}
-          - name: SERVICE_TYPE
-            value: DB_CONNECTOR,DB_SSH_CONNECTOR,JAVA_DBCONNECTOR
-          {{- else }}
-          - name: SERVICE_TYPE
-            value: DB_CONNECTOR,DB_SSH_CONNECTOR
+          {{- $serviceType := list "DB_CONNECTOR" "DB_SSH_CONNECTOR" }}
+          {{- if and ( not ( include "retool_version_with_java_dbconnector_opt_out" . ) ) ( $.Values.dbconnector.java.enabled ) }}
+            {{- $serviceType = append $serviceType "JAVA_DBCONNECTOR" }}
           {{- end }}
+          - name: SERVICE_TYPE
+            value: {{ join "," $serviceType }}
+          {{ if and ( include "retool_version_with_java_dbconnector_opt_out" . ) ( not $.Values.dbconnector.java.enabled ) }}
+          - name: DISABLE_JAVA_DBCONNECTOR
+            value: "true"
+          {{ end }}
           - name: DEPLOYMENT_TEMPLATE_TYPE
             value: {{ template "retool.deploymentTemplateType" . }}
           - name: DEPLOYMENT_TEMPLATE_VERSION

charts/retool/templates/deployment_workflows.yaml

@@ -95,7 +95,7 @@ spec:
             value: {{ $.Values.dbconnector.java.port | quote }}
           {{- end }}
           {{- end }}
-          {{ if and ( include "retool_version_with_java_dbconnector_opt_out" . ) ( not $.Values.dbconnector.java.enabled ) }}
+          {{ if and ( not $.Values.dbconnector.enabled ) ( and ( include "retool_version_with_java_dbconnector_opt_out" . ) ( not $.Values.dbconnector.java.enabled ) ) }}
           - name: DISABLE_JAVA_DBCONNECTOR
             value: "true"
           {{ end }}