Update keptn-metrics-operator Helm chart (#149)

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: odubajDT <[email protected]> Co-authored-by: odubajDT <[email protected]> Co-authored-by: odubajDT <[email protected]>
keptn · Mar 19, 2024 · 52a19db · 52a19db
1 parent 64886d6
commit 52a19db
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 23 deletions.
diff --git a/charts/keptn-metrics-operator/Chart.lock b/charts/keptn-metrics-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:11:49.108416649Z"
+  version: 0.2.1
+digest: sha256:23cfd1d58cd1cd569753326f7587dc0bf18df6110acffc3cf002479efab46abe
+generated: "2024-03-18T11:11:32.514626+01:00"
diff --git a/charts/keptn-metrics-operator/Chart.yaml b/charts/keptn-metrics-operator/Chart.yaml
@@ -34,14 +34,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.1.3
+version: 0.1.4
 
 # 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.2" # x-release-please-version
+appVersion: "v0.9.3" # 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-metrics-operator/README.md b/charts/keptn-metrics-operator/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                                                | `""`   |
-| `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                                           | `ghcr.io` |
+| `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
 
@@ -76,9 +76,9 @@ Prometheus, Dynatrace, DataDog and K8s metric server...
 | `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.registry`                                    | specify the container registry for the metrics-operator image           | `""`                     |
 | `image.repository`                                  | specify registry for manager image                                      | `keptn/metrics-operator` |
-| `image.tag`                                         | select tag for manager image                                            | `v0.9.2`                 |
+| `image.tag`                                         | select tag for manager image                                            | `v0.9.3`                 |
 | `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                             |                          |

diff --git a/charts/keptn-metrics-operator/templates/_helpers.tpl b/charts/keptn-metrics-operator/templates/_helpers.tpl
@@ -0,0 +1,6 @@
+{{/*
+Return the proper Image Registry Secret Names
+*/}}
+{{- define "metricsOperator.imagePullSecrets" -}}
+{{ include "common.images.renderPullSecrets" (dict "images" (list .Values.image) "context" $) }}
+{{- end -}}
diff --git a/charts/keptn-metrics-operator/templates/deployment.yaml b/charts/keptn-metrics-operator/templates/deployment.yaml
@@ -94,9 +94,11 @@ spec:
         volumeMounts:
         - mountPath: /tmp/metrics-adapter/serving-certs
           name: adapter-certs-dir
+        - name: keptn-certs
+          mountPath: /tmp/webhook/certs/ 
         {{- if .Values.livenessProbe }}
         livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.livenessProbe "context" $) | nindent 10 }}
-         {{- else }}
+        {{- else }}
         livenessProbe:
          httpGet:
            path: /healthz
@@ -106,22 +108,25 @@ spec:
         {{- end }}
         {{- if .Values.readinessProbe }}
         readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.readinessProbe "context" $) | nindent 10 }}
-         {{- else }}
+        {{- else }}
         readinessProbe:
          httpGet:
            path: /readyz
            port: 8081
          initialDelaySeconds: 5
          periodSeconds: 10
         {{- end }}
-      imagePullSecrets: {{- include "common.images.imagePullSecrets" . }}
+        {{- include "metricsOperator.imagePullSecrets" . | nindent 6 }}
       securityContext:
         runAsNonRoot: true
       serviceAccountName: metrics-operator
       terminationGracePeriodSeconds: 10
       volumes:
       - emptyDir: {}
         name: adapter-certs-dir
+      - name: keptn-certs
+        secret:
+          secretName: keptn-certs
 {{- if .Values.topologySpreadConstraints }}
       topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.topologySpreadConstraints "context" $) | nindent 8 }}
 {{- end }}

diff --git a/charts/keptn-metrics-operator/values.yaml b/charts/keptn-metrics-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.
@@ -133,11 +133,11 @@ env:
   analysisControllerLogLevel: "0"
 image:
 ## @param     image.registry specify the container registry for the metrics-operator image
-  registry: ghcr.io
+  registry: ""
 ## @param   image.repository specify registry for manager image
   repository: keptn/metrics-operator
 ## @param   image.tag select tag for manager image
-  tag: v0.9.2 # x-release-please-version
+  tag: v0.9.3 # x-release-please-version
 ## @param   image.imagePullPolicy specify pull policy for the manager image. This overrides global values
   imagePullPolicy: ""
 ## @extra  livenessProbe custom livenessprobe for manager container