feature: Added test.imagePullSecrets config in values.yaml (kyverno#1…

…1180) (kyverno#11195) (kyverno#11196) Signed-off-by: Pradeep Lakshmi Narasimha <[email protected]> Co-authored-by: Pradeep Lakshmi Narasimha <[email protected]>
realshuting · Sep 19, 2024 · dbfee2e · dbfee2e
1 parent 8631d7d
commit dbfee2e
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 0 deletions.
diff --git a/charts/kyverno/Chart.yaml b/charts/kyverno/Chart.yaml
@@ -41,6 +41,8 @@ annotations:
       description: ImagePullSecrets made globally configurable
     - kind: removed
       description: Deprecated configuration `features.reports.chunkSize` was removed
+    - kind: added
+      description: ImagePullSecrets made configurable for tests
 dependencies:
   - name: grafana
     version: 3.3.0-beta.1

diff --git a/charts/kyverno/README.md b/charts/kyverno/README.md
@@ -728,6 +728,7 @@ The chart values are organised per component.
 | test.image.repository | string | `"busybox"` | Image repository |
 | test.image.tag | string | `"1.35"` | Image tag Defaults to `latest` if omitted |
 | test.image.pullPolicy | string | `nil` | Image pull policy Defaults to image.pullPolicy if omitted |
+| test.imagePullSecrets | list | `[]` | Image pull secrets |
 | test.resources.limits | object | `{"cpu":"100m","memory":"256Mi"}` | Pod resource limits |
 | test.resources.requests | object | `{"cpu":"10m","memory":"64Mi"}` | Pod resource requests |
 | test.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"privileged":false,"readOnlyRootFilesystem":true,"runAsGroup":65534,"runAsNonRoot":true,"runAsUser":65534,"seccompProfile":{"type":"RuntimeDefault"}}` | Security context for the test containers |

diff --git a/charts/kyverno/templates/tests/admission-controller-liveness.yaml b/charts/kyverno/templates/tests/admission-controller-liveness.yaml
@@ -10,6 +10,10 @@ metadata:
     {{- include "kyverno.test.annotations" . | nindent 4 }}
 spec:
   restartPolicy: Never
+  {{- with .Values.test.imagePullSecrets | default .Values.global.imagePullSecrets }}
+  imagePullSecrets:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
   containers:
     - name: test
       image: {{ template "kyverno.test.image" . }}

diff --git a/charts/kyverno/templates/tests/admission-controller-metrics.yaml b/charts/kyverno/templates/tests/admission-controller-metrics.yaml
@@ -10,6 +10,10 @@ metadata:
     {{- include "kyverno.test.annotations" . | nindent 4 }}
 spec:
   restartPolicy: Never
+  {{- with .Values.test.imagePullSecrets | default .Values.global.imagePullSecrets }}
+  imagePullSecrets:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
   containers:
     - name: test
       image: {{ template "kyverno.test.image" . }}

diff --git a/charts/kyverno/templates/tests/admission-controller-readiness.yaml b/charts/kyverno/templates/tests/admission-controller-readiness.yaml
@@ -10,6 +10,10 @@ metadata:
     {{- include "kyverno.test.annotations" . | nindent 4 }}
 spec:
   restartPolicy: Never
+  {{- with .Values.test.imagePullSecrets | default .Values.global.imagePullSecrets }}
+  imagePullSecrets:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
   containers:
     - name: test
       image: {{ template "kyverno.test.image" . }}

diff --git a/charts/kyverno/templates/tests/cleanup-controller-liveness.yaml b/charts/kyverno/templates/tests/cleanup-controller-liveness.yaml
@@ -10,6 +10,10 @@ metadata:
     {{- include "kyverno.test.annotations" . | nindent 4 }}
 spec:
   restartPolicy: Never
+  {{- with .Values.test.imagePullSecrets | default .Values.global.imagePullSecrets }}
+  imagePullSecrets:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
   containers:
     - name: test
       image: {{ template "kyverno.test.image" . }}

diff --git a/charts/kyverno/templates/tests/cleanup-controller-metrics.yaml b/charts/kyverno/templates/tests/cleanup-controller-metrics.yaml
@@ -10,6 +10,10 @@ metadata:
     {{- include "kyverno.test.annotations" . | nindent 4 }}
 spec:
   restartPolicy: Never
+  {{- with .Values.test.imagePullSecrets | default .Values.global.imagePullSecrets }}
+  imagePullSecrets:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
   containers:
     - name: test
       image: {{ template "kyverno.test.image" . }}

diff --git a/charts/kyverno/templates/tests/cleanup-controller-readiness.yaml b/charts/kyverno/templates/tests/cleanup-controller-readiness.yaml
@@ -10,6 +10,10 @@ metadata:
     {{- include "kyverno.test.annotations" . | nindent 4 }}
 spec:
   restartPolicy: Never
+  {{- with .Values.test.imagePullSecrets | default .Values.global.imagePullSecrets }}
+  imagePullSecrets:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
   containers:
     - name: test
       image: {{ template "kyverno.test.image" . }}

diff --git a/charts/kyverno/templates/tests/reports-controller-metrics.yaml b/charts/kyverno/templates/tests/reports-controller-metrics.yaml
@@ -10,6 +10,10 @@ metadata:
     {{- include "kyverno.test.annotations" . | nindent 4 }}
 spec:
   restartPolicy: Never
+  {{- with .Values.test.imagePullSecrets | default .Values.global.imagePullSecrets }}
+  imagePullSecrets:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
   containers:
     - name: test
       image: {{ template "kyverno.test.image" . }}

diff --git a/charts/kyverno/values.yaml b/charts/kyverno/values.yaml
@@ -443,6 +443,10 @@ test:
     # Defaults to image.pullPolicy if omitted
     pullPolicy: ~
 
+  # -- Image pull secrets
+  imagePullSecrets: []
+  # - name: secretName
+
   resources:
     # -- Pod resource limits
     limits: