Skip to content

Commit b32c855

Browse files
authored
Ensure unique names for ClusterRoles in e2e tests (#2625)
1 parent 822a24f commit b32c855

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

tests/e2e-prometheuscr/create-sm-prometheus-exporters/08-install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ automountServiceAccountToken: true
88
apiVersion: rbac.authorization.k8s.io/v1
99
kind: ClusterRole
1010
metadata:
11-
name: ta
11+
name: create-sm-prometheus
1212
rules:
1313
- apiGroups: [""]
1414
resources:
@@ -60,7 +60,7 @@ rules:
6060
apiVersion: kuttl.dev/v1beta1
6161
kind: TestStep
6262
commands:
63-
- command: kubectl create clusterrolebinding simplest-targetallocator-create-sm-prometheus --clusterrole=ta --serviceaccount=create-sm-prometheus:ta
63+
- command: kubectl create clusterrolebinding simplest-targetallocator-create-sm-prometheus --clusterrole=create-sm-prometheus --serviceaccount=create-sm-prometheus:ta
6464
---
6565
apiVersion: opentelemetry.io/v1alpha1
6666
kind: OpenTelemetryCollector

tests/e2e/prometheus-config-validation/00-promreceiver-allocatorconfig.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ automountServiceAccountToken: true
77
apiVersion: rbac.authorization.k8s.io/v1
88
kind: ClusterRole
99
metadata:
10-
name: pod-view
10+
name: promreceiver-allocatorconfig
1111
rules:
1212
- apiGroups: [""]
1313
resources: [ "pods", "namespaces" ]
@@ -16,7 +16,7 @@ rules:
1616
apiVersion: kuttl.dev/v1beta1
1717
kind: TestStep
1818
commands:
19-
- command: kubectl -n $NAMESPACE create clusterrolebinding default-view-$NAMESPACE --clusterrole=pod-view --serviceaccount=$NAMESPACE:ta
19+
- command: kubectl -n $NAMESPACE create clusterrolebinding default-view-$NAMESPACE --clusterrole=promreceiver-allocatorconfig --serviceaccount=$NAMESPACE:ta
2020
---
2121
apiVersion: opentelemetry.io/v1alpha1
2222
kind: OpenTelemetryCollector

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ automountServiceAccountToken: true
77
apiVersion: rbac.authorization.k8s.io/v1
88
kind: ClusterRole
99
metadata:
10-
name: pod-view
10+
name: smoke-targetallocator
1111
rules:
1212
- apiGroups: [""]
1313
resources: [ "pods", "namespaces" ]
@@ -16,7 +16,7 @@ rules:
1616
apiVersion: kuttl.dev/v1beta1
1717
kind: TestStep
1818
commands:
19-
- command: kubectl -n $NAMESPACE create clusterrolebinding default-view-$NAMESPACE --clusterrole=pod-view --serviceaccount=$NAMESPACE:ta
19+
- command: kubectl -n $NAMESPACE create clusterrolebinding default-view-$NAMESPACE --clusterrole=smoke-targetallocator --serviceaccount=$NAMESPACE:ta
2020
---
2121
apiVersion: opentelemetry.io/v1alpha1
2222
kind: OpenTelemetryCollector

0 commit comments

Comments
 (0)