Skip to content

[release-2.9] 🌱 e2e: adjust templates to use AWSClusterRoleIdentities per Cluster #5776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 1, 2025
+32 −32
Merged

[release-2.9] 🌱 e2e: adjust templates to use AWSClusterRoleIdentities per Cluster #5776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions templates/cluster-template-multitenancy-clusterclass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ spec:
- name: identityRef
value:
kind: AWSClusterRoleIdentity
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
version: ${KUBERNETES_VERSION}
workers:
machineDeployments:
Expand Down Expand Up @@ -277,24 +277,24 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: AWSClusterRoleIdentity
metadata:
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
spec:
allowedNamespaces: {}
durationSeconds: 900
roleARN: ${MULTI_TENANCY_JUMP_ROLE_ARN}
sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session
sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
sourceIdentityRef:
kind: AWSClusterControllerIdentity
name: default
---
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: AWSClusterRoleIdentity
metadata:
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
spec:
allowedNamespaces: {}
roleARN: ${MULTI_TENANCY_NESTED_ROLE_ARN}
sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session
sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
sourceIdentityRef:
kind: AWSClusterRoleIdentity
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
12 changes: 6 additions & 6 deletions ...ithclusterclass/e2e_test_templates/cluster-template-nested-multitenancy-clusterclass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
- name: identityRef
value:
kind: AWSClusterRoleIdentity
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
version: ${KUBERNETES_VERSION}
workers:
machineDeployments:
Expand Down Expand Up @@ -87,27 +87,27 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: AWSClusterRoleIdentity
metadata:
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
spec:
allowedNamespaces: {}
durationSeconds: 900
roleARN: ${MULTI_TENANCY_JUMP_ROLE_ARN}
sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session
sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
sourceIdentityRef:
kind: AWSClusterControllerIdentity
name: default
---
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: AWSClusterRoleIdentity
metadata:
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
spec:
allowedNamespaces: {}
roleARN: ${MULTI_TENANCY_NESTED_ROLE_ARN}
sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session
sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
sourceIdentityRef:
kind: AWSClusterRoleIdentity
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
---
apiVersion: v1
data:
Expand Down
2 changes: 1 addition & 1 deletion ...withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/cluster-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
- name: identityRef
value:
kind: AWSClusterRoleIdentity
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}"
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
---
apiVersion: v1
data: ${CNI_RESOURCES}
Expand Down
10 changes: 5 additions & 5 deletions ...ructure-aws/withclusterclass/kustomize_sources/nested-multitenancy-clusterclass/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: AWSClusterRoleIdentity
metadata:
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}"
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
spec:
roleARN: "${MULTI_TENANCY_JUMP_ROLE_ARN}"
durationSeconds: 900
sessionName: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session"
sessionName: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
sourceIdentityRef:
kind: AWSClusterControllerIdentity
name: "default"
Expand All @@ -15,11 +15,11 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: AWSClusterRoleIdentity
metadata:
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}"
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
spec:
roleARN: "${MULTI_TENANCY_NESTED_ROLE_ARN}"
sessionName: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session"
sessionName: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
sourceIdentityRef:
kind: AWSClusterRoleIdentity
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}"
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
allowedNamespaces: {}
12 changes: 6 additions & 6 deletions ...ture-aws/withoutclusterclass/e2e_test_templates/cluster-template-nested-multitenancy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
enabled: true
identityRef:
kind: AWSClusterRoleIdentity
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
network:
vpc:
availabilityZoneUsageLimit: 1
Expand Down Expand Up @@ -1165,24 +1165,24 @@ metadata:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: AWSClusterRoleIdentity
metadata:
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
spec:
allowedNamespaces: {}
durationSeconds: 900
roleARN: ${MULTI_TENANCY_JUMP_ROLE_ARN}
sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session
sessionName: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
sourceIdentityRef:
kind: AWSClusterControllerIdentity
name: default
---
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: AWSClusterRoleIdentity
metadata:
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}
name: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
spec:
allowedNamespaces: {}
roleARN: ${MULTI_TENANCY_NESTED_ROLE_ARN}
sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session
sessionName: ${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}
sourceIdentityRef:
kind: AWSClusterRoleIdentity
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}
name: ${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}
2 changes: 1 addition & 1 deletion ...ture-aws/withoutclusterclass/e2e_test_templates/cluster-template-simple-multitenancy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,7 @@ spec:
allowedNamespaces: {}
durationSeconds: 900
roleARN: ${MULTI_TENANCY_SIMPLE_ROLE_ARN}
sessionName: ${MULTI_TENANCY_SIMPLE_IDENTITY_NAME}-session
sessionName: ${MULTI_TENANCY_SIMPLE_IDENTITY_NAME}
sourceIdentityRef:
kind: AWSClusterControllerIdentity
name: default
2 changes: 1 addition & 1 deletion ...-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/patches/role-identity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ metadata:
spec:
identityRef:
kind: AWSClusterRoleIdentity
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}"
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
10 changes: 5 additions & 5 deletions ...ta/infrastructure-aws/withoutclusterclass/kustomize_sources/nested-multitenancy/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: AWSClusterRoleIdentity
metadata:
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}"
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
spec:
roleARN: "${MULTI_TENANCY_JUMP_ROLE_ARN}"
durationSeconds: 900
sessionName: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-session"
sessionName: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
sourceIdentityRef:
kind: AWSClusterControllerIdentity
name: "default"
Expand All @@ -15,11 +15,11 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: AWSClusterRoleIdentity
metadata:
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}"
name: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
spec:
roleARN: "${MULTI_TENANCY_NESTED_ROLE_ARN}"
sessionName: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-session"
sessionName: "${MULTI_TENANCY_NESTED_IDENTITY_NAME}-${CLUSTER_NAME}"
sourceIdentityRef:
kind: AWSClusterRoleIdentity
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}"
name: "${MULTI_TENANCY_JUMP_IDENTITY_NAME}-${CLUSTER_NAME}"
allowedNamespaces: {}
2 changes: 1 addition & 1 deletion ...ta/infrastructure-aws/withoutclusterclass/kustomize_sources/simple-multitenancy/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
roleARN: "${MULTI_TENANCY_SIMPLE_ROLE_ARN}"
durationSeconds: 900
sessionName: "${MULTI_TENANCY_SIMPLE_IDENTITY_NAME}-session"
sessionName: "${MULTI_TENANCY_SIMPLE_IDENTITY_NAME}"
sourceIdentityRef:
kind: AWSClusterControllerIdentity
name: "default"
Expand Down