Merge branch 'main' into chainsaw-3

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
open-telemetry · Feb 16, 2024 · 1cfc4b2 · 1cfc4b2
2 parents 3da4895 + d190a3e
commit 1cfc4b2
Show file tree

Hide file tree

Showing 13 changed files with 115 additions and 77 deletions.
diff --git a/autoinstrumentation/java/version.txt b/autoinstrumentation/java/version.txt
@@ -1 +1 @@
-1.32.1
+2.1.0
diff --git a/tests/e2e-prometheuscr/create-sm-prometheus-exporters/08-install.yaml b/tests/e2e-prometheuscr/create-sm-prometheus-exporters/08-install.yaml
@@ -64,6 +64,19 @@ rules:
   verbs:
   - get
 ---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: simplest-targetallocator-create-sm-prometheus
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: create-sm-prometheus
+subjects:
+- kind: ServiceAccount
+  name: ta
+  namespace: create-sm-prometheus
+---
 apiVersion: opentelemetry.io/v1alpha1
 kind: OpenTelemetryCollector
 metadata:

diff --git a/tests/e2e-prometheuscr/create-sm-prometheus-exporters/chainsaw-test.yaml b/tests/e2e-prometheuscr/create-sm-prometheus-exporters/chainsaw-test.yaml
@@ -60,14 +60,6 @@ spec:
         file: 07-error.yaml
   - name: step-08
     try:
-    - command:
-        args:
-        - create
-        - clusterrolebinding
-        - simplest-targetallocator-create-sm-prometheus
-        - --clusterrole=create-sm-prometheus
-        - --serviceaccount=create-sm-prometheus:ta
-        entrypoint: kubectl
     - apply:
         file: 08-install.yaml
     - assert:

diff --git a/tests/e2e-targetallocator/targetallocator-features/00-install.yaml b/tests/e2e-targetallocator/targetallocator-features/00-install.yaml
@@ -27,6 +27,19 @@ rules:
   - list
   - watch
 ---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: (join('-', ['default-view', $namespace]))
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: targetallocator-features
+subjects:
+- kind: ServiceAccount
+  name: ta
+  namespace: ($namespace)
+---
 apiVersion: opentelemetry.io/v1alpha1
 kind: OpenTelemetryCollector
 metadata:

diff --git a/tests/e2e-targetallocator/targetallocator-features/chainsaw-test.yaml b/tests/e2e-targetallocator/targetallocator-features/chainsaw-test.yaml
@@ -16,16 +16,6 @@ spec:
         selector: app.kubernetes.io/component=opentelemetry-targetallocator
     name: step-00
     try:
-    - command:
-        args:
-        - -n
-        - $NAMESPACE
-        - create
-        - clusterrolebinding
-        - default-view-$NAMESPACE
-        - --clusterrole=targetallocator-features
-        - --serviceaccount=$NAMESPACE:ta
-        entrypoint: kubectl
     - apply:
         file: 00-install.yaml
     - assert:

diff --git a/tests/e2e-targetallocator/targetallocator-kubernetessd/00-install.yaml b/tests/e2e-targetallocator/targetallocator-kubernetessd/00-install.yaml
@@ -92,6 +92,32 @@ rules:
   verbs:
   - get
 ---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: (join('-', ['ta', $namespace]))
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: targetallocator-kubernetessd
+subjects:
+- kind: ServiceAccount
+  name: ta
+  namespace: ($namespace)
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: (join('-', ['collector', $namespace]))
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: collector-kubernetessd
+subjects:
+- kind: ServiceAccount
+  name: collector
+  namespace: ($namespace)
+---
 apiVersion: opentelemetry.io/v1alpha1
 kind: OpenTelemetryCollector
 metadata:

diff --git a/tests/e2e-targetallocator/targetallocator-kubernetessd/chainsaw-test.yaml b/tests/e2e-targetallocator/targetallocator-kubernetessd/chainsaw-test.yaml
@@ -6,33 +6,17 @@ metadata:
   name: targetallocator-kubernetessd
 spec:
   steps:
-  - catch:
-    - script:
-        content: ./tests/e2e/smoke-daemonset/check-daemonset.sh
-    - podLogs:
-        selector: app.kubernetes.io/managed-by=opentelemetry-operator
-    name: step-00
+  - name: step-00
     try:
-    - command:
-        args:
-        - create
-        - clusterrolebinding
-        - ta-$NAMESPACE
-        - --clusterrole=targetallocator-kubernetessd
-        - --serviceaccount=$NAMESPACE:ta
-        entrypoint: kubectl
-    - command:
-        args:
-        - create
-        - clusterrolebinding
-        - collector-$NAMESPACE
-        - --clusterrole=collector-kubernetessd
-        - --serviceaccount=$NAMESPACE:collector
-        entrypoint: kubectl
     - apply:
         file: 00-install.yaml
     - assert:
         file: 00-assert.yaml
+    catch:
+    - script:
+        content: ./tests/e2e/smoke-daemonset/check-daemonset.sh
+    - podLogs:
+        selector: app.kubernetes.io/managed-by=opentelemetry-operator
   - name: step-01
     try:
     - apply:

diff --git a/tests/e2e-targetallocator/targetallocator-prometheuscr/00-install.yaml b/tests/e2e-targetallocator/targetallocator-prometheuscr/00-install.yaml
@@ -101,6 +101,32 @@ rules:
   verbs:
   - get
 ---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: (join('-', ['ta', $namespace]))
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: targetallocator-prometheuscr
+subjects:
+- kind: ServiceAccount
+  name: ta
+  namespace: ($namespace)
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: (join('-', ['collector', $namespace]))
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: collector-prometheuscr
+subjects:
+- kind: ServiceAccount
+  name: collector
+  namespace: ($namespace)
+---
 apiVersion: opentelemetry.io/v1alpha1
 kind: OpenTelemetryCollector
 metadata:

diff --git a/tests/e2e-targetallocator/targetallocator-prometheuscr/chainsaw-test.yaml b/tests/e2e-targetallocator/targetallocator-prometheuscr/chainsaw-test.yaml
@@ -6,31 +6,15 @@ metadata:
   name: targetallocator-prometheuscr
 spec:
   steps:
-  - catch:
-    - podLogs:
-        selector: app.kubernetes.io/managed-by=opentelemetry-operator
-    name: step-00
+  - name: step-00
     try:
-    - command:
-        args:
-        - create
-        - clusterrolebinding
-        - ta-$NAMESPACE
-        - --clusterrole=targetallocator-prometheuscr
-        - --serviceaccount=$NAMESPACE:ta
-        entrypoint: kubectl
-    - command:
-        args:
-        - create
-        - clusterrolebinding
-        - collector-$NAMESPACE
-        - --clusterrole=collector-prometheuscr
-        - --serviceaccount=$NAMESPACE:collector
-        entrypoint: kubectl
     - apply:
         file: 00-install.yaml
     - assert:
         file: 00-assert.yaml
+    catch:
+    - podLogs:
+        selector: app.kubernetes.io/managed-by=opentelemetry-operator
   - name: step-01
     try:
     - apply:

diff --git a/tests/e2e/prometheus-config-validation/00-promreceiver-allocatorconfig.yaml b/tests/e2e/prometheus-config-validation/00-promreceiver-allocatorconfig.yaml
@@ -19,6 +19,19 @@ rules:
   - list
   - watch
 ---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: (join('-', ['default-view', $namespace]))
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: promreceiver-allocatorconfig
+subjects:
+- kind: ServiceAccount
+  name: ta
+  namespace: ($namespace)
+---
 apiVersion: opentelemetry.io/v1alpha1
 kind: OpenTelemetryCollector
 metadata:

diff --git a/tests/e2e/prometheus-config-validation/chainsaw-test.yaml b/tests/e2e/prometheus-config-validation/chainsaw-test.yaml
@@ -8,12 +8,6 @@ spec:
   steps:
   - name: step-00
     try:
-    - script:
-        content: |
-          kubectl -n $NAMESPACE \
-          create clusterrolebinding default-view-$NAMESPACE \
-          --clusterrole=promreceiver-allocatorconfig \
-          --serviceaccount=$NAMESPACE:ta
     - apply:
         file: 00-promreceiver-allocatorconfig.yaml
     - assert:

diff --git a/tests/e2e/smoke-targetallocator/00-install.yaml b/tests/e2e/smoke-targetallocator/00-install.yaml
@@ -19,6 +19,19 @@ rules:
   - list
   - watch
 ---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: (join('-', ['default-view', $namespace]))
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: smoke-targetallocator
+subjects:
+- kind: ServiceAccount
+  name: ta
+  namespace: ($namespace)
+---
 apiVersion: opentelemetry.io/v1alpha1
 kind: OpenTelemetryCollector
 metadata:

diff --git a/tests/e2e/smoke-targetallocator/chainsaw-test.yaml b/tests/e2e/smoke-targetallocator/chainsaw-test.yaml
@@ -11,16 +11,6 @@ spec:
         selector: app.kubernetes.io/component=opentelemetry-targetallocator
     name: step-00
     try:
-    - command:
-        args:
-        - -n
-        - $NAMESPACE
-        - create
-        - clusterrolebinding
-        - default-view-$NAMESPACE
-        - --clusterrole=smoke-targetallocator
-        - --serviceaccount=$NAMESPACE:ta
-        entrypoint: kubectl
     - apply:
         file: 00-install.yaml
     - assert: