From b1d38ffcbf208cce7bb66dad1ebb8b3d4cc16f52 Mon Sep 17 00:00:00 2001
From: Marcus Vaal <mvaal@expediagroup.com>
Date: Mon, 29 May 2023 04:03:26 -0500
Subject: [PATCH] feat: [Feature] add podLabels and podAnnotations to
background clean and reports controllers (#7312)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* feat: [Feature] add podLabels and podAnnotations to background clean and reports controllers
Signed-off-by: mvaal <mvaal@expediagroup.com>
* Fixed spacing issue
Signed-off-by: mvaal <mvaal@expediagroup.com>
* make codegen-helm-docs
Signed-off-by: mvaal <mvaal@expediagroup.com>
* Fixed copy/paste variable
Signed-off-by: mvaal <mvaal@expediagroup.com>
* Fix linting
Signed-off-by: mvaal <mvaal@expediagroup.com>
---------
Signed-off-by: mvaal <mvaal@expediagroup.com>
Co-authored-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
---
charts/kyverno/README.md | 6 +++++
.../admission-controller/deployment.yaml | 4 ++--
.../background-controller/deployment.yaml | 6 +++++
.../cleanup-controller/deployment.yaml | 6 +++++
.../reports-controller/deployment.yaml | 6 +++++
charts/kyverno/values.yaml | 24 +++++++++++++++++++
6 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/charts/kyverno/README.md b/charts/kyverno/README.md
index 14dd334d80..1c3d923e86 100644
--- a/charts/kyverno/README.md
+++ b/charts/kyverno/README.md
@@ -400,6 +400,8 @@ The chart values are organised per component.
| backgroundController.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| backgroundController.imagePullSecrets | list | `[]` | Image pull secrets |
| backgroundController.replicas | int | `nil` | Desired number of pods |
+| backgroundController.podLabels | object | `{}` | Additional labels to add to each pod |
+| backgroundController.podAnnotations | object | `{}` | Additional annotations to add to each pod |
| backgroundController.updateStrategy | object | See [values.yaml](values.yaml) | Deployment update strategy. Ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy |
| backgroundController.priorityClassName | string | `""` | Optional priority class |
| backgroundController.hostNetwork | bool | `false` | Change `hostNetwork` to `true` when you want the pod to share its host's network namespace. Useful for situations like when you end up dealing with a custom CNI over Amazon EKS. Update the `dnsPolicy` accordingly as well to suit the host network mode. |
@@ -459,6 +461,8 @@ The chart values are organised per component.
| cleanupController.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| cleanupController.imagePullSecrets | list | `[]` | Image pull secrets |
| cleanupController.replicas | int | `nil` | Desired number of pods |
+| cleanupController.podLabels | object | `{}` | Additional labels to add to each pod |
+| cleanupController.podAnnotations | object | `{}` | Additional annotations to add to each pod |
| cleanupController.updateStrategy | object | See [values.yaml](values.yaml) | Deployment update strategy. Ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy |
| cleanupController.priorityClassName | string | `""` | Optional priority class |
| cleanupController.hostNetwork | bool | `false` | Change `hostNetwork` to `true` when you want the pod to share its host's network namespace. Useful for situations like when you end up dealing with a custom CNI over Amazon EKS. Update the `dnsPolicy` accordingly as well to suit the host network mode. |
@@ -524,6 +528,8 @@ The chart values are organised per component.
| reportsController.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| reportsController.imagePullSecrets | list | `[]` | Image pull secrets |
| reportsController.replicas | int | `nil` | Desired number of pods |
+| reportsController.podLabels | object | `{}` | Additional labels to add to each pod |
+| reportsController.podAnnotations | object | `{}` | Additional annotations to add to each pod |
| reportsController.updateStrategy | object | See [values.yaml](values.yaml) | Deployment update strategy. Ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy |
| reportsController.priorityClassName | string | `""` | Optional priority class |
| reportsController.hostNetwork | bool | `false` | Change `hostNetwork` to `true` when you want the pod to share its host's network namespace. Useful for situations like when you end up dealing with a custom CNI over Amazon EKS. Update the `dnsPolicy` accordingly as well to suit the host network mode. |
diff --git a/charts/kyverno/templates/admission-controller/deployment.yaml b/charts/kyverno/templates/admission-controller/deployment.yaml
index cb1a7e429c..1379b79e58 100644
--- a/charts/kyverno/templates/admission-controller/deployment.yaml
+++ b/charts/kyverno/templates/admission-controller/deployment.yaml
@@ -19,8 +19,8 @@ spec:
metadata:
labels:
{{- include "kyverno.admission-controller.labels" . | nindent 8 }}
- {{- range $key, $value := .Values.admissionController.podLabels }}
- {{ $key }}: {{ $value }}
+ {{- with .Values.admissionController.podLabels }}
+ {{- tpl (toYaml .) $ | nindent 8 }}
{{- end }}
{{- with .Values.admissionController.podAnnotations }}
annotations: {{ tpl (toYaml .) $ | nindent 8 }}
diff --git a/charts/kyverno/templates/background-controller/deployment.yaml b/charts/kyverno/templates/background-controller/deployment.yaml
index fa2d945711..696d7a11c0 100644
--- a/charts/kyverno/templates/background-controller/deployment.yaml
+++ b/charts/kyverno/templates/background-controller/deployment.yaml
@@ -20,6 +20,12 @@ spec:
metadata:
labels:
{{- include "kyverno.background-controller.labels" . | nindent 8 }}
+ {{- with .Values.backgroundController.podLabels }}
+ {{- tpl (toYaml .) $ | nindent 8 }}
+ {{- end }}
+ {{- with .Values.backgroundController.podAnnotations }}
+ annotations: {{ tpl (toYaml .) $ | nindent 8 }}
+ {{- end }}
spec:
{{- with .Values.backgroundController.imagePullSecrets }}
imagePullSecrets:
diff --git a/charts/kyverno/templates/cleanup-controller/deployment.yaml b/charts/kyverno/templates/cleanup-controller/deployment.yaml
index 0b7815547e..ef8935d88f 100644
--- a/charts/kyverno/templates/cleanup-controller/deployment.yaml
+++ b/charts/kyverno/templates/cleanup-controller/deployment.yaml
@@ -20,6 +20,12 @@ spec:
metadata:
labels:
{{- include "kyverno.cleanup-controller.labels" . | nindent 8 }}
+ {{- with .Values.cleanupController.podLabels }}
+ {{- tpl (toYaml .) $ | nindent 8 }}
+ {{- end }}
+ {{- with .Values.cleanupController.podAnnotations }}
+ annotations: {{ tpl (toYaml .) $ | nindent 8 }}
+ {{- end }}
spec:
{{- with .Values.cleanupController.imagePullSecrets }}
imagePullSecrets:
diff --git a/charts/kyverno/templates/reports-controller/deployment.yaml b/charts/kyverno/templates/reports-controller/deployment.yaml
index 36cc3d0380..90f9cfc3b0 100644
--- a/charts/kyverno/templates/reports-controller/deployment.yaml
+++ b/charts/kyverno/templates/reports-controller/deployment.yaml
@@ -20,6 +20,12 @@ spec:
metadata:
labels:
{{- include "kyverno.reports-controller.labels" . | nindent 8 }}
+ {{- with .Values.reportsController.podLabels }}
+ {{- tpl (toYaml .) $ | nindent 8 }}
+ {{- end }}
+ {{- with .Values.reportsController.podAnnotations }}
+ annotations: {{ tpl (toYaml .) $ | nindent 8 }}
+ {{- end }}
spec:
{{- with .Values.reportsController.imagePullSecrets }}
imagePullSecrets:
diff --git a/charts/kyverno/values.yaml b/charts/kyverno/values.yaml
index ae1e4ea198..f1cd3e0123 100644
--- a/charts/kyverno/values.yaml
+++ b/charts/kyverno/values.yaml
@@ -848,6 +848,14 @@ backgroundController:
# -- (int) Desired number of pods
replicas: ~
+ # -- Additional labels to add to each pod
+ podLabels: {}
+ # example.com/label: foo
+
+ # -- Additional annotations to add to each pod
+ podAnnotations: {}
+ # example.com/annotation: foo
+
# -- Deployment update strategy.
# Ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
# @default -- See [values.yaml](values.yaml)
@@ -1051,6 +1059,14 @@ cleanupController:
# -- (int) Desired number of pods
replicas: ~
+ # -- Additional labels to add to each pod
+ podLabels: {}
+ # example.com/label: foo
+
+ # -- Additional annotations to add to each pod
+ podAnnotations: {}
+ # example.com/annotation: foo
+
# -- Deployment update strategy.
# Ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
# @default -- See [values.yaml](values.yaml)
@@ -1304,6 +1320,14 @@ reportsController:
# -- (int) Desired number of pods
replicas: ~
+ # -- Additional labels to add to each pod
+ podLabels: {}
+ # example.com/label: foo
+
+ # -- Additional annotations to add to each pod
+ podAnnotations: {}
+ # example.com/annotation: foo
+
# -- Deployment update strategy.
# Ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
# @default -- See [values.yaml](values.yaml)