From 31699a22c269e6ac79e43074014c53b9079de94f Mon Sep 17 00:00:00 2001 From: keptn-bot <86361500+keptn-bot@users.noreply.github.com> Date: Wed, 20 Mar 2024 08:28:28 +0100 Subject: [PATCH] Update keptn-lifecycle-operator Helm chart (#148) Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: odubajDT Co-authored-by: odubajDT <93584209+odubajDT@users.noreply.github.com> Co-authored-by: odubajDT --- charts/keptn-lifecycle-operator/Chart.lock | 6 +++--- charts/keptn-lifecycle-operator/Chart.yaml | 6 +++--- charts/keptn-lifecycle-operator/README.md | 14 +++++++------- .../templates/_helpers.tpl | 13 +++++++++++++ .../templates/deployment.yaml | 11 +++++++++-- .../templates/keptnevaluation-crd.yaml | 4 ++-- charts/keptn-lifecycle-operator/values.yaml | 14 +++++++------- 7 files changed, 44 insertions(+), 24 deletions(-) create mode 100644 charts/keptn-lifecycle-operator/templates/_helpers.tpl diff --git a/charts/keptn-lifecycle-operator/Chart.lock b/charts/keptn-lifecycle-operator/Chart.lock index c40a6dc..c434c19 100644 --- a/charts/keptn-lifecycle-operator/Chart.lock +++ b/charts/keptn-lifecycle-operator/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: https://charts.lifecycle.keptn.sh - version: 0.1.4 -digest: sha256:16a2c2b907d0cf88de1e869c5d9d2249c9aeb6a9fd941f77c71f4f58caae7868 -generated: "2024-02-26T10:12:05.459085085Z" + version: 0.2.1 +digest: sha256:23cfd1d58cd1cd569753326f7587dc0bf18df6110acffc3cf002479efab46abe +generated: "2024-03-18T11:11:30.195659+01:00" diff --git a/charts/keptn-lifecycle-operator/Chart.yaml b/charts/keptn-lifecycle-operator/Chart.yaml index 702b185..b62c985 100644 --- a/charts/keptn-lifecycle-operator/Chart.yaml +++ b/charts/keptn-lifecycle-operator/Chart.yaml @@ -40,14 +40,14 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.2 +version: 0.2.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.9.1" # x-release-please-version +appVersion: "v0.9.2" # x-release-please-version dependencies: - name: common repository: "https://charts.lifecycle.keptn.sh" - version: 0.1.4 + version: 0.2.1 diff --git a/charts/keptn-lifecycle-operator/README.md b/charts/keptn-lifecycle-operator/README.md index 5300b53..521d0a5 100644 --- a/charts/keptn-lifecycle-operator/README.md +++ b/charts/keptn-lifecycle-operator/README.md @@ -14,7 +14,7 @@ and application health checks | Name | Description | Value | | ------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------- | | `global.certManagerEnabled` | Enable this value to install Keptn Certificate Manager | `true` | -| `global.imageRegistry` | Global container image registry | `""` | +| `global.imageRegistry` | Global container image registry | `ghcr.io` | | `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 | `{}` | @@ -43,7 +43,7 @@ and application health checks | `lifecycleOperator.containerSecurityContext.runAsNonRoot` | | `true` | | `lifecycleOperator.containerSecurityContext.runAsUser` | | `65532` | | `lifecycleOperator.containerSecurityContext.seccompProfile.type` | | `RuntimeDefault` | -| `lifecycleOperator.env.functionRunnerImage` | specify image for deno task runtime | `ghcr.io/keptn/deno-runtime:v2.0.2` | +| `lifecycleOperator.env.functionRunnerImage` | specify image for deno task runtime | `ghcr.io/keptn/deno-runtime:v2.0.3` | | `lifecycleOperator.env.keptnAppControllerLogLevel` | sets the log level of Keptn App Controller | `0` | | `lifecycleOperator.env.keptnAppCreationRequestControllerLogLevel` | sets the log level of Keptn App Creation Request Controller | `0` | | `lifecycleOperator.env.keptnAppVersionControllerLogLevel` | sets the log level of Keptn AppVersion Controller | `0` | @@ -54,10 +54,10 @@ and application health checks | `lifecycleOperator.env.keptnWorkloadVersionControllerLogLevel` | sets the log level of Keptn WorkloadVersion Controller | `0` | | `lifecycleOperator.env.keptnDoraMetricsPort` | sets the port for accessing lifecycle metrics in prometheus format | `2222` | | `lifecycleOperator.env.optionsControllerLogLevel` | sets the log level of Keptn Options Controller | `0` | -| `lifecycleOperator.env.pythonRunnerImage` | specify image for python task runtime | `ghcr.io/keptn/python-runtime:v1.0.3` | -| `lifecycleOperator.image.registry` | specify the container registry for the lifecycle-operator image | `ghcr.io` | +| `lifecycleOperator.env.pythonRunnerImage` | specify image for python task runtime | `ghcr.io/keptn/python-runtime:v1.0.4` | +| `lifecycleOperator.image.registry` | specify the container registry for the lifecycle-operator image | `""` | | `lifecycleOperator.image.repository` | specify registry for manager image | `keptn/lifecycle-operator` | -| `lifecycleOperator.image.tag` | select tag for manager image | `v0.9.1` | +| `lifecycleOperator.image.tag` | select tag for manager image | `v0.9.2` | | `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 | | @@ -88,9 +88,9 @@ and application health checks | `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.registry` | specify the container registry for the scheduler image | `""` | | `scheduler.image.repository` | set image repository for scheduler | `keptn/scheduler` | -| `scheduler.image.tag` | set image tag for scheduler | `v0.9.1` | +| `scheduler.image.tag` | set image tag for scheduler | `v0.9.2` | | `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 | | diff --git a/charts/keptn-lifecycle-operator/templates/_helpers.tpl b/charts/keptn-lifecycle-operator/templates/_helpers.tpl new file mode 100644 index 0000000..e9598ca --- /dev/null +++ b/charts/keptn-lifecycle-operator/templates/_helpers.tpl @@ -0,0 +1,13 @@ +{{/* +Return the proper Image Registry Secret Names for lifecycle operator +*/}} +{{- define "lifecycleOperator.imagePullSecrets" -}} +{{ include "common.images.renderPullSecrets" (dict "images" (list .Values.lifecycleOperator.image) "context" $) }} +{{- end -}} + +{{/* +Return the proper Image Registry Secret Names for scheduler +*/}} +{{- define "scheduler.imagePullSecrets" -}} +{{ include "common.images.renderPullSecrets" (dict "images" (list .Values.scheduler.image) "context" $) }} +{{- end -}} diff --git a/charts/keptn-lifecycle-operator/templates/deployment.yaml b/charts/keptn-lifecycle-operator/templates/deployment.yaml index 8980391..998f981 100644 --- a/charts/keptn-lifecycle-operator/templates/deployment.yaml +++ b/charts/keptn-lifecycle-operator/templates/deployment.yaml @@ -135,6 +135,9 @@ spec: }} seccompProfile: {{- include "common.tplvalues.render" (dict "value" .Values.lifecycleOperator.containerSecurityContext.seccompProfile "context" $) | nindent 12 }} + volumeMounts: + - name: keptn-certs + mountPath: /tmp/webhook/certs/ {{- if .Values.lifecycleOperator.livenessProbe }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.lifecycleOperator.livenessProbe "context" $) | nindent 10 }} {{- else }} @@ -155,11 +158,15 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 {{- end }} - imagePullSecrets: {{- include "common.images.imagePullSecrets" . }} + {{- include "lifecycleOperator.imagePullSecrets" . | nindent 6 }} securityContext: runAsNonRoot: true serviceAccountName: lifecycle-operator terminationGracePeriodSeconds: 10 + volumes: + - name: keptn-certs + secret: + secretName: keptn-certs {{- if .Values.lifecycleOperator.topologySpreadConstraints }} topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.lifecycleOperator.topologySpreadConstraints "context" $) | nindent 8 }} {{- end }} @@ -243,7 +250,7 @@ spec: port: 10259 scheme: HTTPS {{- end }} - imagePullSecrets: {{- include "common.images.imagePullSecrets" . }} + {{- include "scheduler.imagePullSecrets" . | nindent 6 }} serviceAccountName: keptn-scheduler volumes: - configMap: diff --git a/charts/keptn-lifecycle-operator/templates/keptnevaluation-crd.yaml b/charts/keptn-lifecycle-operator/templates/keptnevaluation-crd.yaml index cefe794..0f62dd3 100644 --- a/charts/keptn-lifecycle-operator/templates/keptnevaluation-crd.yaml +++ b/charts/keptn-lifecycle-operator/templates/keptnevaluation-crd.yaml @@ -79,6 +79,8 @@ spec: type: string evaluationDefinition: type: string + failAction: + type: string retries: default: 10 type: integer @@ -469,8 +471,6 @@ spec: The KeptnEvaluationDefinition can be located in the same namespace as the KeptnEvaluation, or in the Keptn namespace. type: string - failAction: - type: string retries: default: 10 description: |- diff --git a/charts/keptn-lifecycle-operator/values.yaml b/charts/keptn-lifecycle-operator/values.yaml index 289276f..55bb708 100644 --- a/charts/keptn-lifecycle-operator/values.yaml +++ b/charts/keptn-lifecycle-operator/values.yaml @@ -7,7 +7,7 @@ global: ## @param global.certManagerEnabled Enable this value to install Keptn Certificate Manager certManagerEnabled: true ## @param global.imageRegistry Global container image registry - imageRegistry: "" + imageRegistry: "ghcr.io" ## @param global.imagePullSecrets Global Docker registry secret names as an array ## E.g. @@ -77,7 +77,7 @@ lifecycleOperator: type: RuntimeDefault ## @param lifecycleOperator.env.functionRunnerImage specify image for deno task runtime env: - functionRunnerImage: ghcr.io/keptn/deno-runtime:v2.0.2 + functionRunnerImage: ghcr.io/keptn/deno-runtime:v2.0.3 ## @param lifecycleOperator.env.keptnAppControllerLogLevel sets the log level of Keptn App Controller keptnAppControllerLogLevel: "0" ## @param lifecycleOperator.env.keptnAppCreationRequestControllerLogLevel sets the log level of Keptn App Creation Request Controller @@ -99,14 +99,14 @@ lifecycleOperator: ## @param lifecycleOperator.env.optionsControllerLogLevel sets the log level of Keptn Options Controller optionsControllerLogLevel: "0" ## @param lifecycleOperator.env.pythonRunnerImage specify image for python task runtime - pythonRunnerImage: ghcr.io/keptn/python-runtime:v1.0.3 + pythonRunnerImage: ghcr.io/keptn/python-runtime:v1.0.4 image: ## @param lifecycleOperator.image.registry specify the container registry for the lifecycle-operator image - registry: ghcr.io + registry: "" ## @param lifecycleOperator.image.repository specify registry for manager image repository: keptn/lifecycle-operator ## @param lifecycleOperator.image.tag select tag for manager image - tag: v0.9.1 # x-release-please-version + tag: v0.9.2 # x-release-please-version ## @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 @@ -217,11 +217,11 @@ scheduler: otelCollectorUrl: otel-collector:4317 image: ## @param scheduler.image.registry specify the container registry for the scheduler image - registry: ghcr.io + registry: "" ## @param scheduler.image.repository set image repository for scheduler repository: keptn/scheduler ## @param scheduler.image.tag set image tag for scheduler - tag: v0.9.1 + tag: v0.9.2 ## @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