[Operator] Optional tag for collector

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.

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/

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

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

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

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

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:

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

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

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

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

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

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

charts/opentelemetry-operator/templates/deployment.yaml

@@ -47,8 +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 }}
+            {{- if .Values.manager.collectorImage.repository -}}
+            {{- $tag := "" -}}
+            {{- if .Values.manager.collectorImage.tag -}}
+            {{- $tag = print ":" .Values.manager.collectorImage.tag -}}
+            {{- end }}
+            - --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 }}

charts/opentelemetry-operator/values.yaml

@@ -42,7 +42,7 @@ manager:
     tag: ""
   collectorImage:
     repository: ""
-    tag: 0.100.0
+    tag: ""
   opampBridgeImage:
     repository: ""
     tag: ""