Further cleanup for KafkaConnector config.

Author: ewelinagr

charts/radar-fitbit-connector/templates/kafka-connect.yaml

@@ -20,7 +20,7 @@ spec:
     username: shared-service-user
     passwordSecret:
       secretName: {{ .Values.secret.jaas.name }}
-      password: {{ .Values.secret.jaas.key }} # TODO double-check - worked with password: "password"
+      password: password
   {{- end }}
   autoRestart:
     enabled: true # automatic restarts of failed connectors or their tasks
@@ -105,15 +105,8 @@ spec:
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
     connectContainer:
-{{/*      env:*/}} # TODO double-check all these variables are now part of connector config
-{{/*        {{- if .Values.secret.jaas.name }}*/}}
-{{/*        - name: CONNECT_SASL_JAAS_CONFIG*/}} # TODO add producer
-{{/*          valueFrom:*/}}
-{{/*            secretKeyRef:*/}}
-{{/*              name: {{ .Values.secret.jaas.name }}*/}}
-{{/*              key: {{ .Values.secret.jaas.key }}*/}}
-{{/*        {{- end }}*/}}
-{{/*        - name: CONNECT_APPLICATION_LOOP_INTERVAL_MS*/}}
+      env:
+{{/*        - name: CONNECT_APPLICATION_LOOP_INTERVAL_MS*/}} # TODO double-check all these variables are now part of connector config
 {{/*          value: {{ .Values.application_loop_interval_ms | quote }}*/}}
 {{/*        - name: CONNECT_USER_CACHE_REFRESH_INTERVAL_MS*/}}
 {{/*          value: {{ .Values.user_cache_refresh_interval_ms | quote }}*/}}
@@ -129,15 +122,9 @@ spec:
 {{/*          value: "{{ .Values.kafka_num_brokers }}"*/}}
 {{/*        - name: CONNECT_LOG4J_LOGGERS*/}}
 {{/*          value: "org.reflections=ERROR"*/}}
-{{/*        - name: WAIT_FOR_KAFKA*/}}
-{{/*          value: {{ if .Values.kafka_wait.enabled }}"1"{{ else }}"0"{{ end }}*/}}
-{{/*        {{- if and .Values.kafka_wait.enabled .Values.kafka_wait.properties }}*/}}
-{{/*        - name: COMMAND_CONFIG_FILE_PATH*/}}
-{{/*          value: /etc/kafka-connect/source-fitbit/kafka-wait.properties*/}}
-{{/*        {{- end }}*/}}
-{{/*        {{- with .Values.extraEnvVars }}*/}}
-{{/*          {{- toYaml . | nindent 8 }}*/}}
-{{/*        {{- end }}*/}}
+        {{- with .Values.extraEnvVars }}
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
       volumeMounts:
         - name: config-users
           mountPath: /mnt/users