feat: ns labels (#446)

SocialGouv · Dec 5, 2023 · b4b7f4e · b4b7f4e
1 parent ce7bb77
commit b4b7f4e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/plugins/contrib/charts/namespace/templates/namespace.yaml b/plugins/contrib/charts/namespace/templates/namespace.yaml
@@ -6,4 +6,10 @@ metadata:
     kontinuous/mainNamespace: "true"
   labels:
     application: {{ .Values.global.repositoryName }}
+    {{ if gt (len .Values.labels) 0 }}
+    {{- .Values.labels | toYaml | nindent 4 }}
+    {{ end }}
+    {{ if and .Values.global.namespaceLabels (gt (len .Values.global.namespaceLabels) 0) }}
+    {{- .Values.global.namespaceLabels | toYaml | nindent 4 }}
+    {{ end }}
   name: {{ or .Values.namespace .Values.global.namespace }}
diff --git a/plugins/contrib/charts/namespace/values.yaml b/plugins/contrib/charts/namespace/values.yaml
@@ -4,3 +4,4 @@ ttl:
 limitMax:
   cpu: 3
   memory: 8Gi
+labels: {}
diff --git a/plugins/contrib/charts/rancher-namespace/templates/namespace.yaml b/plugins/contrib/charts/rancher-namespace/templates/namespace.yaml
@@ -8,4 +8,10 @@ metadata:
     kapp.k14s.io/exists: ""
   labels:
     application: {{ .Values.global.repositoryName }}
+    {{ if gt (len .Values.labels) 0 }}
+    {{- .Values.labels | toYaml | nindent 4 }}
+    {{ end }}
+    {{ if and .Values.global.namespaceLabels (gt (len .Values.global.namespaceLabels) 0) }}
+    {{- .Values.global.namespaceLabels | toYaml | nindent 4 }}
+    {{ end }}
   name: {{ or .Values.namespace .Values.global.namespace }}
diff --git a/plugins/contrib/charts/rancher-namespace/values.yaml b/plugins/contrib/charts/rancher-namespace/values.yaml
@@ -4,4 +4,5 @@ ttl:
 limitMax:
   cpu: 3
   memory: 8Gi
-kapp: false
+kapp: false
+labels: {}