fix role binding for TA

open-telemetry · Aug 2, 2024 · e9d93fc · e9d93fc
1 parent 52b517c
commit e9d93fc
Show file tree

Hide file tree

Showing 19 changed files with 114 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.0
+version: 0.1.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
@@ -5,7 +5,7 @@ kind: OpAMPBridge
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.1.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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.0
+    helm.sh/chart: opentelemetry-kube-stack-0.1.1
     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 }}"

diff --git a/fun-values.yaml b/fun-values.yaml
@@ -0,0 +1,93 @@
+clusterName: demo
+opentelemetry-operator:
+  enabled: true
+defaultCRConfig:
+  image:
+    repository: jaronoff/contrib
+    tag: "v05"
+collectors:
+  daemon:
+    env:
+      - name: LS_TOKEN
+        valueFrom:
+          secretKeyRef:
+            key: LS_TOKEN
+            name: otel-collector-secret
+    config:
+      extensions:
+        healthcheckv2:
+          use_v2: true
+          component_health:
+            include_permanent_errors: false
+            include_recoverable_errors: true
+            recovery_duration: 5m
+          http:
+            endpoint: "0.0.0.0:13133"
+            status:
+              enabled: true
+              path: "/health/status"
+            config:
+              enabled: true
+              path: "/health/config"
+          grpc:
+            endpoint: "0.0.0.0:13132"
+            transport: "tcp"
+      exporters:
+        otlp:
+          endpoint: ingest.lightstep.com:443
+          headers:
+            lightstep-access-token: ${LS_TOKEN}
+      service:
+        extensions: [healthcheckv2]
+        pipelines:
+          metrics:
+            exporters: [otlp]
+          traces:
+            exporters: [otlp]
+          logs:
+            exporters: [otlp]
+  cluster:
+    env:
+      - name: LS_TOKEN
+        valueFrom:
+          secretKeyRef:
+            key: LS_TOKEN
+            name: otel-collector-secret
+    config:
+      exporters:
+        otlp:
+          endpoint: ingest.lightstep.com:443
+          headers:
+            lightstep-access-token: ${LS_TOKEN}
+      service:
+        pipelines:
+          metrics:
+            exporters: [otlp]
+instrumentation:
+  enabled: true
+  env:
+    - name: OTEL_K8S_NODE_NAME
+      valueFrom:
+        fieldRef:
+          fieldPath: spec.nodeName
+  exporter:
+    endpoint: http://${OTEL_K8S_NODE_NAME}:4317
+  python:
+    env:
+      - name: OTEL_EXPORTER_OTLP_ENDPOINT
+        value: http://${OTEL_K8S_NODE_NAME}:4318
+opAMPBridge:
+  enabled: true
+  addReportingLabel: true
+  image:
+    tag: "0.104.0"
+  endpoint: https://opamp.lightstep.com/v1/opamp
+  headers:
+    "Authorization": "bearer ${LS_OPAMP_API_KEY}"
+  env:
+    - name: LS_OPAMP_API_KEY
+      valueFrom:
+        secretKeyRef:
+          key: LS_OPAMP_API_KEY
+          name: otel-opamp-bridge-secret
+          optional: true