Merge branch 'main' into otel-kube-stack-helpers-scrapelimits

open-telemetry · Dec 7, 2024 · a10ac4c · a10ac4c
2 parents 7d8431c + 11361d7
commit a10ac4c
Show file tree

Hide file tree

Showing 26 changed files with 126 additions and 80 deletions.
diff --git a/.github/workflows/operator-test.yaml b/.github/workflows/operator-test.yaml
@@ -58,7 +58,8 @@ jobs:
         run: |
           helm install --namespace=opentelemetry-operator-system --create-namespace my-opentelemetry-operator ./charts/opentelemetry-operator \
             --set 'manager.extraArgs[0]="--enable-go-instrumentation"' \
-            --set "manager.collectorImage.repository=otel/opentelemetry-collector-k8s"
+            --set "manager.collectorImage.repository=otel/opentelemetry-collector-k8s" \
+            --set "manager.podLabels.control-plane=controller-manager"
           kubectl wait --timeout=5m --for=condition=available deployment my-opentelemetry-operator -n opentelemetry-operator-system
 
       - name: Run e2e tests
@@ -111,6 +112,7 @@ jobs:
           helm install --namespace=opentelemetry-operator-system --create-namespace my-opentelemetry-operator ./charts/opentelemetry-operator \
             --set 'manager.extraArgs[0]="--enable-go-instrumentation"' \
             --set "manager.collectorImage.repository=otel/opentelemetry-collector-k8s" \
+            --set "manager.podLabels.control-plane=controller-manager" \
             --set "admissionWebhooks.certManager.enabled=false"
           kubectl wait --timeout=5m --for=condition=available deployment my-opentelemetry-operator -n opentelemetry-operator-system
 

diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-operator
-version: 0.74.3
+version: 0.75.0
 description: OpenTelemetry Operator Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/
@@ -12,4 +12,4 @@ maintainers:
   - name: jaronoff97
   - name: TylerHelmuth
 icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
-appVersion: 0.113.0
+appVersion: 0.114.1
diff --git a/...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml b/...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml
@@ -6,9 +6,9 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: webhook
@@ -90,9 +90,9 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: webhook

diff --git a/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml b/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml
@@ -4,9 +4,9 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: webhook
@@ -29,9 +29,9 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: webhook

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml
@@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
@@ -222,9 +222,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
@@ -240,9 +240,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml
@@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
@@ -25,9 +25,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager

diff --git a/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml b/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
@@ -4,9 +4,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
@@ -33,13 +33,13 @@ spec:
             - --enable-leader-election
             - --health-probe-addr=:8081
             - --webhook-port=9443
-            - --collector-image=otel/opentelemetry-collector-k8s:0.113.0
+            - --collector-image=otel/opentelemetry-collector-k8s:0.114.0
           command:
             - /manager
           env:
             - name: ENABLE_WEBHOOKS
               value: "true"
-          image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.113.0"
+          image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.114.1"
           name: manager
           ports:
             - containerPort: 8080

diff --git a/charts/opentelemetry-operator/examples/default/rendered/role.yaml b/charts/opentelemetry-operator/examples/default/rendered/role.yaml
@@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager

diff --git a/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml
@@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager

diff --git a/charts/opentelemetry-operator/examples/default/rendered/service.yaml b/charts/opentelemetry-operator/examples/default/rendered/service.yaml
@@ -4,9 +4,9 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
@@ -31,9 +31,9 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager

diff --git a/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml
@@ -6,9 +6,9 @@ metadata:
   name: opentelemetry-operator
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
diff --git a/...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml b/...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml
@@ -6,9 +6,9 @@ metadata:
   name: "example-opentelemetry-operator-cert-manager"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: webhook

diff --git a/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml
@@ -6,9 +6,9 @@ metadata:
   name: "example-opentelemetry-operator-metrics"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
@@ -43,9 +43,9 @@ metadata:
   name: "example-opentelemetry-operator-webhook"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager

diff --git a/...xamples/feature-gates/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml b/...xamples/feature-gates/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml
@@ -6,9 +6,9 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: webhook
@@ -90,9 +90,9 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: webhook

diff --git a/charts/opentelemetry-operator/examples/feature-gates/rendered/certmanager.yaml b/charts/opentelemetry-operator/examples/feature-gates/rendered/certmanager.yaml
@@ -4,9 +4,9 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: webhook
@@ -29,9 +29,9 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: webhook

diff --git a/charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrole.yaml b/charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrole.yaml
@@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
@@ -216,6 +216,26 @@ rules:
       - patch
       - update
       - watch
+  - apiGroups:
+    - opentelemetry.io
+    resources:
+      - targetallocators
+    verbs:
+      - create
+      - delete
+      - get
+      - list
+      - patch
+      - update
+      - watch
+  - apiGroups:
+    - opentelemetry.io
+    resources:
+    - targetallocators/status
+    verbs:
+    - get
+    - patch
+    - update
   - apiGroups:
       - cert-manager.io
     resources:
@@ -236,9 +256,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
@@ -254,9 +274,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager

diff --git a/charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrolebinding.yaml b/charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrolebinding.yaml
@@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager
@@ -25,9 +25,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.74.3
+    helm.sh/chart: opentelemetry-operator-0.75.0
     app.kubernetes.io/name: opentelemetry-operator
-    app.kubernetes.io/version: "0.113.0"
+    app.kubernetes.io/version: "0.114.1"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/instance: example
     app.kubernetes.io/component: controller-manager