diff --git a/argocd/kafka/test/Chart.lock b/argocd/kafka/test/Chart.lock index e58eadb..f2d7da8 100644 --- a/argocd/kafka/test/Chart.lock +++ b/argocd/kafka/test/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: template repository: https://repo.2martens.de/charts - version: 0.1.15 -digest: sha256:8bc1d4b964e7455327efb4bce13a28674488b324e69085e18850f4037b03e5c0 -generated: "2023-10-30T07:58:18.809212+01:00" + version: 0.1.20 +digest: sha256:0dc0ae3940fcb77a1365662fbd85659802a680c27fa6c1543c7b391c168d581e +generated: "2023-11-02T12:00:20.54589+01:00" diff --git a/argocd/kafka/test/Chart.yaml b/argocd/kafka/test/Chart.yaml index f7173f1..ff4f87f 100644 --- a/argocd/kafka/test/Chart.yaml +++ b/argocd/kafka/test/Chart.yaml @@ -4,5 +4,5 @@ version: 0.1.0 type: application dependencies: - name: template - version: 0.1.15 + version: 0.1.20 repository: https://repo.2martens.de/charts diff --git a/helm/argocd/templates/app-of-apps.yaml b/helm/argocd/templates/app-of-apps.yaml index 276bda7..74ec649 100644 --- a/helm/argocd/templates/app-of-apps.yaml +++ b/helm/argocd/templates/app-of-apps.yaml @@ -14,6 +14,6 @@ spec: server: https://kubernetes.default.svc project: default source: - path: {{ tpl .Values.appOfApps.path . }} + path: {{ tpl (quote .Values.appOfApps.path) . }} repoURL: {{ .Values.appOfApps.repoURL }} targetRevision: main \ No newline at end of file diff --git a/helm/argocd/templates/argocd-ingress.yaml b/helm/argocd/templates/argocd-ingress.yaml index 5aed2dc..acde514 100644 --- a/helm/argocd/templates/argocd-ingress.yaml +++ b/helm/argocd/templates/argocd-ingress.yaml @@ -14,7 +14,7 @@ metadata: spec: ingressClassName: public rules: - - host: {{ tpl .Values.ingress.host . }} + - host: {{ tpl (quote .Values.ingress.host) . }} http: paths: - path: / @@ -26,5 +26,5 @@ spec: name: https tls: - hosts: - - {{ tpl .Values.ingress.host . }} + - {{ tpl (quote .Values.ingress.host) . }} secretName: argocd-server-tls # as expected by argocd-server \ No newline at end of file diff --git a/helm/kafka/Chart.lock b/helm/kafka/Chart.lock index 951fa06..78b4407 100644 --- a/helm/kafka/Chart.lock +++ b/helm/kafka/Chart.lock @@ -1,6 +1,9 @@ dependencies: +- name: prometheus-kafka-exporter + repository: https://prometheus-community.github.io/helm-charts + version: 2.7.0 - name: template repository: file://../template - version: 0.1.14 -digest: sha256:b5659a36090dbcc6f457bed11e62c17ea1d6c4eeb8d02c556c8c3c80e55d2a89 -generated: "2023-10-29T20:57:18.426822+01:00" + version: 0.1.20 +digest: sha256:2c2a71a4a41b338b87fab0a2e26454bc68f4fde9983c4635236a006a088b6f89 +generated: "2023-11-02T12:02:09.048349+01:00" diff --git a/helm/kafka/Chart.yaml b/helm/kafka/Chart.yaml index d30a338..4ad4351 100644 --- a/helm/kafka/Chart.yaml +++ b/helm/kafka/Chart.yaml @@ -7,13 +7,16 @@ maintainers: - name: Jim Martens url: https://2martens.de dependencies: + - name: prometheus-kafka-exporter + version: 2.7.0 + repository: https://prometheus-community.github.io/helm-charts - name: template - version: 0.1.14 + version: 0.1.20 repository: file://../template annotations: artifacthub.io/changes: | - - kind: fixed - description: Fixed version and values + - kind: added + description: Added Prometheus support artifacthub.io/signKey: | fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8 url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc diff --git a/helm/kafka/overwrite_values.yaml b/helm/kafka/overwrite_values.yaml index cbe3e1f..6287416 100644 --- a/helm/kafka/overwrite_values.yaml +++ b/helm/kafka/overwrite_values.yaml @@ -28,3 +28,5 @@ environment: value: PLAINTEXT - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR value: "1" +prometheus: + enabled: false diff --git a/helm/kafka/values.yaml b/helm/kafka/values.yaml index 131fa28..a0b7465 100644 --- a/helm/kafka/values.yaml +++ b/helm/kafka/values.yaml @@ -2,6 +2,8 @@ # the default for your application differs. The image.repository is a prime candidate for that. replicaCount: 1 +# revisionHistoryLimit: can be configured to reduce/increase amount of stored replica sets for rollback +revisionHistoryLimit: 10 image: repository: confluentinc/cp-kafka pullPolicy: IfNotPresent @@ -48,6 +50,13 @@ application: zookeeper: host: zookeeper port: 2181 +prometheus: + enabled: false + # only enable if you have the Prometheus operator installed, otherwise it will fail due to missing CRDs + useCRDs: false + # namespace: the namespace of the Prometheus installation + # the value is templated + namespace: # Overwrite with application specific environment variables # Each item has key and value, where the value is parsed as a template environment: diff --git a/helm/template/Chart.yaml b/helm/template/Chart.yaml index 60199a0..a1842dc 100644 --- a/helm/template/Chart.yaml +++ b/helm/template/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: template description: A Helm library chart containing common templates, keeping application templates short type: library -version: 0.1.20 +version: 0.1.21 maintainers: - name: Jim Martens url: https://2martens.de @@ -10,8 +10,8 @@ sources: - https://git.2martens.de/2martens/cloud-configuration annotations: artifacthub.io/changes: | - - kind: changed - description: Added support for Prometheus operator with pod monitor + - kind: fixed + description: Fixed syntax error artifacthub.io/signKey: | fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8 url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc diff --git a/helm/template/templates/_podmonitor.yaml b/helm/template/templates/_podmonitor.yaml index 3889714..fa231de 100644 --- a/helm/template/templates/_podmonitor.yaml +++ b/helm/template/templates/_podmonitor.yaml @@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1 kind: PodMonitor metadata: name: {{ include "template.fullname" . }} - namespace: {{ tpl .Values.prometheus.namespace . | default "observability" }} + namespace: {{ tpl (quote .Values.prometheus.namespace) . | default "observability" }} labels: {{- include "template.labels" . | nindent 4 }} spec: