[bitnami/harbor] Only set metric environment variables for exporter w…

…hen enabled, set environment variables for jobservice when metrics are enabled to fix metric name (#31122) * [bitnami/harbor] Only set metric environment variables for exporter when enabled, set environment variables for jobservice when metrics are enabled to fix metric name Signed-off-by: Adrian Berger <[email protected]> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <[email protected]> --------- Signed-off-by: Adrian Berger <[email protected]> Signed-off-by: Bitnami Containers <[email protected]> Co-authored-by: Bitnami Containers <[email protected]>
bitnami · Dec 23, 2024 · 7a204c4 · 7a204c4
1 parent 0ca0ca4
commit 7a204c4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/bitnami/harbor/CHANGELOG.md b/bitnami/harbor/CHANGELOG.md
@@ -1,8 +1,16 @@
 # Changelog
 
+## 24.1.1 (2024-12-23)
+
+* [bitnami/harbor] Only set metric environment variables for exporter when enabled, set environment variables for jobservice when metrics are enabled to fix metric name ([#31122](https://github.com/bitnami/charts/pull/31122))
+
 ## 24.1.0 (2024-12-10)
 
-* [bitnami/harbor] Detect non-standard images ([#30883](https://github.com/bitnami/charts/pull/30883))
+* [bitnami/*] Add Bitnami Premium to NOTES.txt (#30854) ([3dfc003](https://github.com/bitnami/charts/commit/3dfc00376df6631f0ce54b8d440d477f6caa6186)), closes [#30854](https://github.com/bitnami/charts/issues/30854)
+* [bitnami/*] docs: :memo: Add "Backup & Restore" section (#30711) ([35ab536](https://github.com/bitnami/charts/commit/35ab5363741e7548f4076f04da6e62d10153c60c)), closes [#30711](https://github.com/bitnami/charts/issues/30711)
+* [bitnami/*] docs: :memo: Add "Prometheus metrics" (batch 2) (#30662) ([50e0570](https://github.com/bitnami/charts/commit/50e0570f98ab15308af7910b405baa4480e5fe3f)), closes [#30662](https://github.com/bitnami/charts/issues/30662)
+* [bitnami/*] docs: :memo: Unify "Securing Traffic using TLS" section (#30707) ([b572333](https://github.com/bitnami/charts/commit/b57233336e4fe9af928ecb4f2a5f334011efb1bc)), closes [#30707](https://github.com/bitnami/charts/issues/30707)
+* [bitnami/harbor] Detect non-standard images (#30883) ([95c2321](https://github.com/bitnami/charts/commit/95c232141f4d0e432da61c6b2d1331557a8e8acd)), closes [#30883](https://github.com/bitnami/charts/issues/30883)
 
 ## <small>24.0.2 (2024-11-14)</small>
 

diff --git a/bitnami/harbor/Chart.yaml b/bitnami/harbor/Chart.yaml
@@ -55,4 +55,4 @@ maintainers:
 name: harbor
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/harbor
-version: 24.1.0
+version: 24.1.1
diff --git a/bitnami/harbor/templates/exporter/exporter-cm-envvars.yaml b/bitnami/harbor/templates/exporter/exporter-cm-envvars.yaml
@@ -19,9 +19,11 @@ metadata:
 data:
   LOG_LEVEL: {{ .Values.logLevel | quote }}
   HARBOR_EXPORTER_PORT: {{ .Values.exporter.containerPorts.metrics | quote }}
+  {{- if .Values.metrics.enabled}}
   HARBOR_EXPORTER_METRICS_PATH: {{ .Values.metrics.path | quote }}
   HARBOR_METRIC_NAMESPACE: harbor
   HARBOR_METRIC_SUBSYSTEM: exporter
+  {{- end }}
   HARBOR_REDIS_NAMESPACE: {{ .Values.jobservice.redisNamespace | quote }}
   HARBOR_SERVICE_SCHEME: {{ ternary "https" "http" .Values.internalTLS.enabled | quote }}
   HARBOR_SERVICE_HOST: {{ include "harbor.core" . | quote }}

diff --git a/bitnami/harbor/templates/jobservice/jobservice-cm-envvars.yaml b/bitnami/harbor/templates/jobservice/jobservice-cm-envvars.yaml
@@ -27,6 +27,10 @@ data:
   NO_PROXY: {{ include "harbor.noProxy" . | quote }}
   {{- end }}
   LOG_LEVEL: {{ .Values.logLevel | quote }}
+  {{- if .Values.metrics.enabled}}
+  METRIC_NAMESPACE: harbor
+  METRIC_SUBSYSTEM: jobservice
+  {{- end }}
   {{- if .Values.tracing.enabled }}
   TRACE_SERVICE_NAME: "harbor-jobservice"
   {{- include "harbor.tracing.envvars" . | nindent 2}}