[prometheus-json-exporter] defaults and service labels/annotations su…

…pport (prometheus-community#3865) * Fixed defaults for annotations from list to dict Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> * Added service labels and annotations Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> * Added ingress labels Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> * Bumped version to 0.7.2 Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]> --------- Signed-off-by: Aaron Benton<[email protected]> Signed-off-by: Aaron Benton <[email protected]>
giffgaff · Mar 20, 2024 · 84bf66b · 84bf66b
1 parent a6d5801
commit 84bf66b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/charts/prometheus-json-exporter/Chart.yaml b/charts/prometheus-json-exporter/Chart.yaml
@@ -19,7 +19,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.7.1
+version: 0.7.2
 
 # 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

diff --git a/charts/prometheus-json-exporter/templates/ingress.yaml b/charts/prometheus-json-exporter/templates/ingress.yaml
@@ -18,6 +18,9 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "prometheus-json-exporter.labels" . | nindent 4 }}
+    {{- with .Values.ingress.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/charts/prometheus-json-exporter/templates/service.yaml b/charts/prometheus-json-exporter/templates/service.yaml
@@ -4,6 +4,13 @@ metadata:
   name: {{ include "prometheus-json-exporter.fullname" . }}
   labels:
     {{- include "prometheus-json-exporter.labels" . | nindent 4 }}
+    {{- with .Values.service.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.service.annotations }}
+  annotations:
+      {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

diff --git a/charts/prometheus-json-exporter/values.yaml b/charts/prometheus-json-exporter/values.yaml
@@ -1,3 +1,4 @@
+---
 # Default values for prometheus-json-exporter.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
@@ -18,18 +19,17 @@ serviceAccount:
   # Specifies whether a service account should be created
   create: true
   # Annotations to add to the service account
-  annotations: []
+  annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
-podAnnotations: []
+podAnnotations: {}
 
 podSecurityContext: {}
 # fsGroup: 2000
 
-# podLabels:
-  # Custom labels for the pod
+podLabels: {}
 
 securityContext: {}
 # capabilities:
@@ -44,6 +44,8 @@ service:
   port: 7979
   targetPort: http
   name: http
+  labels: {}
+  annotations: {}
 
 serviceMonitor:
   ## If true, a ServiceMonitor CRD is created for a prometheus operator
@@ -73,7 +75,8 @@ serviceMonitor:
 ingress:
   enabled: false
   className: ""
-  annotations: []
+  labels: {}
+  annotations: {}
   # kubernetes.io/ingress.class: nginx
   # kubernetes.io/tls-acme: "true"
   hosts: