[operator] define opentelemetry-operator.image in helper tpl (open-te…

…lemetry#1182) * add opentelemetry-operator.image in tpl * bump up * bump up * bump up --------- Co-authored-by: Tyler Helmuth <[email protected]>
swiatekm · May 16, 2024 · 2f4e7a8 · 2f4e7a8
1 parent 2a5f647
commit 2f4e7a8
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 20 deletions.
diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-operator
-version: 0.58.1
+version: 0.58.2
 description: OpenTelemetry Operator Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

diff --git a/...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml b/...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -91,7 +91,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml b/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -30,7 +30,7 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -223,7 +223,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -242,7 +242,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -26,7 +26,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml b/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/role.yaml b/charts/opentelemetry-operator/examples/default/rendered/role.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/service.yaml b/charts/opentelemetry-operator/examples/default/rendered/service.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -32,7 +32,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   name: opentelemetry-operator
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml b/...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml
@@ -6,7 +6,7 @@ metadata:
   name: "example-opentelemetry-operator-cert-manager"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml
@@ -6,7 +6,7 @@ metadata:
   name: "example-opentelemetry-operator-metrics"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -44,7 +44,7 @@ metadata:
   name: "example-opentelemetry-operator-webhook"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.1
+    helm.sh/chart: opentelemetry-operator-0.58.2
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/templates/_helpers.tpl b/charts/opentelemetry-operator/templates/_helpers.tpl
@@ -142,3 +142,10 @@ Return the name of the cert-manager.io/inject-ca-from annotation for webhooks an
 {{- printf "%s/%s" .Release.Namespace (include "opentelemetry-operator.webhookCertName" .) }}
 {{- end }}
 {{- end }}
+
+{{/*
+The image to use for opentelemetry-operator.
+*/}}
+{{- define "opentelemetry-operator.image" -}}
+{{- printf "%s:%s" .Values.manager.image.repository (default .Chart.AppVersion .Values.manager.image.tag) }}
+{{- end }}
diff --git a/charts/opentelemetry-operator/templates/deployment.yaml b/charts/opentelemetry-operator/templates/deployment.yaml
@@ -89,7 +89,7 @@ spec:
               value: {{ $value | quote -}}
             {{- end }}
           {{- end }}
-          image: "{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag | default .Chart.AppVersion }}"
+          image: {{ include "opentelemetry-operator.image" . | quote }}
           name: manager
           ports:
             - containerPort: {{ .Values.manager.ports.metricsPort }}