Merge pull request #96 from port-labs/PORT-7665-allow-extra-labels-for-ocean-chartgs

added extraLabels to allow setting labels to the deployments

Author: yairsimantov20

charts/port-agent/templates/_helpers.tpl

@@ -40,6 +40,9 @@ helm.sh/chart: {{ include "port-agent.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- range $key, $value := .Values.extraLabels }}
+{{$key}}: {{ $value }}
+{{- end }}
 {{- end }}
 
 {{/*

charts/port-agent/templates/deployment.yaml

@@ -18,7 +18,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "port-agent.selectorLabels" . | nindent 8 }}
+        {{- include "port-agent.labels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

charts/port-agent/values.yaml

@@ -27,16 +27,18 @@ env:
     PORT_CLIENT_ID: ""
     PORT_CLIENT_SECRET: ""
 
+extraLabels: {}
+
 podAnnotations: {}
 
 podSecurityContext: {}
-# Example 
+# Example
   # runAsGroup: 1001
   # runAsUser: 1001
   # fsGroup: 1001
   # fsGroupChangePolicy: "OnRootMismatch"
 containerSecurityContext: {}
-# Example 
+# Example
   # runAsGroup: 1001
   # runAsUser: 1001
   # allowPrivilegeEscalation: false

charts/port-ocean/templates/_helpers.tpl

@@ -40,6 +40,9 @@ helm.sh/chart: {{ include "port-ocean.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- range $key, $value := .Values.extraLabels }}
+{{$key}}: {{ $value }}
+{{- end }}
 {{- end }}
 
 {{/*

charts/port-ocean/templates/deployment.yaml

@@ -2,17 +2,21 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "port-ocean.deploymentName" . }}
+  labels:
+    {{- include "port-ocean.labels" . | nindent 8 }}
 spec:
   strategy:
     type: {{ .Values.rolloutStrategy | default "Recreate" }}
   replicas: 1
   selector:
     matchLabels:
       app: {{ include "port-ocean.deploymentName" . }}
+      {{- include "port-ocean.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
         app: {{ include "port-ocean.deploymentName" .}}
+        {{- include "port-ocean.labels" . | nindent 8 }}
     spec:
       securityContext: 
         {{- if .Values.podSecurityContext }}

charts/port-ocean/values.yaml

@@ -42,6 +42,8 @@ tolerations: []
 
 affinity: {}
 
+extraLabels: {}
+
 imageRegistry: "ghcr.io/port-labs"
 
 imagePullPolicy: Always