From b39f601a751004752de29a2ccb586aa8b90016e3 Mon Sep 17 00:00:00 2001
From: Jacob Aronoff <jaronoff97@users.noreply.github.com>
Date: Thu, 29 Aug 2024 14:37:47 -0400
Subject: [PATCH] Remove image setting when not needed (#1323)

* Remove image setting when not needed

* version bump

* Add comment
---
 charts/opentelemetry-kube-stack/Chart.yaml                | 2 +-
 .../examples/cloud-demo/rendered/bridge.yaml              | 4 ++--
 .../examples/cloud-demo/rendered/collector.yaml           | 6 ++----
 .../examples/cloud-demo/rendered/hooks.yaml               | 2 +-
 .../examples/cloud-demo/rendered/instrumentation.yaml     | 2 +-
 .../examples/prometheus-otel/rendered/collector.yaml      | 3 +--
 .../exporters/kube-api-server/servicemonitor.yaml         | 2 +-
 .../exporters/kube-controller-manager/service.yaml        | 2 +-
 .../exporters/kube-controller-manager/servicemonitor.yaml | 2 +-
 .../rendered/exporters/kube-dns/service.yaml              | 2 +-
 .../rendered/exporters/kube-dns/servicemonitor.yaml       | 2 +-
 .../rendered/exporters/kube-etcd/service.yaml             | 2 +-
 .../rendered/exporters/kube-etcd/servicemonitor.yaml      | 2 +-
 .../rendered/exporters/kube-proxy/service.yaml            | 2 +-
 .../rendered/exporters/kube-proxy/servicemonitor.yaml     | 2 +-
 .../rendered/exporters/kube-scheduler/service.yaml        | 2 +-
 .../rendered/exporters/kube-scheduler/servicemonitor.yaml | 2 +-
 .../examples/prometheus-otel/rendered/hooks.yaml          | 2 +-
 charts/opentelemetry-kube-stack/templates/collector.yaml  | 4 ++--
 charts/opentelemetry-kube-stack/values.yaml               | 8 ++++----
 20 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/charts/opentelemetry-kube-stack/Chart.yaml b/charts/opentelemetry-kube-stack/Chart.yaml
index 511ab51a4..f9eef9c43 100644
--- a/charts/opentelemetry-kube-stack/Chart.yaml
+++ b/charts/opentelemetry-kube-stack/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-kube-stack
-version: 0.2.0
+version: 0.2.1
 description: |
   OpenTelemetry Quickstart chart for Kubernetes.
   Installs an operator and collector for an easy way to get started with Kubernetes observability.
diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml
index b94949c17..2c2fd03ab 100644
--- a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml
+++ b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml
@@ -5,7 +5,7 @@ kind: OpAMPBridge
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm    
 spec:
@@ -23,7 +23,7 @@ spec:
     ReportsRemoteConfig: true
     ReportsStatus: true
   replicas: 1
-  image: "ghcr.io/open-telemetry/opentelemetry-operator/operator-opamp-bridge:0.103.0"
+  image: "ghcr.io/open-telemetry/opentelemetry-operator/operator-opamp-bridge:0.107.0"
   upgradeStrategy: automatic
   securityContext:
     runAsNonRoot: true
diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml
index 06a94e2a7..e6cacba7c 100644
--- a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml
+++ b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml
@@ -6,7 +6,7 @@ metadata:
   name: example-cluster-stats
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm        
     opentelemetry.io/opamp-reporting: "true"
@@ -132,7 +132,6 @@ spec:
           receivers:
           - k8s_cluster
   replicas: 1
-  image: "otel/opentelemetry-collector-k8s:0.103.1"
   imagePullPolicy: IfNotPresent
   upgradeStrategy: automatic
   hostNetwork: false
@@ -189,7 +188,7 @@ metadata:
   name: example-daemon
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm        
     opentelemetry.io/opamp-reporting: "true"
@@ -586,7 +585,6 @@ spec:
           - batch
           receivers:
           - otlp
-  image: "otel/opentelemetry-collector-k8s:0.103.1"
   imagePullPolicy: IfNotPresent
   upgradeStrategy: automatic
   hostNetwork: false
diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml
index bc59e9625..e345ba81f 100644
--- a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml
+++ b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml
@@ -62,4 +62,4 @@ spec:
           - -c
           - |
             kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
-              -l helm.sh/chart=opentelemetry-kube-stack-0.2.0
+              -l helm.sh/chart=opentelemetry-kube-stack-0.2.1
diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml
index 65052aa61..0a09f48b3 100644
--- a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml
+++ b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml
@@ -5,7 +5,7 @@ kind: Instrumentation
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm    
 spec:
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml
index 9e8e4b2cb..4fa74d1aa 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml
@@ -6,7 +6,7 @@ metadata:
   name: example-daemon
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm        
 spec:
@@ -290,7 +290,6 @@ spec:
           - batch
           receivers:
           - otlp
-  image: "otel/opentelemetry-collector-k8s:0.103.1"
   imagePullPolicy: IfNotPresent
   upgradeStrategy: automatic
   hostNetwork: false
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml
index 327bf280a..8ea8f330e 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-apiserver
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
 spec:
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml
index 815f33f4e..89eb5fbe9 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-controller-manager
     jobLabel: kube-controller-manager
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
   namespace: kube-system
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml
index 544a115c9..8dec65903 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-controller-manager
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
 spec:
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml
index a995d22a8..b54d80201 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-dns
     jobLabel: kube-dns
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
   namespace: kube-system
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml
index 444c2a781..65255a882 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-dns
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
 spec:
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml
index bf622684b..3870b56b3 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-etcd
     jobLabel: kube-etcd
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
   namespace: kube-system
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml
index 34a4cafbf..c618bb95a 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-etcd
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
 spec:
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml
index 31965a4e8..481177174 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-proxy
     jobLabel: kube-proxy
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
   namespace: kube-system
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml
index 500ab205d..fb73a7be2 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-proxy
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
 spec:
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml
index 73e4a1516..35feeae79 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-scheduler
     jobLabel: kube-scheduler
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
   namespace: kube-system
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml
index e3cab2676..dde0fae79 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-scheduler
-    helm.sh/chart: opentelemetry-kube-stack-0.2.0
+    helm.sh/chart: opentelemetry-kube-stack-0.2.1
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
 spec:
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml
index bc59e9625..e345ba81f 100644
--- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml
+++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml
@@ -62,4 +62,4 @@ spec:
           - -c
           - |
             kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
-              -l helm.sh/chart=opentelemetry-kube-stack-0.2.0
+              -l helm.sh/chart=opentelemetry-kube-stack-0.2.1
diff --git a/charts/opentelemetry-kube-stack/templates/collector.yaml b/charts/opentelemetry-kube-stack/templates/collector.yaml
index 98908f608..6db58e8d5 100644
--- a/charts/opentelemetry-kube-stack/templates/collector.yaml
+++ b/charts/opentelemetry-kube-stack/templates/collector.yaml
@@ -30,8 +30,8 @@ spec:
   {{- end }}
   {{- if $collector.image.digest }}
   image: "{{ $collector.image.repository }}@{{ $collector.image.digest }}"
-  {{- else }}
-  image: "{{ $collector.image.repository }}:{{ $collector.image.tag | default $.Chart.AppVersion }}"
+  {{- else if $collector.image.tag }}
+  image: "{{ $collector.image.repository }}:{{ $collector.image.tag }}"
   {{- end }}
   imagePullPolicy: {{ $collector.image.pullPolicy }}
   upgradeStrategy: {{ $collector.upgradeStrategy }}
diff --git a/charts/opentelemetry-kube-stack/values.yaml b/charts/opentelemetry-kube-stack/values.yaml
index ab63ff236..d7e1d5017 100644
--- a/charts/opentelemetry-kube-stack/values.yaml
+++ b/charts/opentelemetry-kube-stack/values.yaml
@@ -90,8 +90,8 @@ defaultCRConfig:
     # If you want to use the core image `otel/opentelemetry-collector`, you also need to change `command.name` value to `otelcol`.
     repository: otel/opentelemetry-collector-k8s
     pullPolicy: IfNotPresent
-    # Overrides the image tag whose default is the chart appVersion.
-    tag: "0.103.1"
+    # By default, the version set for the collector will match the version of the operator being run.
+    tag: ""
     # When digest is set to a non-empty value, images will be pulled by digest (regardless of tag value).
     digest: ""
 
@@ -818,8 +818,8 @@ opAMPBridge:
   image:
     repository: ghcr.io/open-telemetry/opentelemetry-operator/operator-opamp-bridge
     pullPolicy: IfNotPresent
-    # Overrides the image tag whose default is the chart appVersion.
-    tag: "0.103.0"
+    # By default, the version set for the bridge will match the version of the operator being run.
+    tag: ""
     # When digest is set to a non-empty value, images will be pulled by digest (regardless of tag value).
     digest: ""