feat(helm): add label and annotation values (#863)

* feat(helm): add label and annotation vaules

Signed-off-by: Oliver Bähler <[email protected]>

* feat(helm): add label and annotation vaules

Signed-off-by: Oliver Bähler <[email protected]>

---------

Signed-off-by: Oliver Bähler <[email protected]>

Author: oliverbaehler

charts/capsule-proxy/README.md

@@ -106,12 +106,15 @@ If you only need to make minor customizations, you can specify them on the comma
 | global.jobs.certs.topologySpreadConstraints | list | `[]` | Set Topology Spread Constraints |
 | global.jobs.certs.ttlSecondsAfterFinished | int | `60` | Sets the ttl in seconds after a finished certgen job is deleted. Set to -1 to never delete. |
 | global.jobs.kubectl.affinity | object | `{}` | Set affinity rules |
-| global.jobs.kubectl.annotations | object | `{}` | Annotations |
+| global.jobs.kubectl.annotations | object | `{}` | Annotations to add to the job. |
 | global.jobs.kubectl.image.pullPolicy | string | `"IfNotPresent"` | Set the image pull policy of the helm chart job |
 | global.jobs.kubectl.image.registry | string | `"docker.io"` | Set the image repository of the helm chart job |
 | global.jobs.kubectl.image.repository | string | `"clastix/kubectl"` | Set the image repository of the helm chart job |
 | global.jobs.kubectl.image.tag | string | `""` | Set the image tag of the helm chart job |
+| global.jobs.kubectl.labels | object | `{}` | Labels to add to the job. |
 | global.jobs.kubectl.nodeSelector | object | `{}` | Set the node selector |
+| global.jobs.kubectl.podAnnotations | object | `{}` | Annotations to add to the job pod |
+| global.jobs.kubectl.podLabels | object | `{}` | Labels to add to the job pod |
 | global.jobs.kubectl.podSecurityContext | object | `{"enabled":false,"seccompProfile":{"type":"RuntimeDefault"}}` | Security context for the job pods. |
 | global.jobs.kubectl.priorityClassName | string | `""` | Set a pod priorityClassName |
 | global.jobs.kubectl.resources | object | `{}` | Job resources |

charts/capsule-proxy/templates/crd-lifecycle/job.yaml

@@ -7,17 +7,30 @@ metadata:
   annotations:
     "helm.sh/hook-weight": "-1"
     {{- include "capsule-proxy.crds.annotations" . | nindent 4 }}
+    {{- with .Values.global.jobs.kubectl.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   labels:
     app.kubernetes.io/component: {{ include "capsule-proxy.crds.component" . | quote }}
     {{- include "capsule-proxy.labels" . | nindent 4 }}
+    {{- with .Values.global.jobs.kubectl.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   ttlSecondsAfterFinished: {{ .Values.global.jobs.kubectl.ttlSecondsAfterFinished }}
   template:
     metadata:
       name: "{{ include "capsule-proxy.crds.name" . }}"
+      {{- with .Values.global.jobs.kubectl.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       labels:
         app.kubernetes.io/component: {{ include "capsule-proxy.crds.component" . | quote }}
         {{- include "capsule-proxy.selectorLabels" . | nindent 8 }}
+        {{- with .Values.global.jobs.kubectl.podLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       restartPolicy: {{ $.Values.global.jobs.kubectl.restartPolicy }}
       {{- if $.Values.global.jobs.kubectl.podSecurityContext.enabled }}

charts/capsule-proxy/values.schema.json

@@ -282,7 +282,7 @@
                                     "type": "object"
                                 },
                                 "annotations": {
-                                    "description": "Annotations",
+                                    "description": "Annotations to add to the job.",
                                     "type": "object"
                                 },
                                 "image": {
@@ -306,10 +306,22 @@
                                         }
                                     }
                                 },
+                                "labels": {
+                                    "description": "Labels to add to the job.",
+                                    "type": "object"
+                                },
                                 "nodeSelector": {
                                     "description": "Set the node selector",
                                     "type": "object"
                                 },
+                                "podAnnotations": {
+                                    "description": "Annotations to add to the job pod",
+                                    "type": "object"
+                                },
+                                "podLabels": {
+                                    "description": "Labels to add to the job pod",
+                                    "type": "object"
+                                },
                                 "podSecurityContext": {
                                     "description": "Security context for the job pods.",
                                     "type": "object",

charts/capsule-proxy/values.yaml

@@ -17,7 +17,13 @@ global:
         pullPolicy: IfNotPresent
         # -- Set the image tag of the helm chart job
         tag: ""
-      # -- Annotations
+      # -- Labels to add to the job pod
+      podLabels: {}
+      # -- Annotations to add to the job pod
+      podAnnotations: {}
+      # -- Labels to add to the job.
+      labels: {}
+      # -- Annotations to add to the job.
       annotations: {}
       # -- Set the restartPolicy
       restartPolicy: Never
@@ -207,11 +213,13 @@ livenessProbe:
 # priorityClassName: system-node-critical
 # -- Specifies PriorityClass of the capsule-proxy pod.
 priorityClassName: ""
+
 # -- Security context for the capsule-proxy pod.
 podSecurityContext:
   enabled: true
   seccompProfile:
     type: "RuntimeDefault"
+
 # -- Security context for the capsule-proxy container.
 securityContext:
   enabled: true
@@ -234,6 +242,7 @@ resources:
     cpu: 200m
     # -- Set the memory limits assigned to the controller.
     memory: 128Mi
+
 # -- Additional environment variables
 env: []
 # -- Additional volumes