From 1d484819ef226dc0d4af33ecce629651d13209c5 Mon Sep 17 00:00:00 2001 From: Diego Sierra Fernandez Date: Tue, 21 May 2024 17:36:34 +0200 Subject: [PATCH 1/4] Optional tag for collector --- charts/opentelemetry-operator/CONTRIBUTING.md | 1 - charts/opentelemetry-operator/Chart.yaml | 2 +- .../operator-webhook-with-cert-manager.yaml | 4 ++-- .../examples/default/rendered/certmanager.yaml | 4 ++-- .../examples/default/rendered/clusterrole.yaml | 6 +++--- .../examples/default/rendered/clusterrolebinding.yaml | 4 ++-- .../examples/default/rendered/deployment.yaml | 4 ++-- .../examples/default/rendered/role.yaml | 2 +- .../examples/default/rendered/rolebinding.yaml | 2 +- .../examples/default/rendered/service.yaml | 4 ++-- .../examples/default/rendered/serviceaccount.yaml | 2 +- .../default/rendered/tests/test-certmanager-connection.yaml | 2 +- .../default/rendered/tests/test-service-connection.yaml | 4 ++-- charts/opentelemetry-operator/templates/deployment.yaml | 2 ++ charts/opentelemetry-operator/values.yaml | 2 +- 15 files changed, 23 insertions(+), 22 deletions(-) diff --git a/charts/opentelemetry-operator/CONTRIBUTING.md b/charts/opentelemetry-operator/CONTRIBUTING.md index 85441d5dc..b1b40abf1 100644 --- a/charts/opentelemetry-operator/CONTRIBUTING.md +++ b/charts/opentelemetry-operator/CONTRIBUTING.md @@ -4,7 +4,6 @@ 1. Increase the minor version of the chart by one and set the patch version to zero. 1. Update the chart's `appVersion` to match the new operator version. -1. In the values.yaml, update `manager.collectorImage.tag` to match the version of the collector managed by default by the operator. 1. Run `make generate-examples CHARTS=opentelemetry-operator`. 1. Run `make update-operator-crds` to update the CRDs in this chart to match the operator's. 1. Review the [Operator release notes](https://github.com/open-telemetry/opentelemetry-operator/releases). If any changes affect the helm chart, adjust the helm chart accordingly. diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml index c7c1a7ffc..4c3b5b80f 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.2 +version: 0.58.3 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 d43789df2..5e15fc419 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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 40ee0d7ab..a418dc12a 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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 cf76d353c..146a270f0 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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 de6f5da82..3bd3af3f8 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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 a59fb27f4..5b24f1f0e 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.99.0" app.kubernetes.io/managed-by: Helm @@ -34,7 +34,7 @@ spec: - --enable-leader-election - --health-probe-addr=:8081 - --webhook-port=9443 - - --collector-image=otel/opentelemetry-collector-k8s:0.99.0 + - --collector-image=otel/opentelemetry-collector-k8s command: - /manager env: diff --git a/charts/opentelemetry-operator/examples/default/rendered/role.yaml b/charts/opentelemetry-operator/examples/default/rendered/role.yaml index 6057bf9b8..61e602fe7 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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 170dcb6b8..5054d1b70 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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 b273c21ad..5717501b6 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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 20bf36107..d4e496aad 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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 b6d83fec6..90cc0c80d 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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 8ab999d7b..78a4a5b37 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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.2 + helm.sh/chart: opentelemetry-operator-0.58.3 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/deployment.yaml b/charts/opentelemetry-operator/templates/deployment.yaml index 28a425137..cc5ea1086 100644 --- a/charts/opentelemetry-operator/templates/deployment.yaml +++ b/charts/opentelemetry-operator/templates/deployment.yaml @@ -49,6 +49,8 @@ spec: {{- end }} {{- if and .Values.manager.collectorImage.repository .Values.manager.collectorImage.tag }} - --collector-image={{ .Values.manager.collectorImage.repository }}:{{ .Values.manager.collectorImage.tag }} + {{- else if .Values.manager.collectorImage.repository }} + - --collector-image={{ .Values.manager.collectorImage.repository }} {{- end }} {{- if and .Values.manager.opampBridgeImage.repository .Values.manager.opampBridgeImage.tag }} - --operator-opamp-bridge-image={{ .Values.manager.opampBridgeImage.repository }}:{{ .Values.manager.opampBridgeImage.tag }} diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml index 32d8660a1..61049edf5 100644 --- a/charts/opentelemetry-operator/values.yaml +++ b/charts/opentelemetry-operator/values.yaml @@ -42,7 +42,7 @@ manager: tag: "" collectorImage: repository: "" - tag: 0.99.0 + tag: "" opampBridgeImage: repository: "" tag: "" From 694d91a7d35ae6d6f314b7e7aa89a391592705e3 Mon Sep 17 00:00:00 2001 From: Diego Sierra Fernandez Date: Fri, 24 May 2024 00:59:03 +0200 Subject: [PATCH 2/4] revert check collector repository --- charts/opentelemetry-operator/templates/NOTES.txt | 4 ++++ charts/opentelemetry-operator/values.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/opentelemetry-operator/templates/NOTES.txt b/charts/opentelemetry-operator/templates/NOTES.txt index d7ab37708..227ecfef8 100644 --- a/charts/opentelemetry-operator/templates/NOTES.txt +++ b/charts/opentelemetry-operator/templates/NOTES.txt @@ -1,3 +1,7 @@ +{{- if not .Values.manager.collectorImage.repository }} +{{ fail "[ERROR] 'manager.collectorImage.repository' must be set. See https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-operator/UPGRADING.md for instructions." }} +{{ end }} + {{ $.Chart.Name }} has been installed. Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "release={{ $.Release.Name }}" diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml index 7de517ec6..61049edf5 100644 --- a/charts/opentelemetry-operator/values.yaml +++ b/charts/opentelemetry-operator/values.yaml @@ -42,7 +42,7 @@ manager: tag: "" collectorImage: repository: "" - tag: 0.100.0 + tag: "" opampBridgeImage: repository: "" tag: "" From 89c6a5dd076bcc0871fdf96c88bd57c039916e4f Mon Sep 17 00:00:00 2001 From: Diego Sierra Fernandez Date: Fri, 24 May 2024 01:39:47 +0200 Subject: [PATCH 3/4] Bump version --- charts/opentelemetry-operator/Chart.yaml | 2 +- .../operator-webhook-with-cert-manager.yaml | 4 ++-- .../examples/default/rendered/certmanager.yaml | 4 ++-- .../examples/default/rendered/clusterrole.yaml | 6 +++--- .../examples/default/rendered/clusterrolebinding.yaml | 4 ++-- .../examples/default/rendered/deployment.yaml | 4 ++-- .../examples/default/rendered/role.yaml | 2 +- .../examples/default/rendered/rolebinding.yaml | 2 +- .../examples/default/rendered/service.yaml | 4 ++-- .../examples/default/rendered/serviceaccount.yaml | 2 +- .../rendered/tests/test-certmanager-connection.yaml | 2 +- .../rendered/tests/test-service-connection.yaml | 4 ++-- .../opentelemetry-operator/templates/deployment.yaml | 10 ++++++---- 13 files changed, 26 insertions(+), 24 deletions(-) diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml index 4c3a6618c..c39265b90 100644 --- a/charts/opentelemetry-operator/Chart.yaml +++ b/charts/opentelemetry-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-operator -version: 0.60.0 +version: 0.60.1 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 3375d62b8..4099c0688 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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 09e354a37..a0f9bd7b8 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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 51b8239bb..105384719 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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 acb7368cb..98ece36ea 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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 d011796e3..bcd7bc28d 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" app.kubernetes.io/managed-by: Helm @@ -34,7 +34,7 @@ spec: - --enable-leader-election - --health-probe-addr=:8081 - --webhook-port=9443 - - --collector-image=otel/opentelemetry-collector-k8s:0.100.0 + - --collector-image=otel/opentelemetry-collector-k8s command: - /manager env: diff --git a/charts/opentelemetry-operator/examples/default/rendered/role.yaml b/charts/opentelemetry-operator/examples/default/rendered/role.yaml index 91c1f1eb1..62a326e6b 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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 855c4f8cb..359a48ab8 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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 185c34e81..bd7a919bf 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" app.kubernetes.io/managed-by: Helm @@ -32,7 +32,7 @@ apiVersion: v1 kind: Service metadata: labels: - helm.sh/chart: opentelemetry-operator-0.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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 621a71576..850d0aed6 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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 29704d8d8..88a49e4d3 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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 15e71d7d9..e33900d37 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" 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.60.0 + helm.sh/chart: opentelemetry-operator-0.60.1 app.kubernetes.io/name: opentelemetry-operator app.kubernetes.io/version: "0.100.1" app.kubernetes.io/managed-by: Helm diff --git a/charts/opentelemetry-operator/templates/deployment.yaml b/charts/opentelemetry-operator/templates/deployment.yaml index cc5ea1086..ff2ac142b 100644 --- a/charts/opentelemetry-operator/templates/deployment.yaml +++ b/charts/opentelemetry-operator/templates/deployment.yaml @@ -47,10 +47,12 @@ spec: {{- if or .Values.admissionWebhooks.create .Values.admissionWebhooks.secretName }} - --webhook-port={{ .Values.manager.ports.webhookPort }} {{- end }} - {{- if and .Values.manager.collectorImage.repository .Values.manager.collectorImage.tag }} - - --collector-image={{ .Values.manager.collectorImage.repository }}:{{ .Values.manager.collectorImage.tag }} - {{- else if .Values.manager.collectorImage.repository }} - - --collector-image={{ .Values.manager.collectorImage.repository }} + {{- if .Values.manager.collectorImage.repository -}} + {{- $collectorImageTag := "" -}} + {{- if .Values.manager.collectorImage.tag -}} + {{- $collectorImageTag = print ":" .Values.manager.collectorImage.tag -}} + {{- end }} + - --collector-image={{ .Values.manager.collectorImage.repository }}{{ $collectorImageTag }} {{- end }} {{- if and .Values.manager.opampBridgeImage.repository .Values.manager.opampBridgeImage.tag }} - --operator-opamp-bridge-image={{ .Values.manager.opampBridgeImage.repository }}:{{ .Values.manager.opampBridgeImage.tag }} From a9c6f32b1ea7a9f5b749ff8485200d3000cc087d Mon Sep 17 00:00:00 2001 From: Diego Sierra Fernandez Date: Fri, 24 May 2024 01:55:50 +0200 Subject: [PATCH 4/4] change variable name --- charts/opentelemetry-operator/templates/deployment.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/opentelemetry-operator/templates/deployment.yaml b/charts/opentelemetry-operator/templates/deployment.yaml index ff2ac142b..0c5dd8b9b 100644 --- a/charts/opentelemetry-operator/templates/deployment.yaml +++ b/charts/opentelemetry-operator/templates/deployment.yaml @@ -48,11 +48,11 @@ spec: - --webhook-port={{ .Values.manager.ports.webhookPort }} {{- end }} {{- if .Values.manager.collectorImage.repository -}} - {{- $collectorImageTag := "" -}} + {{- $tag := "" -}} {{- if .Values.manager.collectorImage.tag -}} - {{- $collectorImageTag = print ":" .Values.manager.collectorImage.tag -}} + {{- $tag = print ":" .Values.manager.collectorImage.tag -}} {{- end }} - - --collector-image={{ .Values.manager.collectorImage.repository }}{{ $collectorImageTag }} + - --collector-image={{ .Values.manager.collectorImage.repository }}{{ $tag }} {{- end }} {{- if and .Values.manager.opampBridgeImage.repository .Values.manager.opampBridgeImage.tag }} - --operator-opamp-bridge-image={{ .Values.manager.opampBridgeImage.repository }}:{{ .Values.manager.opampBridgeImage.tag }}