From e2bed11cf1aa6fab13478b358f9939d77b0f543b Mon Sep 17 00:00:00 2001 From: Anna Kapuscinska Date: Wed, 29 Nov 2023 22:13:23 +0000 Subject: [PATCH] helm: Remove tetragonOperator.image.suffix value It seems it was templated in an incorrect place anyway (before the tag). Signed-off-by: Anna Kapuscinska --- docs/content/en/docs/reference/helm-chart.md | 2 +- install/kubernetes/README.md | 2 +- install/kubernetes/templates/operator_deployment.yaml | 2 +- install/kubernetes/values.yaml | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/content/en/docs/reference/helm-chart.md b/docs/content/en/docs/reference/helm-chart.md index 23df6056168..7edd13843bd 100644 --- a/docs/content/en/docs/reference/helm-chart.md +++ b/docs/content/en/docs/reference/helm-chart.md @@ -102,7 +102,7 @@ To use [the values available](#values), with `helm install` or `helm upgrade`, u | tetragon.prometheus.serviceMonitor.scrapeInterval | string | `"10s"` | Interval at which metrics should be scraped. If not specified, Prometheus' global scrape interval is used. | | tetragon.resources | object | `{}` | | | tetragon.securityContext.privileged | bool | `true` | | -| tetragonOperator.image | object | `{"override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/tetragon-operator","suffix":"","tag":"v1.0.0"}` | tetragon-operator image. | +| tetragonOperator.image | object | `{"override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/tetragon-operator","tag":"v1.0.0"}` | tetragon-operator image. | | tetragonOperator.podInfo.enabled | bool | `false` | Enables the PodInfo CRD and the controller that reconciles PodInfo custom resources. | | tetragonOperator.skipCRDCreation | bool | `false` | | | tolerations[0].operator | string | `"Exists"` | | diff --git a/install/kubernetes/README.md b/install/kubernetes/README.md index cdb08d9ec68..72736009fac 100644 --- a/install/kubernetes/README.md +++ b/install/kubernetes/README.md @@ -85,7 +85,7 @@ Helm chart for Tetragon | tetragon.prometheus.serviceMonitor.scrapeInterval | string | `"10s"` | Interval at which metrics should be scraped. If not specified, Prometheus' global scrape interval is used. | | tetragon.resources | object | `{}` | | | tetragon.securityContext.privileged | bool | `true` | | -| tetragonOperator.image | object | `{"override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/tetragon-operator","suffix":"","tag":"v1.0.0"}` | tetragon-operator image. | +| tetragonOperator.image | object | `{"override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/tetragon-operator","tag":"v1.0.0"}` | tetragon-operator image. | | tetragonOperator.podInfo.enabled | bool | `false` | Enables the PodInfo CRD and the controller that reconciles PodInfo custom resources. | | tetragonOperator.skipCRDCreation | bool | `false` | | | tolerations[0].operator | string | `"Exists"` | | diff --git a/install/kubernetes/templates/operator_deployment.yaml b/install/kubernetes/templates/operator_deployment.yaml index c99485d303c..08b3ee6ed1f 100644 --- a/install/kubernetes/templates/operator_deployment.yaml +++ b/install/kubernetes/templates/operator_deployment.yaml @@ -22,7 +22,7 @@ spec: args: - serve - --config-dir=/etc/tetragon/operator.conf.d/ - image: "{{ if .Values.tetragonOperator.image.override }}{{ .Values.tetragonOperator.image.override }}{{ else }}{{ .Values.tetragonOperator.image.repository }}{{ .Values.tetragonOperator.image.suffix }}:{{ .Values.tetragonOperator.image.tag }}{{ end }}" + image: "{{ if .Values.tetragonOperator.image.override }}{{ .Values.tetragonOperator.image.override }}{{ else }}{{ .Values.tetragonOperator.image.repository }}:{{ .Values.tetragonOperator.image.tag }}{{ end }}" imagePullPolicy: {{ .Values.tetragonOperator.image.pullPolicy }} volumeMounts: - mountPath: /etc/tetragon/operator.conf.d/ diff --git a/install/kubernetes/values.yaml b/install/kubernetes/values.yaml index cccfd66be84..c81b729676f 100644 --- a/install/kubernetes/values.yaml +++ b/install/kubernetes/values.yaml @@ -164,8 +164,6 @@ tetragonOperator: override: ~ repository: quay.io/cilium/tetragon-operator tag: v1.0.0 - # tetragon-operator image-digest - suffix: "" pullPolicy: IfNotPresent # Skip CRD creation. skipCRDCreation: false