Skip to content

Commit 45c7a2e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5773 from chrischdi/pr-clusterroleidentity-per-test
🌱 e2e: adjust templates to use AWSClusterRoleIdentities per Cluster
2 parents cf0fed0 + 8b060c8 commit 45c7a2e

File tree

9 files changed

+32
-32
lines changed

9 files changed

+32
-32
lines changed

‎templates/cluster-template-multitenancy-clusterclass.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ spec:
247247
- name: identityRef
248248
value:
249249
kind: AWSClusterRoleIdentity
250-
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
250+
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
251251
version: ${KUBERNETES_VERSION}
252252
workers:
253253
machineDeployments:
@@ -277,24 +277,24 @@ spec:
277277
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
278278
kind: AWSClusterRoleIdentity
279279
metadata:
280-
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
280+
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
281281
spec:
282282
allowedNamespaces: {}
283283
durationSeconds: 900
284284
roleARN: ${MULTI_TENANCY_JUMP_ROLE_ARN}
285-
sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session
285+
sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
286286
sourceIdentityRef:
287287
kind: AWSClusterControllerIdentity
288288
name: default
289289
---
290290
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
291291
kind: AWSClusterRoleIdentity
292292
metadata:
293-
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
293+
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
294294
spec:
295295
allowedNamespaces: {}
296296
roleARN: ${MULTI_TENANCY_NESTED_ROLE_ARN}
297-
sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session
297+
sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
298298
sourceIdentityRef:
299299
kind: AWSClusterRoleIdentity
300-
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
300+
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}

‎test/e2e/data/infrastructure-aws/withclusterclass/e2e_test_templates/cluster-template-nested-multitenancy-clusterclass.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
- name: identityRef
3232
value:
3333
kind: AWSClusterRoleIdentity
34-
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
34+
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
3535
version: ${KUBERNETES_VERSION}
3636
workers:
3737
machineDeployments:
@@ -87,27 +87,27 @@ spec:
8787
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
8888
kind: AWSClusterRoleIdentity
8989
metadata:
90-
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
90+
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
9191
spec:
9292
allowedNamespaces: {}
9393
durationSeconds: 900
9494
roleARN: ${MULTI_TENANCY_JUMP_ROLE_ARN}
95-
sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session
95+
sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
9696
sourceIdentityRef:
9797
kind: AWSClusterControllerIdentity
9898
name: default
9999
---
100100
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
101101
kind: AWSClusterRoleIdentity
102102
metadata:
103-
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
103+
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
104104
spec:
105105
allowedNamespaces: {}
106106
roleARN: ${MULTI_TENANCY_NESTED_ROLE_ARN}
107-
sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session
107+
sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
108108
sourceIdentityRef:
109109
kind: AWSClusterRoleIdentity
110-
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
110+
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
111111
---
112112
apiVersion: v1
113113
data:

‎test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/cluster-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
- name: identityRef
3838
value:
3939
kind: AWSClusterRoleIdentity
40-
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}"
40+
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
4141
---
4242
apiVersion: v1
4343
data: ${CNI_RESOURCES}

‎test/e2e/data/infrastructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/role.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
33
kind: AWSClusterRoleIdentity
44
metadata:
5-
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}"
5+
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
66
spec:
77
roleARN: "${MULTI_TENANCY_JUMP_ROLE_ARN}"
88
durationSeconds: 900
9-
sessionName: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session"
9+
sessionName: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
1010
sourceIdentityRef:
1111
kind: AWSClusterControllerIdentity
1212
name: "default"
@@ -15,11 +15,11 @@ spec:
1515
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
1616
kind: AWSClusterRoleIdentity
1717
metadata:
18-
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}"
18+
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
1919
spec:
2020
roleARN: "${MULTI_TENANCY_NESTED_ROLE_ARN}"
21-
sessionName: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session"
21+
sessionName: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
2222
sourceIdentityRef:
2323
kind: AWSClusterRoleIdentity
24-
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}"
24+
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
2525
allowedNamespaces: {}

‎test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-nested-multitenancy.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
enabled: true
3030
identityRef:
3131
kind: AWSClusterRoleIdentity
32-
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
32+
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
3333
network:
3434
vpc:
3535
availabilityZoneUsageLimit: 1
@@ -1165,24 +1165,24 @@ metadata:
11651165
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
11661166
kind: AWSClusterRoleIdentity
11671167
metadata:
1168-
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
1168+
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
11691169
spec:
11701170
allowedNamespaces: {}
11711171
durationSeconds: 900
11721172
roleARN: ${MULTI_TENANCY_JUMP_ROLE_ARN}
1173-
sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session
1173+
sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
11741174
sourceIdentityRef:
11751175
kind: AWSClusterControllerIdentity
11761176
name: default
11771177
---
11781178
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
11791179
kind: AWSClusterRoleIdentity
11801180
metadata:
1181-
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
1181+
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
11821182
spec:
11831183
allowedNamespaces: {}
11841184
roleARN: ${MULTI_TENANCY_NESTED_ROLE_ARN}
1185-
sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session
1185+
sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
11861186
sourceIdentityRef:
11871187
kind: AWSClusterRoleIdentity
1188-
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
1188+
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}

‎test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-simple-multitenancy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ spec:
11601160
allowedNamespaces: {}
11611161
durationSeconds: 900
11621162
roleARN: ${MULTI_TENANCY_SIMPLE_ROLE_ARN}
1163-
sessionName: ${MULTI_TENANCY_SIMPLE_IDENTITY_NAME}-session
1163+
sessionName: ${MULTI_TENANCY_SIMPLE_IDENTITY_NAME}
11641164
sourceIdentityRef:
11651165
kind: AWSClusterControllerIdentity
11661166
name: default

‎test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/patches/role-identity.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ metadata:
66
spec:
77
identityRef:
88
kind: AWSClusterRoleIdentity
9-
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}"
9+
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"

‎test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/role.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
33
kind: AWSClusterRoleIdentity
44
metadata:
5-
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}"
5+
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
66
spec:
77
roleARN: "${MULTI_TENANCY_JUMP_ROLE_ARN}"
88
durationSeconds: 900
9-
sessionName: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session"
9+
sessionName: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
1010
sourceIdentityRef:
1111
kind: AWSClusterControllerIdentity
1212
name: "default"
@@ -15,11 +15,11 @@ spec:
1515
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
1616
kind: AWSClusterRoleIdentity
1717
metadata:
18-
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}"
18+
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
1919
spec:
2020
roleARN: "${MULTI_TENANCY_NESTED_ROLE_ARN}"
21-
sessionName: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session"
21+
sessionName: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
2222
sourceIdentityRef:
2323
kind: AWSClusterRoleIdentity
24-
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}"
24+
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
2525
allowedNamespaces: {}

‎test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/simple-multitenancy/role.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
spec:
77
roleARN: "${MULTI_TENANCY_SIMPLE_ROLE_ARN}"
88
durationSeconds: 900
9-
sessionName: "${MULTI_TENANCY_SIMPLE_IDENTITY_NAME}-session"
9+
sessionName: "${MULTI_TENANCY_SIMPLE_IDENTITY_NAME}"
1010
sourceIdentityRef:
1111
kind: AWSClusterControllerIdentity
1212
name: "default"

0 commit comments

Comments
 (0)