diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml index e3f7dd97410..c7c1a7ffc8b 100644 --- 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/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml b/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml index 8cc2690c444..d43789df2c3 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml +++ b/charts/opentelemetry-operator/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 index 3c66617112d..40ee0d7ab47 100644 --- 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 index aded8ccee63..cf76d353c1d 100644 --- 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 index 070069fa60a..de6f5da8253 100644 --- 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 index cb3cf19681e..a59fb27f411 100644 --- 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 index b0fe8828b35..6057bf9b831 100644 --- 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 index 9e54aca4a1a..170dcb6b8df 100644 --- 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 index 4b4a91da615..b273c21ad1a 100644 --- 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 index c86a4b0c33c..20bf36107fd 100644 --- 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/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml index 85ea10a1ee4..b6d83fec638 100644 --- a/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml +++ b/charts/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 index 29a63c83be6..8ab999d7bdf 100644 --- 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 index 0613eebe891..3cd697c9be3 100644 --- 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 index 28263498a44..28a4251379d 100644 --- 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 }}