Merge pull request #25 from elastiflow/add-common-labels

Add common labels
elastiflow · Jul 2, 2024 · fc15e53 · fc15e53
2 parents 5dfa43c + d931a71
commit fc15e53
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/charts/netobserv/Chart.yaml b/charts/netobserv/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: netobserv
 description: ElastiFlow NetObserv
 type: application
-version: 0.3.0
+version: 0.3.1
 appVersion: 7.0.1
 
 keywords:

diff --git a/charts/netobserv/templates/_helpers.tpl b/charts/netobserv/templates/_helpers.tpl
@@ -40,6 +40,10 @@ helm.sh/chart: {{ include "netobserv.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{ include "netobserv.selectorLabels" . }}
+{{- range $k, $v := .Values.commonLabels }}
+{{ $k }}: {{ $v | quote }}
+{{- end }}
 {{- end }}
 
 {{/*

diff --git a/charts/netobserv/templates/service.yaml b/charts/netobserv/templates/service.yaml
@@ -7,7 +7,7 @@ metadata:
   annotations: {{ .Values.service.annotations | toYaml | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
-  {{- if and (eq .Values.service.type "LoadBalancer") .Values.service.externalTrafficPolicy }}
+  {{- if .Values.service.externalTrafficPolicy }}
   externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
   {{- end }}
   ports: {{ .Values.service.ports | toYaml | nindent 4 }}

diff --git a/charts/netobserv/values.yaml b/charts/netobserv/values.yaml
@@ -136,6 +136,9 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
+# global common labels, applied to all ressources
+commonLabels: {}
+
 podAnnotations: {}
 podLabels: {}