Fix target allocator cluster role binding when using a daemonset (#1294)

* fix role binding for TA * oop * bump thing --------- Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
open-telemetry · Aug 6, 2024 · 8973214 · 8973214
1 parent 0d9a5e6
commit 8973214
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 18 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.1.1
+version: 0.1.2
 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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm    
 spec:

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm        
     opentelemetry.io/opamp-reporting: "true"
@@ -189,7 +189,7 @@ metadata:
   name: example-daemon
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm        
     opentelemetry.io/opamp-reporting: "true"

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm    
 spec:

diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/clusterrole.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/clusterrole.yaml
@@ -122,3 +122,6 @@ subjects:
   # quirk of the Operator
   name: "example-daemon-collector"
   namespace: default
+- kind: ServiceAccount
+  name: example-daemon-targetallocator
+  namespace: default
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,7 +6,7 @@ metadata:
   name: example-daemon
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm        
 spec:

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm
 spec:

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm
   namespace: kube-system

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm
 spec:

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm
   namespace: kube-system

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm
 spec:

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm
   namespace: kube-system

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm
 spec:

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm
   namespace: kube-system

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm
 spec:

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm
   namespace: kube-system

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.1.1
+    helm.sh/chart: opentelemetry-kube-stack-0.1.2
     app.kubernetes.io/version: "0.105.0"
     app.kubernetes.io/managed-by: Helm
 spec:

diff --git a/charts/opentelemetry-kube-stack/templates/clusterrole.yaml b/charts/opentelemetry-kube-stack/templates/clusterrole.yaml
@@ -73,7 +73,7 @@ subjects:
   name: "{{ $fullname }}-collector"
 {{- end }}
   namespace: {{ $.Release.Namespace }}
-{{- if eq $collector.mode "statefulset" }}
+{{- if $collector.targetAllocator.enabled }}
 - kind: ServiceAccount
 {{- if $collector.targetAllocator.serviceAccount }}
   name: "{{ $collector.targetAllocator.serviceAccount }}"