Merge pull request #20 from osodevops/PLAT-442

Plat 442

Author: mccullya

charts/kafka-connect/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.2
+version: 0.3.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/kafka-connect/templates/connect-cluster.yaml

@@ -48,7 +48,13 @@ spec:
           value: "none"
 {{- end }}
     pod:
+      metadata:
+        annotations:
+{{- if $.Values.podAnnotations }}
+{{ toYaml $.Values.podAnnotations | indent 10 }}
+{{- end }}
       affinity:
+{{- if $.Values.podAntiAffinity.enabled }}
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             - labelSelector:
@@ -58,6 +64,8 @@ spec:
                     values:
                       - {{ $connect_name }}
               topologyKey: "kubernetes.io/hostname"
+{{- end }}
+{{- if $.Values.nodeAffinity.enabled }}
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
@@ -66,6 +74,7 @@ spec:
                     operator: In
                     values:
                       - amd64
+{{- end }}
 {{- if $.Values.monitoring.enabled }}                      
   metricsConfig:
     type: jmxPrometheusExporter
@@ -76,10 +85,12 @@ spec:
 {{ end }}
   config:
     group.id: {{ $config.groupId | default $connect_name }}
+{{- if $config.providersClass }}
     config.providers: {{ $config.providersClass | keys | join ", " }}
     {{- range $provider, $class := $config.providersClass }}
     config.providers.{{ $provider }}.class: {{ $class }}
     {{- end }}
+{{- end }}
 {{- include "kafka-connect.storageConfig"  (dict "global" $global "config" $config "clustername" $connect_name) | indent 4}}
 ---
 {{- end }}

charts/kafka-connect/values.yaml

@@ -37,6 +37,12 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
+podAntiAffinity:
+  enabled: true  # Set to false to disable default pod anti-affinity
+
+nodeAffinity:
+  enabled: true
+
 monitoring:
   enabled: false
   podMonitor:
@@ -62,6 +68,11 @@ debezium_database:
   port: "3306"
   db_name: "your_database"
 
+podAnnotations: {}
+# Example:
+# podAnnotations:
+#   eks.amazonaws.com/role-arn: arn:aws:iam::123456789012:role/dummy-role
+#   iam.amazonaws.com/role: dummy-role-for-gke
 
 # env:
 #  - name: AWS_ROLE_SESSION_NAME >> https://github.com/tulios/kafkajs/issues/1582