Replace fitbit-connect configmap-properties with KafkaConnector config.

Author: ewelinagr

charts/radar-fitbit-connector/templates/configmap-properties.yaml

@@ -1,32 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "common.names.fullname" . }}-properties
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  source-fitbit.properties: |
-    name=radar-fitbit-source
-    connector.class=org.radarbase.connect.rest.fitbit.FitbitSourceConnector
-    tasks.max={{ .Values.connector_num_tasks }}
-    rest.source.base.url={{ .Values.fitbit_api_url }}
-    rest.source.poll.interval.ms={{ .Values.rest_source_poll_interval_ms | int }}
-    rest.source.request.generator.class=org.radarbase.connect.rest.fitbit.request.FitbitRequestGenerator
-    fitbit.api.client={{ .Values.fitbit_api_client }}
-    fitbit.api.secret={{ .Values.fitbit_api_secret }}
-    fitbit.api.intraday={{ .Values.includeIntradayData }}
-    fitbit.user.repository.class=org.radarbase.connect.rest.fitbit.user.{{ .Values.user_repository_class }}
-    fitbit.user.repository.url={{ .Values.radar_rest_sources_backend_url }}
-    fitbit.user.repository.client.id={{ .Values.oauthClientId }}
-    fitbit.user.repository.client.secret={{ .Values.oauthClientSecret }}
-    fitbit.user.repository.oauth2.token.url={{ .Values.auth_url }}
-    fitbit.user.poll.interval={{ .Values.fitbit_user_poll_interval | int }}
-    application.loop.interval.ms={{ .Values.application_loop_interval_ms | int }}
-    user.cache.refresh.interval.ms={{ .Values.user_cache_refresh_interval_ms | int}}
-  {{- if and .Values.kafka_wait.enabled .Values.kafka_wait.properties }}
-  kafka-wait.properties: |
-    {{ .Values.kafka_wait.properties | indent 4 }}
-  {{- end }}

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

@@ -39,7 +39,6 @@ spec:
     pod:
       metadata:
         annotations:
-          checksum/configmap-properties: {{ include (print $.Template.BasePath "/configmap-properties.yaml") . | sha256sum }}
           checksum/configmap-users: {{ include (print $.Template.BasePath "/configmap-users.yaml") . | sha256sum }}
           backup.velero.io/backup-volumes: logs
         labels:
@@ -65,9 +64,6 @@ spec:
                         - {{ .Release.Name }}
                 topologyKey: "kubernetes.io/hostname"
       volumes:
-        - name: config-properties
-          configMap:
-            name: {{ include "radar-fitbit-connector.fullname" . }}-properties
         - name: config-users
           configMap:
             name: {{ include "radar-fitbit-connector.fullname" . }}-users
@@ -120,12 +116,10 @@ spec:
         {{- end }}
 {{/* TODO container not starting with volume mounts */}}
 {{/*      volumeMounts:*/}}
-{{/*        - name: config-properties*/}}
-{{/*          mountPath: /etc/kafka-connect/source-fitbit*/}}
 {{/*        - name: config-users*/}}
-{{/*          mountPath: /var/lib/kafka-connect-fitbit-source/users*/}}
+{{/*          mountPath: /opt/kafka/plugins/kafka-connect-fitbit-source/users*/}}
 {{/*        - name: logs*/}}
-{{/*          mountPath: /var/lib/kafka-connect-fitbit-source/logs*/}}
+{{/*          mountPath: /opt/kafka/plugins/kafka-connect-fitbit-source/logs*/}}
 {{/*    {{- if .Values.persistence.fsUserOverride }}*/}}
 {{/* TODO is this needed? Init container cannot be specified in the previous format (no matching specs) */}}
 {{/*    initContainer:*/}}

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

@@ -8,8 +8,17 @@ spec:
   class: org.radarbase.connect.rest.fitbit.FitbitSourceConnector
   tasksMax: 4
   config:
-    rest.source.base.url: https://api.fitbit.com
-    rest.source.poll.interval.ms: 5000
+    rest.source.base.url: {{ .Values.fitbit_api_url }}
+    rest.source.poll.interval.ms: {{ .Values.rest_source_poll_interval_ms | int }}
     rest.source.request.generator.class: org.radarbase.connect.rest.fitbit.request.FitbitRequestGenerator
+    fitbit.api.client: {{ .Values.fitbit_api_client }}
+    fitbit.api.secret: {{ .Values.fitbit_api_secret }}
+    fitbit.api.intraday: {{ .Values.includeIntradayData }}
     fitbit.user.repository.class: org.radarbase.connect.rest.fitbit.user.ServiceUserRepository
-    fitbit.user.repository.url: http://localhost:8080/
+    fitbit.user.repository.url: {{ .Values.radar_rest_sources_backend_url }}
+    fitbit.user.repository.client.id: {{ .Values.oauthClientId }}
+    fitbit.user.repository.client.secret: {{ .Values.oauthClientSecret }}
+    fitbit.user.repository.oauth2.token.url: {{ .Values.managementportal_url }}/oauth/token
+    fitbit.user.poll.interval: {{ .Values.fitbit_user_poll_interval | int }}
+    application.loop.interval.ms: {{ .Values.application_loop_interval_ms | int }}
+    user.cache.refresh.interval.ms: {{ .Values.user_cache_refresh_interval_ms | int}}