[prometheus-kafka-exporter] remove bitnami kafka dependency

charts/prometheus-kafka-exporter/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "v1.9.0"
 description: A Helm chart to export metrics from Kafka in Prometheus format using kafka_exporter from https://github.com/danielqsj/kafka_exporter
 name: prometheus-kafka-exporter
 home: https://github.com/danielqsj/kafka_exporter
-version: 3.1.1
+version: 4.0.0
 kubeVersion: ">=1.25.0-0"
 sources:
   - https://github.com/prometheus-community/helm-charts
@@ -27,8 +27,3 @@ annotations:
   "artifacthub.io/links": |
     - name: Chart Source
       url: https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-kafka-exporter
-dependencies:
-  - name: kafka
-    version: "32.4.3"
-    repository: https://charts.bitnami.com/bitnami
-    condition: kafka.enabled

charts/prometheus-kafka-exporter/ci/ci-values.yaml

@@ -1,13 +1,75 @@
 kafkaServer:
-  - ci-kafka:9092
+  - kafka:9092
 
-kafka:
-  enabled: true
-  fullnameOverride: ci-kafka
-
-  image:
-    repository: bitnamilegacy/kafka
-
-  listeners:
-    client:
-      protocol: PLAINTEXT
+extraManifests:
+  - apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+      name: kafka
+    spec:
+      replicas: 1
+      selector:
+        matchLabels:
+          app: kafka
+      template:
+        metadata:
+          labels:
+            app: kafka
+        spec:
+          containers:
+            - name: kafka
+              image: docker.io/apache/kafka-native:4.3.1
+              ports:
+                - containerPort: 9092
+                  name: plaintext
+              env:
+                - name: KAFKA_NODE_ID
+                  value: "1"
+                - name: KAFKA_PROCESS_ROLES
+                  value: "broker,controller"
+                - name: KAFKA_LISTENERS
+                  value: "PLAINTEXT://:9092,CONTROLLER://:9093"
+                - name: KAFKA_ADVERTISED_LISTENERS
+                  value: "PLAINTEXT://kafka:9092"
+                - name: KAFKA_CONTROLLER_LISTENER_NAMES
+                  value: "CONTROLLER"
+                - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP
+                  value: "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT"
+                - name: KAFKA_CONTROLLER_QUORUM_VOTERS
+                  value: "1@localhost:9093"
+                - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR
+                  value: "1"
+                - name: KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR
+                  value: "1"
+                - name: KAFKA_TRANSACTION_STATE_LOG_MIN_ISR
+                  value: "1"
+                - name: KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS
+                  value: "0"
+                - name: KAFKA_AUTO_CREATE_TOPICS_ENABLE
+                  value: "true"
+                # Bound heap prevents the JVM from requesting memory beyond this limit.
+                - name: KAFKA_HEAP_OPTS
+                  value: "-Xmx256m -Xms256m"
+              readinessProbe:
+                tcpSocket:
+                  port: 9092
+                initialDelaySeconds: 10
+                periodSeconds: 5
+                failureThreshold: 30
+              volumeMounts:
+                - name: data
+                  mountPath: /var/lib/kafka/data
+          volumes:
+            - name: data
+              emptyDir: {}
+  - apiVersion: v1
+    kind: Service
+    metadata:
+      name: kafka
+    spec:
+      selector:
+        app: kafka
+      ports:
+        - name: plaintext
+          port: 9092
+          targetPort: 9092

charts/prometheus-kafka-exporter/templates/extra-objects.yaml

@@ -0,0 +1,15 @@
+{{- /* Normalize extraObjects to a list, easier to loop over */ -}}
+{{- $extraObjects := .Values.extraManifests | default (list) -}}
+
+{{- if kindIs "map" $extraObjects -}}
+  {{- $extraObjects = values $extraObjects -}}
+{{- end -}}
+
+{{- range $extraObjects }}
+---
+  {{- if kindIs "map" . }}
+    {{- tpl (toYaml .) $ | nindent 0 }}
+  {{- else if kindIs "string" . }}
+    {{- tpl . $ | nindent 0 }}
+  {{- end }}
+{{- end }}

charts/prometheus-kafka-exporter/values.yaml

@@ -1,5 +1,5 @@
 image:
-  repository: danielqsj/kafka-exporter
+  repository: docker.io/danielqsj/kafka-exporter
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
   pullPolicy: IfNotPresent
@@ -232,11 +232,6 @@ server:
     certFile: tls.crt
     keyFile: tls.key
 
-# If enabled Kafka dependency chart will be used.
-# This is only needed for the CI job so it should always be disabled.
-kafka:
-  enabled: false
-
 # Set security context for the kafka-exporter pod. Useful when you need to adapt to an existing PSP
 securityContext: {}
   # fsGroup: 2000
@@ -256,3 +251,30 @@ containerSecurityContext: {}
   # runAsUser: 10001
   # seccompProfile:
   #   type: RuntimeDefault
+
+## Extra manifests to deploy.  Can be of type dict or list.
+## If dict, keys are ignored and only values are used.
+## Items contained within extraObjects can be defined as dict or string and are passed through tpl.
+extraManifests: null
+  # - apiVersion: v1
+  #   kind: ConfigMap
+  #   metadata:
+  #   labels:
+  #     name: prometheus-extra
+  #   data:
+  #     extra-data: "value"
+  #
+  # can also be defined as a string, useful for templating field names
+  # - |
+  #   apiVersion: v1
+  #   kind: Secret
+  #   type: Opaque
+  #   metadata:
+  #     name: super-secret
+  #     labels:
+  #       {{- range $key, $value := .Values.commonLabels }}
+  #       {{ $key }}: {{ $value }}
+  #       {{- end }}
+  #   data:
+  #     plaintext: Zm9vYmFy
+  #     templated: '{{ print "foobar" | upper | b64enc }}'