From 3d777cdc5fec6cd34263edb542d13f34ba19239d Mon Sep 17 00:00:00 2001 From: Griffin Date: Mon, 15 Jan 2024 21:08:36 +0530 Subject: [PATCH 01/11] enabled imagepullpolicy for global use Signed-off-by: Griffin --- .github/scripts/.helm-tests/default/result.yaml | 8 ++++---- .github/scripts/.helm-tests/default/values.yaml | 2 ++ .../scripts/.helm-tests/lifecycle-only/values.yaml | 1 + .../.helm-tests/lifecycle-with-certs/result.yaml | 6 +++--- .../.helm-tests/lifecycle-with-certs/values.yaml | 1 + .../metrics-only-with-apiservice-disabled/values.yaml | 1 + .../.helm-tests/metrics-with-certs/result.yaml | 2 +- .../.helm-tests/metrics-with-certs/values.yaml | 1 + chart/templates/_helpers.tpl | 11 +++++++++++ keptn-cert-manager/chart/templates/deployment.yaml | 2 +- lifecycle-operator/chart/templates/deployment.yaml | 4 ++-- metrics-operator/chart/templates/deployment.yaml | 2 +- 12 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml index 990a23cff6..c657cefe41 100644 --- a/.github/scripts/.helm-tests/default/result.yaml +++ b/.github/scripts/.helm-tests/default/result.yaml @@ -11368,7 +11368,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: cluster.local image: ghcr.io/keptn/certificate-operator:v0.0.0 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent name: certificate-operator resources: limits: @@ -11485,7 +11485,7 @@ spec: - name: CERT_MANAGER_ENABLED value: "true" image: ghcr.io/keptn/lifecycle-operator:v0.0.0 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent name: lifecycle-operator ports: - containerPort: 9443 @@ -11567,7 +11567,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: cluster.local image: ghcr.io/keptn/scheduler:v0.0.0 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent name: scheduler resources: limits: @@ -11672,7 +11672,7 @@ spec: - name: CERT_MANAGER_ENABLED value: "true" image: ghcr.io/keptn/metrics-operator:v0.0.0 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent name: metrics-operator ports: - containerPort: 9443 diff --git a/.github/scripts/.helm-tests/default/values.yaml b/.github/scripts/.helm-tests/default/values.yaml index d8a7bfa39c..5b8ff47298 100644 --- a/.github/scripts/.helm-tests/default/values.yaml +++ b/.github/scripts/.helm-tests/default/values.yaml @@ -6,6 +6,7 @@ lifecycleOperator: lifecycleOperator: image: tag: v0.0.0 + imagePullPolicy: Always scheduler: image: tag: v0.0.0 @@ -17,5 +18,6 @@ metricsOperator: global: commonLabels: app.kubernetes.io/version: vmyversion + imagePullPolicy: IfNotPresent caInjectionAnnotations: cert-manager.io/inject-ca-from: helmtests/keptn-certs diff --git a/.github/scripts/.helm-tests/lifecycle-only/values.yaml b/.github/scripts/.helm-tests/lifecycle-only/values.yaml index f8c1781932..0cdff8cca1 100644 --- a/.github/scripts/.helm-tests/lifecycle-only/values.yaml +++ b/.github/scripts/.helm-tests/lifecycle-only/values.yaml @@ -8,6 +8,7 @@ global: lifecycleOperator: enabled: true + imagePullPolicy: Always promotionTasksEnabled: true lifecycleOperator: image: diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml index 950c252e5b..f58251c5c8 100644 --- a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml +++ b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml @@ -9090,7 +9090,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: cluster.local image: ghcr.io/keptn/certificate-operator:v0.0.0 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent name: certificate-operator resources: limits: @@ -9208,7 +9208,7 @@ spec: - name: CERT_MANAGER_ENABLED value: "true" image: ghcr.io/keptn/lifecycle-operator:v0.0.0 - imagePullPolicy: Never + imagePullPolicy: IfNotPresent name: lifecycle-operator ports: - containerPort: 9443 @@ -9291,7 +9291,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: cluster.local image: ghcr.io/keptn/scheduler:v0.0.0 - imagePullPolicy: Never + imagePullPolicy: IfNotPresent name: scheduler resources: limits: diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/values.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/values.yaml index d814a47b1c..2dfbefa14a 100644 --- a/.github/scripts/.helm-tests/lifecycle-with-certs/values.yaml +++ b/.github/scripts/.helm-tests/lifecycle-with-certs/values.yaml @@ -20,5 +20,6 @@ global: app.kubernetes.io/version: vmyversion commonAnnotations: test/jj: test + imagePullPolicy: IfNotPresent caInjectionAnnotations: cert-manager.io/inject-ca-from: helmtests/keptn-certs diff --git a/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/values.yaml b/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/values.yaml index 4c70043b50..06e71f40fb 100644 --- a/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/values.yaml +++ b/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/values.yaml @@ -2,6 +2,7 @@ lifecycleOperator: enabled: false metricsOperator: enabled: true + imagePullPolicy: Always image: tag: v0.0.0 customMetricsAPIService: diff --git a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml index 48694a8849..5ed5d7b461 100644 --- a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml +++ b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml @@ -2553,7 +2553,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: cluster.local image: ghcr.io/keptn/certificate-operator:v0.0.0 - imagePullPolicy: Always + imagePullPolicy: Never name: certificate-operator resources: limits: diff --git a/.github/scripts/.helm-tests/metrics-with-certs/values.yaml b/.github/scripts/.helm-tests/metrics-with-certs/values.yaml index 152810f6f6..0f75cd08bb 100644 --- a/.github/scripts/.helm-tests/metrics-with-certs/values.yaml +++ b/.github/scripts/.helm-tests/metrics-with-certs/values.yaml @@ -13,5 +13,6 @@ global: certManagerEnabled: true commonLabels: app.kubernetes.io/version: vmyversion + imagePullPolicy: Never caInjectionAnnotations: cert-manager.io/inject-ca-from: helmtests/keptn-certs diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 0432fd349b..4b15b79a55 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -73,3 +73,14 @@ Usage: {{- tpl (.value | toYaml) .context }} {{- end }} {{- end -}} + +{{/* +Checks for the imagePullPolicy +*/}} +{{- define "common.imagePullPolicy" -}} + {{- if .Values.global.imagePullPolicy -}} + {{- .Values.global.imagePullPolicy -}} + {{- else -}} + {{- default .Values.imagePullPolicy -}} + {{- end -}} +{{- end -}} diff --git a/keptn-cert-manager/chart/templates/deployment.yaml b/keptn-cert-manager/chart/templates/deployment.yaml index 0aa2249b62..5b66f27067 100644 --- a/keptn-cert-manager/chart/templates/deployment.yaml +++ b/keptn-cert-manager/chart/templates/deployment.yaml @@ -47,7 +47,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ .Values.kubernetesClusterDomain }} image: {{- include "common.images.image" ( dict "imageRoot" .Values.image "global" .Values.global ) | indent 1}} - imagePullPolicy: {{ .Values.imagePullPolicy }} + imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.imagePullPolicy }} name: certificate-operator resources: {{- toYaml .Values.resources | nindent 12 }} securityContext: diff --git a/lifecycle-operator/chart/templates/deployment.yaml b/lifecycle-operator/chart/templates/deployment.yaml index 74f7fb9f87..6420bdd958 100644 --- a/lifecycle-operator/chart/templates/deployment.yaml +++ b/lifecycle-operator/chart/templates/deployment.yaml @@ -110,7 +110,7 @@ spec: - name: CERT_MANAGER_ENABLED value: {{ .Values.global.certManagerEnabled | quote }} image: {{ include "common.images.image" ( dict "imageRoot" .Values.lifecycleOperator.image "global" .Values.global ) }} - imagePullPolicy: {{ .Values.lifecycleOperator.imagePullPolicy }} + imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.imagePullPolicy }} name: lifecycle-operator ports: - containerPort: 9443 @@ -203,7 +203,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ .Values.kubernetesClusterDomain }} image: {{ include "common.images.image" ( dict "imageRoot" .Values.scheduler.image "global" .Values.global ) }} - imagePullPolicy: {{ .Values.scheduler.imagePullPolicy }} + imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.imagePullPolicy }} name: scheduler resources: {{- toYaml .Values.scheduler.resources | nindent 10 }} securityContext: diff --git a/metrics-operator/chart/templates/deployment.yaml b/metrics-operator/chart/templates/deployment.yaml index 8a35a33b8f..cee7c0868f 100644 --- a/metrics-operator/chart/templates/deployment.yaml +++ b/metrics-operator/chart/templates/deployment.yaml @@ -63,7 +63,7 @@ spec: - name: CERT_MANAGER_ENABLED value: {{ .Values.global.certManagerEnabled | quote }} image: {{- include "common.images.image" ( dict "imageRoot" .Values.image "global" .Values.global ) | indent 1}} - imagePullPolicy: {{ .Values.imagePullPolicy }} + imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.imagePullPolicy }} name: metrics-operator ports: - containerPort: 9443 From 6b865129ba38ddb31bf69aed7b62e5122729ce88 Mon Sep 17 00:00:00 2001 From: Griffin Date: Mon, 15 Jan 2024 21:31:31 +0530 Subject: [PATCH 02/11] some fixes Signed-off-by: Griffin --- keptn-cert-manager/chart/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keptn-cert-manager/chart/values.yaml b/keptn-cert-manager/chart/values.yaml index 4be84f2855..a616dfd4d3 100644 --- a/keptn-cert-manager/chart/values.yaml +++ b/keptn-cert-manager/chart/values.yaml @@ -13,6 +13,8 @@ global: ## - myRegistryKeySecretName ## imagePullSecrets: [] + ## @param global.imagePullPolicy Policy for pulling Docker images. Options: Always, IfNotPresent, Never + imagePullPolicy: "" ## @param global.commonLabels Common labels to add to all Keptn resources. Evaluated as a template commonLabels: {} ## @param global.commonAnnotations Common annotations to add to all Keptn resources. Evaluated as a template From 3778e55bec1121fefebed01f269b3a19f1ca745f Mon Sep 17 00:00:00 2001 From: Griffin Date: Tue, 16 Jan 2024 07:42:50 +0530 Subject: [PATCH 03/11] adapted helm docs Signed-off-by: Griffin --- keptn-cert-manager/chart/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keptn-cert-manager/chart/README.md b/keptn-cert-manager/chart/README.md index f809e326ac..b8f1f0eda9 100644 --- a/keptn-cert-manager/chart/README.md +++ b/keptn-cert-manager/chart/README.md @@ -12,6 +12,7 @@ resource. | ------------------------------- | ------------------------------------------------------------------------- | ----- | | `global.imageRegistry` | Global container image registry | `""` | | `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | +| `global.imagePullPolicy` | Policy for pulling Docker images. Options: Always, IfNotPresent, Never | `""` | | `global.commonLabels` | Common labels to add to all Keptn resources. Evaluated as a template | `{}` | | `global.commonAnnotations` | Common annotations to add to all Keptn resources. Evaluated as a template | `{}` | | `global.caInjectionAnnotations` | CA injection annotations for cert-manager.io configuration | `{}` | From 8f1de4ad72ebcf2867036afb12dff2f0bcdfe6e7 Mon Sep 17 00:00:00 2001 From: Griffin Date: Thu, 18 Jan 2024 19:27:57 +0530 Subject: [PATCH 04/11] configured helpers.tpl Signed-off-by: Griffin --- chart/README.md | 1 + chart/templates/_helpers.tpl | 10 ---------- chart/values.yaml | 2 ++ keptn-cert-manager/chart/README.md | 1 - keptn-cert-manager/chart/values.yaml | 2 -- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/chart/README.md b/chart/README.md index 6b746c52fb..82c089a0d8 100644 --- a/chart/README.md +++ b/chart/README.md @@ -21,6 +21,7 @@ metrics, observability, health checks, with pre- and post-deployment evaluations | `global.certManagerEnabled` | Enable this value to install Keptn Certificate Manager | `true` | | `global.imageRegistry` | Global Docker image registry | `""` | | `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | +| `global.imagePullPolicy` | Policy for pulling Docker images. Options: Always, IfNotPresent, Never | `""` | | `global.commonLabels` | Common labels to add to all Keptn resources. Evaluated as a template | `{}` | | `global.commonAnnotations` | Common annotations to add to all Keptn resources. Evaluated as a template | `{}` | | `global.caInjectionAnnotations` | CA injection annotations for cert-manager.io configuration | `{}` | diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 4b15b79a55..7ad315fdee 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -74,13 +74,3 @@ Usage: {{- end }} {{- end -}} -{{/* -Checks for the imagePullPolicy -*/}} -{{- define "common.imagePullPolicy" -}} - {{- if .Values.global.imagePullPolicy -}} - {{- .Values.global.imagePullPolicy -}} - {{- else -}} - {{- default .Values.imagePullPolicy -}} - {{- end -}} -{{- end -}} diff --git a/chart/values.yaml b/chart/values.yaml index e75214c390..60a57767b9 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -23,6 +23,8 @@ global: ## - myRegistryKeySecretName ## imagePullSecrets: [] + ## @param global.imagePullPolicy Policy for pulling Docker images. Options: Always, IfNotPresent, Never + imagePullPolicy: "" ## @param global.commonLabels Common labels to add to all Keptn resources. Evaluated as a template commonLabels: {} ## @param global.commonAnnotations Common annotations to add to all Keptn resources. Evaluated as a template diff --git a/keptn-cert-manager/chart/README.md b/keptn-cert-manager/chart/README.md index b8f1f0eda9..f809e326ac 100644 --- a/keptn-cert-manager/chart/README.md +++ b/keptn-cert-manager/chart/README.md @@ -12,7 +12,6 @@ resource. | ------------------------------- | ------------------------------------------------------------------------- | ----- | | `global.imageRegistry` | Global container image registry | `""` | | `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | -| `global.imagePullPolicy` | Policy for pulling Docker images. Options: Always, IfNotPresent, Never | `""` | | `global.commonLabels` | Common labels to add to all Keptn resources. Evaluated as a template | `{}` | | `global.commonAnnotations` | Common annotations to add to all Keptn resources. Evaluated as a template | `{}` | | `global.caInjectionAnnotations` | CA injection annotations for cert-manager.io configuration | `{}` | diff --git a/keptn-cert-manager/chart/values.yaml b/keptn-cert-manager/chart/values.yaml index a616dfd4d3..4be84f2855 100644 --- a/keptn-cert-manager/chart/values.yaml +++ b/keptn-cert-manager/chart/values.yaml @@ -13,8 +13,6 @@ global: ## - myRegistryKeySecretName ## imagePullSecrets: [] - ## @param global.imagePullPolicy Policy for pulling Docker images. Options: Always, IfNotPresent, Never - imagePullPolicy: "" ## @param global.commonLabels Common labels to add to all Keptn resources. Evaluated as a template commonLabels: {} ## @param global.commonAnnotations Common annotations to add to all Keptn resources. Evaluated as a template From 5efed8f6d349163a3b76645d0cee705f7a4a0cfc Mon Sep 17 00:00:00 2001 From: Griffin Date: Fri, 19 Jan 2024 06:37:10 +0530 Subject: [PATCH 05/11] fixed tests Signed-off-by: Griffin --- .github/scripts/.helm-tests/default/values.yaml | 3 ++- .../.helm-tests/lifecycle-with-certs/result.yaml | 6 +++--- .../scripts/.helm-tests/metrics-with-certs/values.yaml | 2 +- chart/templates/_helpers.tpl | 10 ++++++++++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/scripts/.helm-tests/default/values.yaml b/.github/scripts/.helm-tests/default/values.yaml index 5b8ff47298..12e395bc01 100644 --- a/.github/scripts/.helm-tests/default/values.yaml +++ b/.github/scripts/.helm-tests/default/values.yaml @@ -6,7 +6,7 @@ lifecycleOperator: lifecycleOperator: image: tag: v0.0.0 - imagePullPolicy: Always + imagePullPolicy: Never scheduler: image: tag: v0.0.0 @@ -21,3 +21,4 @@ global: imagePullPolicy: IfNotPresent caInjectionAnnotations: cert-manager.io/inject-ca-from: helmtests/keptn-certs + imagePullPolicy: IfNotPresent diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml index f58251c5c8..950c252e5b 100644 --- a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml +++ b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml @@ -9090,7 +9090,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: cluster.local image: ghcr.io/keptn/certificate-operator:v0.0.0 - imagePullPolicy: IfNotPresent + imagePullPolicy: Always name: certificate-operator resources: limits: @@ -9208,7 +9208,7 @@ spec: - name: CERT_MANAGER_ENABLED value: "true" image: ghcr.io/keptn/lifecycle-operator:v0.0.0 - imagePullPolicy: IfNotPresent + imagePullPolicy: Never name: lifecycle-operator ports: - containerPort: 9443 @@ -9291,7 +9291,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: cluster.local image: ghcr.io/keptn/scheduler:v0.0.0 - imagePullPolicy: IfNotPresent + imagePullPolicy: Never name: scheduler resources: limits: diff --git a/.github/scripts/.helm-tests/metrics-with-certs/values.yaml b/.github/scripts/.helm-tests/metrics-with-certs/values.yaml index 0f75cd08bb..404628e398 100644 --- a/.github/scripts/.helm-tests/metrics-with-certs/values.yaml +++ b/.github/scripts/.helm-tests/metrics-with-certs/values.yaml @@ -7,7 +7,6 @@ metricsOperator: enabled: true image: tag: v0.0.0 - imagePullPolicy: Never global: certManagerEnabled: true @@ -16,3 +15,4 @@ global: imagePullPolicy: Never caInjectionAnnotations: cert-manager.io/inject-ca-from: helmtests/keptn-certs + imagePullPolicy: Never diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 7ad315fdee..a877094218 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -74,3 +74,13 @@ Usage: {{- end }} {{- end -}} +{{/* +Checks for the imagePullPolicy +*/}} +{{- define "common.imagePullPolicy" -}} + {{- if .Values.global.imagePullPolicy -}} + {{- .Values.global.imagePullPolicy -}} + {{- else -}} + {{- default .Values.imagePullPolicy -}} + {{- end -}} +{{- end -}} From 81eaf25c37e31b10b87ed807cb68f10c05fbe7e8 Mon Sep 17 00:00:00 2001 From: Griffin Date: Fri, 19 Jan 2024 07:36:49 +0530 Subject: [PATCH 06/11] fixed tests Signed-off-by: Griffin --- lifecycle-operator/chart/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lifecycle-operator/chart/templates/deployment.yaml b/lifecycle-operator/chart/templates/deployment.yaml index 6420bdd958..9e6049f191 100644 --- a/lifecycle-operator/chart/templates/deployment.yaml +++ b/lifecycle-operator/chart/templates/deployment.yaml @@ -110,7 +110,7 @@ spec: - name: CERT_MANAGER_ENABLED value: {{ .Values.global.certManagerEnabled | quote }} image: {{ include "common.images.image" ( dict "imageRoot" .Values.lifecycleOperator.image "global" .Values.global ) }} - imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.imagePullPolicy }} + imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.lifecycleOperator.imagePullPolicy }} name: lifecycle-operator ports: - containerPort: 9443 @@ -203,7 +203,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ .Values.kubernetesClusterDomain }} image: {{ include "common.images.image" ( dict "imageRoot" .Values.scheduler.image "global" .Values.global ) }} - imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.imagePullPolicy }} + imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.scheduler.imagePullPolicy }} name: scheduler resources: {{- toYaml .Values.scheduler.resources | nindent 10 }} securityContext: From 829552e7ef443b7c54d9d9641247644ec4e9d3d6 Mon Sep 17 00:00:00 2001 From: Griffin Date: Fri, 19 Jan 2024 07:41:55 +0530 Subject: [PATCH 07/11] fixed helpers.tpl Signed-off-by: Griffin --- chart/templates/_helpers.tpl | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index a877094218..0432fd349b 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -73,14 +73,3 @@ Usage: {{- tpl (.value | toYaml) .context }} {{- end }} {{- end -}} - -{{/* -Checks for the imagePullPolicy -*/}} -{{- define "common.imagePullPolicy" -}} - {{- if .Values.global.imagePullPolicy -}} - {{- .Values.global.imagePullPolicy -}} - {{- else -}} - {{- default .Values.imagePullPolicy -}} - {{- end -}} -{{- end -}} From b5775d0c1b16ebcb5db9f1b70f5cdc7e0201d850 Mon Sep 17 00:00:00 2001 From: RealAnna Date: Mon, 19 Feb 2024 15:15:00 +0100 Subject: [PATCH 08/11] fix: adjust precedence in image pull policies Signed-off-by: RealAnna --- .../.helm-tests/certificates-only/result.yaml | 2 +- .../scripts/.helm-tests/default/result.yaml | 2 +- .../scripts/.helm-tests/default/values.yaml | 3 +-- .../.helm-tests/lifecycle-only/result.yaml | 2 +- .../.helm-tests/lifecycle-only/values.yaml | 2 +- .../lifecycle-with-certs/result.yaml | 2 +- .../lifecycle-with-certs/values.yaml | 4 ++-- .../values.yaml | 2 +- .../.helm-tests/metrics-only/result.yaml | 2 +- .../metrics-with-certs/values.yaml | 1 - chart/README.md | 2 +- keptn-cert-manager/chart/README.md | 3 ++- .../chart/templates/deployment.yaml | 2 +- keptn-cert-manager/chart/values.yaml | 8 ++++---- lifecycle-operator/chart/README.md | 7 ++++--- .../chart/templates/deployment.yaml | 4 ++-- lifecycle-operator/chart/values.yaml | 12 +++++++----- metrics-operator/chart/README.md | 19 ++++++++++--------- .../chart/templates/deployment.yaml | 2 +- metrics-operator/chart/values.yaml | 6 ++++-- 20 files changed, 46 insertions(+), 41 deletions(-) diff --git a/.github/scripts/.helm-tests/certificates-only/result.yaml b/.github/scripts/.helm-tests/certificates-only/result.yaml index 3da290b4ff..5b87c23314 100644 --- a/.github/scripts/.helm-tests/certificates-only/result.yaml +++ b/.github/scripts/.helm-tests/certificates-only/result.yaml @@ -240,7 +240,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: cluster.local image: testreg/keptn/certificate-operator:v0.0.0 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent name: certificate-operator resources: limits: diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml index c657cefe41..671ab51703 100644 --- a/.github/scripts/.helm-tests/default/result.yaml +++ b/.github/scripts/.helm-tests/default/result.yaml @@ -11485,7 +11485,7 @@ spec: - name: CERT_MANAGER_ENABLED value: "true" image: ghcr.io/keptn/lifecycle-operator:v0.0.0 - imagePullPolicy: IfNotPresent + imagePullPolicy: Never name: lifecycle-operator ports: - containerPort: 9443 diff --git a/.github/scripts/.helm-tests/default/values.yaml b/.github/scripts/.helm-tests/default/values.yaml index 12e395bc01..ca9afba419 100644 --- a/.github/scripts/.helm-tests/default/values.yaml +++ b/.github/scripts/.helm-tests/default/values.yaml @@ -6,7 +6,7 @@ lifecycleOperator: lifecycleOperator: image: tag: v0.0.0 - imagePullPolicy: Never + imagePullPolicy: Never scheduler: image: tag: v0.0.0 @@ -21,4 +21,3 @@ global: imagePullPolicy: IfNotPresent caInjectionAnnotations: cert-manager.io/inject-ca-from: helmtests/keptn-certs - imagePullPolicy: IfNotPresent diff --git a/.github/scripts/.helm-tests/lifecycle-only/result.yaml b/.github/scripts/.helm-tests/lifecycle-only/result.yaml index 18b132c3d4..28b3616c62 100644 --- a/.github/scripts/.helm-tests/lifecycle-only/result.yaml +++ b/.github/scripts/.helm-tests/lifecycle-only/result.yaml @@ -8976,7 +8976,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: cluster.local image: testreg/keptn/scheduler:v0.0.0 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent name: scheduler resources: limits: diff --git a/.github/scripts/.helm-tests/lifecycle-only/values.yaml b/.github/scripts/.helm-tests/lifecycle-only/values.yaml index 0cdff8cca1..0a85d2a546 100644 --- a/.github/scripts/.helm-tests/lifecycle-only/values.yaml +++ b/.github/scripts/.helm-tests/lifecycle-only/values.yaml @@ -8,12 +8,12 @@ global: lifecycleOperator: enabled: true - imagePullPolicy: Always promotionTasksEnabled: true lifecycleOperator: image: repository: myrep tag: v0.0.1 + imagePullPolicy: Always scheduler: image: tag: v0.0.0 diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml index 950c252e5b..017a2341da 100644 --- a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml +++ b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml @@ -9090,7 +9090,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: cluster.local image: ghcr.io/keptn/certificate-operator:v0.0.0 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent name: certificate-operator resources: limits: diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/values.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/values.yaml index 2dfbefa14a..05cf6491d6 100644 --- a/.github/scripts/.helm-tests/lifecycle-with-certs/values.yaml +++ b/.github/scripts/.helm-tests/lifecycle-with-certs/values.yaml @@ -4,13 +4,13 @@ certManager: lifecycleOperator: enabled: true lifecycleOperator: - imagePullPolicy: Never image: tag: v0.0.0 + imagePullPolicy: Never scheduler: - imagePullPolicy: Never image: tag: v0.0.0 + imagePullPolicy: Never metricsOperator: enabled: false diff --git a/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/values.yaml b/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/values.yaml index 06e71f40fb..a7ab1dec98 100644 --- a/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/values.yaml +++ b/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/values.yaml @@ -2,9 +2,9 @@ lifecycleOperator: enabled: false metricsOperator: enabled: true - imagePullPolicy: Always image: tag: v0.0.0 + imagePullPolicy: Always customMetricsAPIService: enabled: "false" diff --git a/.github/scripts/.helm-tests/metrics-only/result.yaml b/.github/scripts/.helm-tests/metrics-only/result.yaml index 131b4ccd0e..522b7f6d6d 100644 --- a/.github/scripts/.helm-tests/metrics-only/result.yaml +++ b/.github/scripts/.helm-tests/metrics-only/result.yaml @@ -2397,7 +2397,7 @@ spec: - name: CERT_MANAGER_ENABLED value: "false" image: ghcr.io/keptn/metrics-operator:v0.0.0 - imagePullPolicy: Always + imagePullPolicy: IfNotPresent name: metrics-operator ports: - containerPort: 9443 diff --git a/.github/scripts/.helm-tests/metrics-with-certs/values.yaml b/.github/scripts/.helm-tests/metrics-with-certs/values.yaml index 404628e398..e914b17dfa 100644 --- a/.github/scripts/.helm-tests/metrics-with-certs/values.yaml +++ b/.github/scripts/.helm-tests/metrics-with-certs/values.yaml @@ -15,4 +15,3 @@ global: imagePullPolicy: Never caInjectionAnnotations: cert-manager.io/inject-ca-from: helmtests/keptn-certs - imagePullPolicy: Never diff --git a/chart/README.md b/chart/README.md index 82c089a0d8..40176c5058 100644 --- a/chart/README.md +++ b/chart/README.md @@ -21,7 +21,7 @@ metrics, observability, health checks, with pre- and post-deployment evaluations | `global.certManagerEnabled` | Enable this value to install Keptn Certificate Manager | `true` | | `global.imageRegistry` | Global Docker image registry | `""` | | `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | -| `global.imagePullPolicy` | Policy for pulling Docker images. Options: Always, IfNotPresent, Never | `""` | +| `global.imagePullPolicy` | Policy for pulling Docker images. Options: Always, IfNotPresent, Never | `""` | | `global.commonLabels` | Common labels to add to all Keptn resources. Evaluated as a template | `{}` | | `global.commonAnnotations` | Common annotations to add to all Keptn resources. Evaluated as a template | `{}` | | `global.caInjectionAnnotations` | CA injection annotations for cert-manager.io configuration | `{}` | diff --git a/keptn-cert-manager/chart/README.md b/keptn-cert-manager/chart/README.md index f809e326ac..53b7700fca 100644 --- a/keptn-cert-manager/chart/README.md +++ b/keptn-cert-manager/chart/README.md @@ -11,6 +11,7 @@ resource. | Name | Description | Value | | ------------------------------- | ------------------------------------------------------------------------- | ----- | | `global.imageRegistry` | Global container image registry | `""` | +| `global.imagePullPolicy` | select global image pull policy | `""` | | `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | | `global.commonLabels` | Common labels to add to all Keptn resources. Evaluated as a template | `{}` | | `global.commonAnnotations` | Common annotations to add to all Keptn resources. Evaluated as a template | `{}` | @@ -38,7 +39,7 @@ resource. | `image.registry` | specify the container registry for the certificate-operator image | `ghcr.io` | | `image.repository` | specify repo for manager image | `keptn/certificate-operator` | | `image.tag` | select tag for manager container | `v2.0.0` | -| `imagePullPolicy` | select image pull policy for manager container | `Always` | +| `image.imagePullPolicy` | select image pull policy for manager container | `Always` | | `livenessProbe` | custom RBAC proxy liveness probe | | | `readinessProbe` | custom manager readiness probe | | | `resources` | custom limits and requests for manager container | | diff --git a/keptn-cert-manager/chart/templates/deployment.yaml b/keptn-cert-manager/chart/templates/deployment.yaml index 5b66f27067..862d968b45 100644 --- a/keptn-cert-manager/chart/templates/deployment.yaml +++ b/keptn-cert-manager/chart/templates/deployment.yaml @@ -47,7 +47,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ .Values.kubernetesClusterDomain }} image: {{- include "common.images.image" ( dict "imageRoot" .Values.image "global" .Values.global ) | indent 1}} - imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.imagePullPolicy }} + imagePullPolicy: {{ .Values.image.imagePullPolicy | default (.Values.global.imagePullPolicy | default "IfNotPresent") }} name: certificate-operator resources: {{- toYaml .Values.resources | nindent 12 }} securityContext: diff --git a/keptn-cert-manager/chart/values.yaml b/keptn-cert-manager/chart/values.yaml index 4be84f2855..48f31bc5a5 100644 --- a/keptn-cert-manager/chart/values.yaml +++ b/keptn-cert-manager/chart/values.yaml @@ -6,7 +6,8 @@ global: ## @param global.imageRegistry Global container image registry imageRegistry: "" - + ## @param global.imagePullPolicy select global image pull policy + imagePullPolicy: "" ## @param global.imagePullSecrets Global Docker registry secret names as an array ## E.g. ## imagePullSecrets: @@ -69,9 +70,8 @@ image: repository: keptn/certificate-operator ## @param image.tag select tag for manager container tag: v2.0.0 # x-release-please-version -## @param imagePullPolicy select image pull policy for manager container -imagePullPolicy: Always - +## @param image.imagePullPolicy select image pull policy for manager container + imagePullPolicy: "" ## @extra livenessProbe custom RBAC proxy liveness probe ## @skip livenessProbe.httpGet.path ## @skip livenessProbe.httpGet.port diff --git a/lifecycle-operator/chart/README.md b/lifecycle-operator/chart/README.md index aff594ffa1..e3bc626a84 100644 --- a/lifecycle-operator/chart/README.md +++ b/lifecycle-operator/chart/README.md @@ -16,6 +16,7 @@ and application health checks | `global.certManagerEnabled` | Enable this value to install Keptn Certificate Manager | `true` | | `global.imageRegistry` | Global container image registry | `""` | | `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | +| `global.imagePullPolicy` | select global image pull policy | `""` | | `global.commonLabels` | Common labels to add to all Keptn resources. Evaluated as a template | `{}` | | `global.commonAnnotations` | Common annotations to add to all Keptn resources. Evaluated as a template | `{}` | | `global.caInjectionAnnotations` | CA injection annotations for cert-manager.io configuration | `{}` | @@ -57,8 +58,8 @@ and application health checks | `lifecycleOperator.image.registry` | specify the container registry for the lifecycle-operator image | `ghcr.io` | | `lifecycleOperator.image.repository` | specify registry for manager image | `keptn/lifecycle-operator` | | `lifecycleOperator.image.tag` | select tag for manager image | `v0.9.0` | -| `lifecycleOperator.imagePullPolicy` | specify pull policy for manager image | `Always` | -| `lifecycleOperator.livenessProbe` | custom livenessprobe for manager container | | +| `lifecycleOperator.image.imagePullPolicy` | specify pull policy for manager image | `Always` | +| `lifecycleOperator.livenessProbe` | custom liveness probe for manager container | | | `lifecycleOperator.readinessProbe` | custom readinessprobe for manager container | | | `lifecycleOperator.resources` | specify limits and requests for manager container | | | `lifecycleOperator.nodeSelector` | add custom nodes selector to lifecycle operator | `{}` | @@ -90,7 +91,7 @@ and application health checks | `scheduler.image.registry` | specify the container registry for the scheduler image | `ghcr.io` | | `scheduler.image.repository` | set image repository for scheduler | `keptn/scheduler` | | `scheduler.image.tag` | set image tag for scheduler | `v0.9.0` | -| `scheduler.imagePullPolicy` | set image pull policy for scheduler | `Always` | +| `scheduler.image.imagePullPolicy` | set image pull policy for scheduler | `Always` | | `scheduler.livenessProbe` | customizable liveness probe for the scheduler | | | `scheduler.readinessProbe` | customizable readiness probe for the scheduler | | | `scheduler.resources` | sets cpu and memory resources/limits for scheduler | | diff --git a/lifecycle-operator/chart/templates/deployment.yaml b/lifecycle-operator/chart/templates/deployment.yaml index 9e6049f191..8980391c90 100644 --- a/lifecycle-operator/chart/templates/deployment.yaml +++ b/lifecycle-operator/chart/templates/deployment.yaml @@ -110,7 +110,7 @@ spec: - name: CERT_MANAGER_ENABLED value: {{ .Values.global.certManagerEnabled | quote }} image: {{ include "common.images.image" ( dict "imageRoot" .Values.lifecycleOperator.image "global" .Values.global ) }} - imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.lifecycleOperator.imagePullPolicy }} + imagePullPolicy: {{ .Values.lifecycleOperator.image.imagePullPolicy | default (.Values.global.imagePullPolicy | default "IfNotPresent") }} name: lifecycle-operator ports: - containerPort: 9443 @@ -203,7 +203,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ .Values.kubernetesClusterDomain }} image: {{ include "common.images.image" ( dict "imageRoot" .Values.scheduler.image "global" .Values.global ) }} - imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.scheduler.imagePullPolicy }} + imagePullPolicy: {{.Values.scheduler.image.imagePullPolicy | default (.Values.global.imagePullPolicy | default "IfNotPresent") }} name: scheduler resources: {{- toYaml .Values.scheduler.resources | nindent 10 }} securityContext: diff --git a/lifecycle-operator/chart/values.yaml b/lifecycle-operator/chart/values.yaml index ec3c6a3d9e..11f76e2b5d 100644 --- a/lifecycle-operator/chart/values.yaml +++ b/lifecycle-operator/chart/values.yaml @@ -15,6 +15,8 @@ global: ## - myRegistryKeySecretName ## imagePullSecrets: [] + ## @param global.imagePullPolicy select global image pull policy + imagePullPolicy: "" ## @param global.commonLabels Common labels to add to all Keptn resources. Evaluated as a template ## commonLabels: { } @@ -105,9 +107,9 @@ lifecycleOperator: repository: keptn/lifecycle-operator ## @param lifecycleOperator.image.tag select tag for manager image tag: v0.9.0 # x-release-please-version -## @param lifecycleOperator.imagePullPolicy specify pull policy for manager image - imagePullPolicy: Always -## @extra lifecycleOperator.livenessProbe custom livenessprobe for manager container +## @param lifecycleOperator.image.imagePullPolicy specify pull policy for manager image + imagePullPolicy: "" +## @extra lifecycleOperator.livenessProbe custom liveness probe for manager container ## @skip lifecycleOperator.livenessProbe.httpGet.path ## @skip lifecycleOperator.livenessProbe.httpGet.port ## @skip lifecycleOperator.livenessProbe.initialDelaySeconds @@ -220,8 +222,8 @@ scheduler: repository: keptn/scheduler ## @param scheduler.image.tag set image tag for scheduler tag: v0.9.0 -## @param scheduler.imagePullPolicy set image pull policy for scheduler - imagePullPolicy: Always +## @param scheduler.image.imagePullPolicy set image pull policy for scheduler + imagePullPolicy: "" ## @extra scheduler.livenessProbe customizable liveness probe for the scheduler ## @skip scheduler.livenessProbe.httpGet.path ## @skip scheduler.livenessProbe.httpGet.port diff --git a/metrics-operator/chart/README.md b/metrics-operator/chart/README.md index b5571895b7..89c8ad61c0 100644 --- a/metrics-operator/chart/README.md +++ b/metrics-operator/chart/README.md @@ -13,14 +13,15 @@ Prometheus, Dynatrace, DataDog and K8s metric server... ### Global parameters -| Name | Description | Value | -| ------------------------------- | ------------------------------------------------------------------------- | ------ | -| `global.certManagerEnabled` | Enable this value to install Keptn Certificate Manager | `true` | -| `global.imageRegistry` | Global container image registry | `""` | -| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | -| `global.commonLabels` | Common labels to add to all Keptn resources. Evaluated as a template | `{}` | -| `global.commonAnnotations` | Common annotations to add to all Keptn resources. Evaluated as a template | `{}` | -| `global.caInjectionAnnotations` | CA injection annotations for cert-manager.io configuration | `{}` | +| Name | Description | Value | +| ------------------------------- | ------------------------------------------------------------------------- | -------- | +| `global.certManagerEnabled` | Enable this value to install Keptn Certificate Manager | `true` | +| `global.imageRegistry` | Global container image registry | `""` | +| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | +| `global.imagePullPolicy` | specify global pull policy | `Always` | +| `global.commonLabels` | Common labels to add to all Keptn resources. Evaluated as a template | `{}` | +| `global.commonAnnotations` | Common annotations to add to all Keptn resources. Evaluated as a template | `{}` | +| `global.caInjectionAnnotations` | CA injection annotations for cert-manager.io configuration | `{}` | ### Keptn Metrics Operator common @@ -78,7 +79,7 @@ Prometheus, Dynatrace, DataDog and K8s metric server... | `image.registry` | specify the container registry for the metrics-operator image | `ghcr.io` | | `image.repository` | specify registry for manager image | `keptn/metrics-operator` | | `image.tag` | select tag for manager image | `v0.9.1` | -| `imagePullPolicy` | specify pull policy for manager image | `Always` | +| `image.imagePullPolicy` | specify pull policy for manager image | `Always` | | `livenessProbe` | custom livenessprobe for manager container | | | `readinessProbe` | custom readinessprobe for manager container | | | `resources` | specify limits and requests for manager container | | diff --git a/metrics-operator/chart/templates/deployment.yaml b/metrics-operator/chart/templates/deployment.yaml index cee7c0868f..4e62fda290 100644 --- a/metrics-operator/chart/templates/deployment.yaml +++ b/metrics-operator/chart/templates/deployment.yaml @@ -63,7 +63,7 @@ spec: - name: CERT_MANAGER_ENABLED value: {{ .Values.global.certManagerEnabled | quote }} image: {{- include "common.images.image" ( dict "imageRoot" .Values.image "global" .Values.global ) | indent 1}} - imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.imagePullPolicy }} + imagePullPolicy: {{.Values.image.imagePullPolicy | default (.Values.global.imagePullPolicy | default "IfNotPresent") }} name: metrics-operator ports: - containerPort: 9443 diff --git a/metrics-operator/chart/values.yaml b/metrics-operator/chart/values.yaml index ab4374ab8d..4db37acbf5 100644 --- a/metrics-operator/chart/values.yaml +++ b/metrics-operator/chart/values.yaml @@ -15,6 +15,8 @@ global: ## - myRegistryKeySecretName ## imagePullSecrets: [] + ## @param global.imagePullPolicy specify global pull policy + imagePullPolicy: "" ## @param global.commonLabels Common labels to add to all Keptn resources. Evaluated as a template ## commonLabels: { } @@ -136,8 +138,8 @@ image: repository: keptn/metrics-operator ## @param image.tag select tag for manager image tag: v0.9.1 # x-release-please-version -## @param imagePullPolicy specify pull policy for manager image -imagePullPolicy: Always +## @param image.imagePullPolicy specify pull policy for manager image this overrides global values + imagePullPolicy: "" ## @extra livenessProbe custom livenessprobe for manager container ## @skip livenessProbe.httpGet.path ## @skip livenessProbe.httpGet.port From d1dd5c9385e2426d4c6d4d7992b5e30cc475e30f Mon Sep 17 00:00:00 2001 From: RealAnna Date: Mon, 19 Feb 2024 15:16:37 +0100 Subject: [PATCH 09/11] fix: regenerate helm charts Signed-off-by: RealAnna --- keptn-cert-manager/chart/README.md | 2 +- lifecycle-operator/chart/README.md | 4 +-- metrics-operator/chart/README.md | 58 +++++++++++++++--------------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/keptn-cert-manager/chart/README.md b/keptn-cert-manager/chart/README.md index 53b7700fca..c626e127be 100644 --- a/keptn-cert-manager/chart/README.md +++ b/keptn-cert-manager/chart/README.md @@ -39,7 +39,7 @@ resource. | `image.registry` | specify the container registry for the certificate-operator image | `ghcr.io` | | `image.repository` | specify repo for manager image | `keptn/certificate-operator` | | `image.tag` | select tag for manager container | `v2.0.0` | -| `image.imagePullPolicy` | select image pull policy for manager container | `Always` | +| `image.imagePullPolicy` | select image pull policy for manager container | `""` | | `livenessProbe` | custom RBAC proxy liveness probe | | | `readinessProbe` | custom manager readiness probe | | | `resources` | custom limits and requests for manager container | | diff --git a/lifecycle-operator/chart/README.md b/lifecycle-operator/chart/README.md index e3bc626a84..8c88eaea3a 100644 --- a/lifecycle-operator/chart/README.md +++ b/lifecycle-operator/chart/README.md @@ -58,7 +58,7 @@ and application health checks | `lifecycleOperator.image.registry` | specify the container registry for the lifecycle-operator image | `ghcr.io` | | `lifecycleOperator.image.repository` | specify registry for manager image | `keptn/lifecycle-operator` | | `lifecycleOperator.image.tag` | select tag for manager image | `v0.9.0` | -| `lifecycleOperator.image.imagePullPolicy` | specify pull policy for manager image | `Always` | +| `lifecycleOperator.image.imagePullPolicy` | specify pull policy for manager image | `""` | | `lifecycleOperator.livenessProbe` | custom liveness probe for manager container | | | `lifecycleOperator.readinessProbe` | custom readinessprobe for manager container | | | `lifecycleOperator.resources` | specify limits and requests for manager container | | @@ -91,7 +91,7 @@ and application health checks | `scheduler.image.registry` | specify the container registry for the scheduler image | `ghcr.io` | | `scheduler.image.repository` | set image repository for scheduler | `keptn/scheduler` | | `scheduler.image.tag` | set image tag for scheduler | `v0.9.0` | -| `scheduler.image.imagePullPolicy` | set image pull policy for scheduler | `Always` | +| `scheduler.image.imagePullPolicy` | set image pull policy for scheduler | `""` | | `scheduler.livenessProbe` | customizable liveness probe for the scheduler | | | `scheduler.readinessProbe` | customizable readiness probe for the scheduler | | | `scheduler.resources` | sets cpu and memory resources/limits for scheduler | | diff --git a/metrics-operator/chart/README.md b/metrics-operator/chart/README.md index 89c8ad61c0..cb80de7650 100644 --- a/metrics-operator/chart/README.md +++ b/metrics-operator/chart/README.md @@ -13,15 +13,15 @@ Prometheus, Dynatrace, DataDog and K8s metric server... ### Global parameters -| Name | Description | Value | -| ------------------------------- | ------------------------------------------------------------------------- | -------- | -| `global.certManagerEnabled` | Enable this value to install Keptn Certificate Manager | `true` | -| `global.imageRegistry` | Global container image registry | `""` | -| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | -| `global.imagePullPolicy` | specify global pull policy | `Always` | -| `global.commonLabels` | Common labels to add to all Keptn resources. Evaluated as a template | `{}` | -| `global.commonAnnotations` | Common annotations to add to all Keptn resources. Evaluated as a template | `{}` | -| `global.caInjectionAnnotations` | CA injection annotations for cert-manager.io configuration | `{}` | +| Name | Description | Value | +| ------------------------------- | ------------------------------------------------------------------------- | ------ | +| `global.certManagerEnabled` | Enable this value to install Keptn Certificate Manager | `true` | +| `global.imageRegistry` | Global container image registry | `""` | +| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | +| `global.imagePullPolicy` | specify global pull policy | `""` | +| `global.commonLabels` | Common labels to add to all Keptn resources. Evaluated as a template | `{}` | +| `global.commonAnnotations` | Common annotations to add to all Keptn resources. Evaluated as a template | `{}` | +| `global.caInjectionAnnotations` | CA injection annotations for cert-manager.io configuration | `{}` | ### Keptn Metrics Operator common @@ -63,23 +63,23 @@ Prometheus, Dynatrace, DataDog and K8s metric server... ### Keptn Metrics Operator controller -| Name | Description | Value | -| --------------------------------------------------- | ------------------------------------------------------------- | ------------------------ | -| `containerSecurityContext` | Sets security context privileges | | -| `containerSecurityContext.allowPrivilegeEscalation` | | `false` | -| `containerSecurityContext.capabilities.drop` | | `["ALL"]` | -| `containerSecurityContext.privileged` | | `false` | -| `containerSecurityContext.runAsGroup` | | `65532` | -| `containerSecurityContext.runAsNonRoot` | | `true` | -| `containerSecurityContext.runAsUser` | | `65532` | -| `containerSecurityContext.seccompProfile.type` | | `RuntimeDefault` | -| `env.exposeKeptnMetrics` | enable metrics exporter | `true` | -| `env.metricsControllerLogLevel` | sets the log level of Metrics Controller | `0` | -| `env.analysisControllerLogLevel` | sets the log level of Analysis Controller | `0` | -| `image.registry` | specify the container registry for the metrics-operator image | `ghcr.io` | -| `image.repository` | specify registry for manager image | `keptn/metrics-operator` | -| `image.tag` | select tag for manager image | `v0.9.1` | -| `image.imagePullPolicy` | specify pull policy for manager image | `Always` | -| `livenessProbe` | custom livenessprobe for manager container | | -| `readinessProbe` | custom readinessprobe for manager container | | -| `resources` | specify limits and requests for manager container | | +| Name | Description | Value | +| --------------------------------------------------- | ------------------------------------------------------------------ | ------------------------ | +| `containerSecurityContext` | Sets security context privileges | | +| `containerSecurityContext.allowPrivilegeEscalation` | | `false` | +| `containerSecurityContext.capabilities.drop` | | `["ALL"]` | +| `containerSecurityContext.privileged` | | `false` | +| `containerSecurityContext.runAsGroup` | | `65532` | +| `containerSecurityContext.runAsNonRoot` | | `true` | +| `containerSecurityContext.runAsUser` | | `65532` | +| `containerSecurityContext.seccompProfile.type` | | `RuntimeDefault` | +| `env.exposeKeptnMetrics` | enable metrics exporter | `true` | +| `env.metricsControllerLogLevel` | sets the log level of Metrics Controller | `0` | +| `env.analysisControllerLogLevel` | sets the log level of Analysis Controller | `0` | +| `image.registry` | specify the container registry for the metrics-operator image | `ghcr.io` | +| `image.repository` | specify registry for manager image | `keptn/metrics-operator` | +| `image.tag` | select tag for manager image | `v0.9.1` | +| `image.imagePullPolicy` | specify pull policy for manager image this overrides global values | `""` | +| `livenessProbe` | custom livenessprobe for manager container | | +| `readinessProbe` | custom readinessprobe for manager container | | +| `resources` | specify limits and requests for manager container | | From 31132bd2a8f487779467a70d6e0c02c30a3f6a4e Mon Sep 17 00:00:00 2001 From: Griffin Date: Tue, 20 Feb 2024 19:29:24 +0530 Subject: [PATCH 10/11] added to docs Signed-off-by: Griffin --- keptn-cert-manager/chart/README.md | 2 +- keptn-cert-manager/chart/values.yaml | 2 +- lifecycle-operator/chart/values.yaml | 2 +- metrics-operator/chart/README.md | 40 ++++++++++++++-------------- metrics-operator/chart/values.yaml | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/keptn-cert-manager/chart/README.md b/keptn-cert-manager/chart/README.md index c626e127be..0e35a89b47 100644 --- a/keptn-cert-manager/chart/README.md +++ b/keptn-cert-manager/chart/README.md @@ -39,7 +39,7 @@ resource. | `image.registry` | specify the container registry for the certificate-operator image | `ghcr.io` | | `image.repository` | specify repo for manager image | `keptn/certificate-operator` | | `image.tag` | select tag for manager container | `v2.0.0` | -| `image.imagePullPolicy` | select image pull policy for manager container | `""` | +| `image.imagePullPolicy` | specify pull policy for the manager image. This overrides global values | `""` | | `livenessProbe` | custom RBAC proxy liveness probe | | | `readinessProbe` | custom manager readiness probe | | | `resources` | custom limits and requests for manager container | | diff --git a/keptn-cert-manager/chart/values.yaml b/keptn-cert-manager/chart/values.yaml index 48f31bc5a5..3e774a91a0 100644 --- a/keptn-cert-manager/chart/values.yaml +++ b/keptn-cert-manager/chart/values.yaml @@ -70,7 +70,7 @@ image: repository: keptn/certificate-operator ## @param image.tag select tag for manager container tag: v2.0.0 # x-release-please-version -## @param image.imagePullPolicy select image pull policy for manager container +## @param image.imagePullPolicy specify pull policy for the manager image. This overrides global values imagePullPolicy: "" ## @extra livenessProbe custom RBAC proxy liveness probe ## @skip livenessProbe.httpGet.path diff --git a/lifecycle-operator/chart/values.yaml b/lifecycle-operator/chart/values.yaml index 11f76e2b5d..40ae750764 100644 --- a/lifecycle-operator/chart/values.yaml +++ b/lifecycle-operator/chart/values.yaml @@ -222,7 +222,7 @@ scheduler: repository: keptn/scheduler ## @param scheduler.image.tag set image tag for scheduler tag: v0.9.0 -## @param scheduler.image.imagePullPolicy set image pull policy for scheduler +## @param image.imagePullPolicy specify pull policy for the manager image. This overrides global values imagePullPolicy: "" ## @extra scheduler.livenessProbe customizable liveness probe for the scheduler ## @skip scheduler.livenessProbe.httpGet.path diff --git a/metrics-operator/chart/README.md b/metrics-operator/chart/README.md index cb80de7650..19ea33fb80 100644 --- a/metrics-operator/chart/README.md +++ b/metrics-operator/chart/README.md @@ -63,23 +63,23 @@ Prometheus, Dynatrace, DataDog and K8s metric server... ### Keptn Metrics Operator controller -| Name | Description | Value | -| --------------------------------------------------- | ------------------------------------------------------------------ | ------------------------ | -| `containerSecurityContext` | Sets security context privileges | | -| `containerSecurityContext.allowPrivilegeEscalation` | | `false` | -| `containerSecurityContext.capabilities.drop` | | `["ALL"]` | -| `containerSecurityContext.privileged` | | `false` | -| `containerSecurityContext.runAsGroup` | | `65532` | -| `containerSecurityContext.runAsNonRoot` | | `true` | -| `containerSecurityContext.runAsUser` | | `65532` | -| `containerSecurityContext.seccompProfile.type` | | `RuntimeDefault` | -| `env.exposeKeptnMetrics` | enable metrics exporter | `true` | -| `env.metricsControllerLogLevel` | sets the log level of Metrics Controller | `0` | -| `env.analysisControllerLogLevel` | sets the log level of Analysis Controller | `0` | -| `image.registry` | specify the container registry for the metrics-operator image | `ghcr.io` | -| `image.repository` | specify registry for manager image | `keptn/metrics-operator` | -| `image.tag` | select tag for manager image | `v0.9.1` | -| `image.imagePullPolicy` | specify pull policy for manager image this overrides global values | `""` | -| `livenessProbe` | custom livenessprobe for manager container | | -| `readinessProbe` | custom readinessprobe for manager container | | -| `resources` | specify limits and requests for manager container | | +| Name | Description | Value | +| --------------------------------------------------- | ----------------------------------------------------------------------- | ------------------------ | +| `containerSecurityContext` | Sets security context privileges | | +| `containerSecurityContext.allowPrivilegeEscalation` | | `false` | +| `containerSecurityContext.capabilities.drop` | | `["ALL"]` | +| `containerSecurityContext.privileged` | | `false` | +| `containerSecurityContext.runAsGroup` | | `65532` | +| `containerSecurityContext.runAsNonRoot` | | `true` | +| `containerSecurityContext.runAsUser` | | `65532` | +| `containerSecurityContext.seccompProfile.type` | | `RuntimeDefault` | +| `env.exposeKeptnMetrics` | enable metrics exporter | `true` | +| `env.metricsControllerLogLevel` | sets the log level of Metrics Controller | `0` | +| `env.analysisControllerLogLevel` | sets the log level of Analysis Controller | `0` | +| `image.registry` | specify the container registry for the metrics-operator image | `ghcr.io` | +| `image.repository` | specify registry for manager image | `keptn/metrics-operator` | +| `image.tag` | select tag for manager image | `v0.9.1` | +| `image.imagePullPolicy` | specify pull policy for the manager image. This overrides global values | `""` | +| `livenessProbe` | custom livenessprobe for manager container | | +| `readinessProbe` | custom readinessprobe for manager container | | +| `resources` | specify limits and requests for manager container | | diff --git a/metrics-operator/chart/values.yaml b/metrics-operator/chart/values.yaml index 4db37acbf5..48c7b84edf 100644 --- a/metrics-operator/chart/values.yaml +++ b/metrics-operator/chart/values.yaml @@ -138,7 +138,7 @@ image: repository: keptn/metrics-operator ## @param image.tag select tag for manager image tag: v0.9.1 # x-release-please-version -## @param image.imagePullPolicy specify pull policy for manager image this overrides global values +## @param image.imagePullPolicy specify pull policy for the manager image. This overrides global values imagePullPolicy: "" ## @extra livenessProbe custom livenessprobe for manager container ## @skip livenessProbe.httpGet.path From a2e9a03063e8d629ee9dc731977225c8b62fef45 Mon Sep 17 00:00:00 2001 From: Griffin Date: Tue, 20 Feb 2024 19:38:45 +0530 Subject: [PATCH 11/11] fixed helm docs validating error Signed-off-by: Griffin --- lifecycle-operator/chart/README.md | 38 ++++++++++++++-------------- lifecycle-operator/chart/values.yaml | 4 +-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lifecycle-operator/chart/README.md b/lifecycle-operator/chart/README.md index 8c88eaea3a..31fc951b99 100644 --- a/lifecycle-operator/chart/README.md +++ b/lifecycle-operator/chart/README.md @@ -58,7 +58,7 @@ and application health checks | `lifecycleOperator.image.registry` | specify the container registry for the lifecycle-operator image | `ghcr.io` | | `lifecycleOperator.image.repository` | specify registry for manager image | `keptn/lifecycle-operator` | | `lifecycleOperator.image.tag` | select tag for manager image | `v0.9.0` | -| `lifecycleOperator.image.imagePullPolicy` | specify pull policy for manager image | `""` | +| `lifecycleOperator.image.imagePullPolicy` | specify pull policy for the manager image. This overrides global values | `""` | | `lifecycleOperator.livenessProbe` | custom liveness probe for manager container | | | `lifecycleOperator.readinessProbe` | custom readinessprobe for manager container | | | `lifecycleOperator.resources` | specify limits and requests for manager container | | @@ -82,21 +82,21 @@ and application health checks ### Keptn Scheduler -| Name | Description | Value | -| ------------------------------------------------------------ | -------------------------------------------------------------- | --------------------- | -| `scheduler.nodeSelector` | adds node selectors for scheduler | `{}` | -| `scheduler.replicas` | modifies replicas | `1` | -| `scheduler.containerSecurityContext` | Sets security context | | -| `scheduler.env.otelCollectorUrl` | sets url for open telemetry collector | `otel-collector:4317` | -| `scheduler.image.registry` | specify the container registry for the scheduler image | `ghcr.io` | -| `scheduler.image.repository` | set image repository for scheduler | `keptn/scheduler` | -| `scheduler.image.tag` | set image tag for scheduler | `v0.9.0` | -| `scheduler.image.imagePullPolicy` | set image pull policy for scheduler | `""` | -| `scheduler.livenessProbe` | customizable liveness probe for the scheduler | | -| `scheduler.readinessProbe` | customizable readiness probe for the scheduler | | -| `scheduler.resources` | sets cpu and memory resources/limits for scheduler | | -| `scheduler.topologySpreadConstraints` | add topology constraints for scheduler | `[]` | -| `schedulerConfig.profiles[0].schedulerName` | changes scheduler name | `keptn-scheduler` | -| `schedulerConfig.leaderElection.leaderElect` | enables leader election for multiple replicas of the scheduler | `false` | -| `schedulerConfig.profiles[0].plugins.permit.enabled[0].name` | enables permit plugin | `KLCPermit` | -| `scheduler.tolerations` | adds tolerations for scheduler | `[]` | +| Name | Description | Value | +| ------------------------------------------------------------ | ----------------------------------------------------------------------- | --------------------- | +| `scheduler.nodeSelector` | adds node selectors for scheduler | `{}` | +| `scheduler.replicas` | modifies replicas | `1` | +| `scheduler.containerSecurityContext` | Sets security context | | +| `scheduler.env.otelCollectorUrl` | sets url for open telemetry collector | `otel-collector:4317` | +| `scheduler.image.registry` | specify the container registry for the scheduler image | `ghcr.io` | +| `scheduler.image.repository` | set image repository for scheduler | `keptn/scheduler` | +| `scheduler.image.tag` | set image tag for scheduler | `v0.9.0` | +| `scheduler.image.imagePullPolicy` | specify pull policy for the manager image. This overrides global values | `""` | +| `scheduler.livenessProbe` | customizable liveness probe for the scheduler | | +| `scheduler.readinessProbe` | customizable readiness probe for the scheduler | | +| `scheduler.resources` | sets cpu and memory resources/limits for scheduler | | +| `scheduler.topologySpreadConstraints` | add topology constraints for scheduler | `[]` | +| `schedulerConfig.profiles[0].schedulerName` | changes scheduler name | `keptn-scheduler` | +| `schedulerConfig.leaderElection.leaderElect` | enables leader election for multiple replicas of the scheduler | `false` | +| `schedulerConfig.profiles[0].plugins.permit.enabled[0].name` | enables permit plugin | `KLCPermit` | +| `scheduler.tolerations` | adds tolerations for scheduler | `[]` | diff --git a/lifecycle-operator/chart/values.yaml b/lifecycle-operator/chart/values.yaml index 40ae750764..9bcbfa4eb2 100644 --- a/lifecycle-operator/chart/values.yaml +++ b/lifecycle-operator/chart/values.yaml @@ -107,7 +107,7 @@ lifecycleOperator: repository: keptn/lifecycle-operator ## @param lifecycleOperator.image.tag select tag for manager image tag: v0.9.0 # x-release-please-version -## @param lifecycleOperator.image.imagePullPolicy specify pull policy for manager image +## @param lifecycleOperator.image.imagePullPolicy specify pull policy for the manager image. This overrides global values imagePullPolicy: "" ## @extra lifecycleOperator.livenessProbe custom liveness probe for manager container ## @skip lifecycleOperator.livenessProbe.httpGet.path @@ -222,7 +222,7 @@ scheduler: repository: keptn/scheduler ## @param scheduler.image.tag set image tag for scheduler tag: v0.9.0 -## @param image.imagePullPolicy specify pull policy for the manager image. This overrides global values +## @param scheduler.image.imagePullPolicy specify pull policy for the manager image. This overrides global values imagePullPolicy: "" ## @extra scheduler.livenessProbe customizable liveness probe for the scheduler ## @skip scheduler.livenessProbe.httpGet.path