feat(chart): Modify configmaps (#1172)

Signed-off-by: Javier Rodriguez <[email protected]>
chainloop-dev · Jul 31, 2024 · fa0d425 · fa0d425
1 parent b2cd67a
commit fa0d425
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/deployment/chainloop/Chart.yaml b/deployment/chainloop/Chart.yaml
@@ -7,7 +7,7 @@ description: Chainloop is an open source software supply chain control plane, a
 
 type: application
 # Bump the patch (not minor, not major) version on each change in the Chart Source code
-version: 1.85.1
+version: 1.85.2
 # Do not update appVersion, this is handled automatically by the release process
 appVersion: v0.95.2
 

diff --git a/deployment/chainloop/README.md b/deployment/chainloop/README.md
@@ -478,6 +478,7 @@ chainloop config save \
 | ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
 | `kubeVersion`       | Override Kubernetes version                                                                                                                                            | `""`    |
 | `commonAnnotations` | Annotations to add to all deployed objects                                                                                                                             | `{}`    |
+| `commonLabels`      | Labels to add to all deployed objects                                                                                                                                  | `{}`    |
 | `development`       | Deploys Chainloop pre-configured FOR DEVELOPMENT ONLY. It includes a Vault instance in development mode and pre-configured authentication certificates and passphrases | `false` |
 
 ### Secrets Backend

diff --git a/deployment/chainloop/templates/cas/config.configmap.yaml b/deployment/chainloop/templates/cas/config.configmap.yaml
@@ -7,8 +7,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "chainloop.cas.fullname" . }}
-  labels:
-    {{- include "chainloop.cas.labels" . | nindent 4 }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/component: cas
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 data:
   server.yaml: |
     server:

diff --git a/deployment/chainloop/templates/controlplane/config.configmap.yaml b/deployment/chainloop/templates/controlplane/config.configmap.yaml
@@ -7,8 +7,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "chainloop.controlplane.fullname" . }}
-  labels:
-    {{- include "chainloop.controlplane.labels" . | nindent 4 }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/component: controlplane
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 data:
   {{- if .Values.controlplane.auth.allowList }}
   allow_list.yaml: |

diff --git a/deployment/chainloop/values.yaml b/deployment/chainloop/values.yaml
@@ -29,6 +29,10 @@ kubeVersion: ""
 ##
 commonAnnotations: {}
 
+## @param commonLabels Labels to add to all deployed objects
+##
+commonLabels: {}
+
 ## @param development Deploys Chainloop pre-configured FOR DEVELOPMENT ONLY. It includes a Vault instance in development mode and pre-configured authentication certificates and passphrases
 ##
 development: false