feat(helm): add extra labels for servicemonitor and ingress (#512)

* add extra labels for servicemonitor and ingress * set default servicemonitor labels --------- Co-authored-by: rla <rla@n-side.com>
openclarity · Oct 1, 2023 · 8041165 · 8041165
1 parent 5d94285
commit 8041165
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/charts/kubeclarity/templates/_helpers.tpl b/charts/kubeclarity/templates/_helpers.tpl
@@ -78,3 +78,31 @@ Sets extra Kubeclarity server Service annotations
     {{- end }}
   {{- end }}
 {{- end -}}
+
+{{/*
+Sets extra labels for service monitor
+*/}}
+{{- define "kubeclarity.prometheus.serviceMonitor.labels" -}}
+  {{- if .Values.kubeclarity.prometheus.serviceMonitor.labels }}
+    {{- $tp := typeOf .Values.kubeclarity.prometheus.serviceMonitor.labels }}
+    {{- if eq $tp "string" }}
+      {{- tpl .Values.kubeclarity.prometheus.serviceMonitor.labels . | nindent 4 }}
+    {{- else }}
+      {{- toYaml .Values.kubeclarity.prometheus.serviceMonitor.labels | nindent 4 }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
+
+{{/*
+Sets extra ingress labels
+*/}}
+{{- define "kubeclarity.ingress.labels" -}}
+  {{- if .Values.kubeclarity.ingress.labels }}
+    {{- $tp := typeOf .Values.kubeclarity.ingress.labels }}
+    {{- if eq $tp "string" }}
+      {{- tpl .Values.kubeclarity.ingress.labels . | nindent 4 }}
+    {{- else }}
+      {{- toYaml .Values.kubeclarity.ingress.labels | nindent 4 }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
diff --git a/charts/kubeclarity/templates/ingress.yaml b/charts/kubeclarity/templates/ingress.yaml
@@ -15,6 +15,7 @@ metadata:
   namespace: '{{ .Release.Namespace }}'
   labels:
     {{- include "kubeclarity.labels" . | nindent 4 }}
+  {{- template "kubeclarity.ingress.labels" . }}
   {{- template "kubeclarity.ingress.annotations" . }}
 spec:
 {{- if .Values.kubeclarity.ingress.tls }}

diff --git a/charts/kubeclarity/templates/servicemonitor.yaml b/charts/kubeclarity/templates/servicemonitor.yaml
@@ -8,7 +8,8 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    {{- include "kubeclarity.labels" . | nindent 4 }}
+  {{- include "kubeclarity.labels" . | nindent 4 }}
+  {{- template "kubeclarity.prometheus.serviceMonitor.labels" . }}
 spec:
   selector:
     matchLabels:

diff --git a/charts/kubeclarity/values.yaml b/charts/kubeclarity/values.yaml
@@ -60,6 +60,7 @@ kubeclarity:
       enabled: false
       interval: 30s
       annotations: {}
+      labels: {}
     refreshIntervalSeconds: 300
 
   podAnnotations: {}