Skip to content

Commit d9d0c5b

Browse files
committed
Merge branch 'main' into chainsaw-3
Signed-off-by: Charles-Edouard Brétéché <[email protected]>
2 parents 3da4895 + d190a3e commit d9d0c5b

File tree

3 files changed

+31
-21
lines changed

3 files changed

+31
-21
lines changed

autoinstrumentation/java/version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.32.1
1+
2.1.0

tests/e2e-targetallocator/targetallocator-prometheuscr/00-install.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,32 @@ rules:
101101
verbs:
102102
- get
103103
---
104+
apiVersion: rbac.authorization.k8s.io/v1
105+
kind: ClusterRoleBinding
106+
metadata:
107+
name: (join('-', ['ta', $namespace]))
108+
roleRef:
109+
apiGroup: rbac.authorization.k8s.io
110+
kind: ClusterRole
111+
name: targetallocator-prometheuscr
112+
subjects:
113+
- kind: ServiceAccount
114+
name: ta
115+
namespace: ($namespace)
116+
---
117+
apiVersion: rbac.authorization.k8s.io/v1
118+
kind: ClusterRoleBinding
119+
metadata:
120+
name: (join('-', ['collector', $namespace]))
121+
roleRef:
122+
apiGroup: rbac.authorization.k8s.io
123+
kind: ClusterRole
124+
name: collector-prometheuscr
125+
subjects:
126+
- kind: ServiceAccount
127+
name: collector
128+
namespace: ($namespace)
129+
---
104130
apiVersion: opentelemetry.io/v1alpha1
105131
kind: OpenTelemetryCollector
106132
metadata:

tests/e2e-targetallocator/targetallocator-prometheuscr/chainsaw-test.yaml

+4-20
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,15 @@ metadata:
66
name: targetallocator-prometheuscr
77
spec:
88
steps:
9-
- catch:
10-
- podLogs:
11-
selector: app.kubernetes.io/managed-by=opentelemetry-operator
12-
name: step-00
9+
- name: step-00
1310
try:
14-
- command:
15-
args:
16-
- create
17-
- clusterrolebinding
18-
- ta-$NAMESPACE
19-
- --clusterrole=targetallocator-prometheuscr
20-
- --serviceaccount=$NAMESPACE:ta
21-
entrypoint: kubectl
22-
- command:
23-
args:
24-
- create
25-
- clusterrolebinding
26-
- collector-$NAMESPACE
27-
- --clusterrole=collector-prometheuscr
28-
- --serviceaccount=$NAMESPACE:collector
29-
entrypoint: kubectl
3011
- apply:
3112
file: 00-install.yaml
3213
- assert:
3314
file: 00-assert.yaml
15+
catch:
16+
- podLogs:
17+
selector: app.kubernetes.io/managed-by=opentelemetry-operator
3418
- name: step-01
3519
try:
3620
- apply:

0 commit comments

Comments
 (0)