Fix collector label addition issue (open-telemetry#1427)

* fix the collector label addition failure * uptick the version * remove extra space * adding a label for demonstration
rohanarora · Dec 2, 2024 · 73159fb · 73159fb
1 parent ea6c30f
commit 73159fb
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 21 deletions.
diff --git 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.3.3
+version: 0.3.4
 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
@@ -5,7 +5,7 @@ kind: OpAMPBridge
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"    

diff --git 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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"        
@@ -189,7 +189,7 @@ metadata:
   name: example-daemon
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"        

diff --git 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.3.3
+              -l helm.sh/chart=opentelemetry-kube-stack-0.3.4
diff --git 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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"    

diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml
@@ -6,10 +6,11 @@ metadata:
   name: example-daemon
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
-    release: "example"        
+    release: "example"    
+    otel-collector-type: daemonset-example    
 spec:
   managementState: managed
   mode: daemonset

diff --git a/...ube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml b/...ube-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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...be-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml b/...be-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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...k/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml b/...k/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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...pentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml b/...pentelemetry-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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...metry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml b/...metry-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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...entelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml b/...entelemetry-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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...etry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml b/...etry-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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...ntelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml b/...ntelemetry-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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...try-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml b/...try-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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...emetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml b/...emetry-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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml b/...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.3.3
+    helm.sh/chart: opentelemetry-kube-stack-0.3.4
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git 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.3.3
+              -l helm.sh/chart=opentelemetry-kube-stack-0.3.4
diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/values.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/values.yaml
@@ -4,6 +4,9 @@ collectors:
     enabled: true
     # because this file is inside the examples folder, we need to reference it directly.
     scrape_configs_file: "examples/prometheus-otel/kubelet_scrape_configs.yaml"
+    # Adding an additional label for this collctor.
+    labels:
+      otel-collector-type: daemonset-example
     targetAllocator:
       enabled: true
       image: ghcr.io/open-telemetry/opentelemetry-operator/target-allocator:main

diff --git a/charts/opentelemetry-kube-stack/templates/_helpers.tpl b/charts/opentelemetry-kube-stack/templates/_helpers.tpl
@@ -48,7 +48,7 @@ Print a map of key values in a YAML block. This is useful for labels and annotat
 {{- define "opentelemetry-kube-stack.renderkv" -}}
 {{- with . -}}
 {{- range $key, $value := . -}}
-{{- printf "%s: %s" $key $value }}
+{{- printf "\n%s: %s" $key $value }}
 {{- end -}}
 {{- end -}}
 {{- end }}