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