Skip to content

🐛 fix: missing controller permissions #5537

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 2 commits into from
Jun 10, 2025
Merged

🐛 fix: missing controller permissions #5537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a0adec
fix: missing controller permissions
richardcase Jun 9, 2025
f5c0e0f
fix: add eventually for bastion ready
richardcase Jun 9, 2025
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
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/cluster_api_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ func (t Template) ControllersPolicy() *iamv1.PolicyDocument {
"ec2:RevokeSecurityGroupIngress",
"ec2:RunInstances",
"ec2:TerminateInstances",
"ec2:GetSecurityGroupsForVpc",
"tag:GetResources",
"elasticloadbalancing:AddTags",
"elasticloadbalancing:CreateLoadBalancer",
Expand All @@ -174,6 +175,7 @@ func (t Template) ControllersPolicy() *iamv1.PolicyDocument {
"elasticloadbalancing:CreateListener",
"elasticloadbalancing:DescribeTargetHealth",
"elasticloadbalancing:RegisterTargets",
"elasticloadbalancing:DeregisterTargets",
"elasticloadbalancing:DeleteListener",
"autoscaling:DescribeAutoScalingGroups",
"autoscaling:DescribeInstanceRefreshes",
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/customsuffix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -234,6 +235,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -234,6 +235,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_all_secret_backends.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -240,6 +241,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_allow_assume_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -234,6 +235,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_bootstrap_user.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -240,6 +241,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_custom_bootstrap_user.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -240,6 +241,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_different_instance_profiles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -234,6 +235,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_eks_console.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -234,6 +235,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_eks_default_roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -234,6 +235,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_eks_disable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -234,6 +235,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_eks_kms_prefix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -234,6 +235,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_extra_statements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -240,6 +241,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_s3_bucket.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -234,6 +235,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
2 changes: 2 additions & 0 deletions cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_ssm_secret_backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Resources:
- ec2:RevokeSecurityGroupIngress
- ec2:RunInstances
- ec2:TerminateInstances
- ec2:GetSecurityGroupsForVpc
- tag:GetResources
- elasticloadbalancing:AddTags
- elasticloadbalancing:CreateLoadBalancer
Expand All @@ -234,6 +235,7 @@ Resources:
- elasticloadbalancing:CreateListener
- elasticloadbalancing:DescribeTargetHealth
- elasticloadbalancing:RegisterTargets
- elasticloadbalancing:DeregisterTargets
- elasticloadbalancing:DeleteListener
- autoscaling:DescribeAutoScalingGroups
- autoscaling:DescribeInstanceRefreshes
Expand Down
29 changes: 22 additions & 7 deletions test/e2e/suites/unmanaged/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,16 +414,31 @@ type conditionAssertion struct {
reason string
}

func expectAWSClusterConditions(m *infrav1.AWSCluster, expected []conditionAssertion) {
Expect(len(m.Status.Conditions)).To(BeNumerically(">=", len(expected)), "number of conditions")
func hasAWSClusterConditions(m *infrav1.AWSCluster, expected []conditionAssertion) bool {
if len(m.Status.Conditions) < len(expected) {
return false
}
for _, c := range expected {
actual := conditions.Get(m, c.conditionType)
Expect(actual).To(Not(BeNil()))
Expect(actual.Type).To(Equal(c.conditionType))
Expect(actual.Status).To(Equal(c.status))
Expect(actual.Severity).To(Equal(c.severity))
Expect(actual.Reason).To(Equal(c.reason))
Comment on lines -421 to -425
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious: Why these need to be changed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously the tests would only call this once and the assertions would fail the test. However, now we are using an Eventually we need to check the conditions in a loop and so we just return true or false instead of failing an assertion.

if actual == nil {
return false
}

if actual.Type != c.conditionType {
return false
}
if actual.Status != c.status {
return false
}
if actual.Severity != c.severity {
return false
}
if actual.Reason != c.reason {
return false
}
}

return true
}

func createEFS() *efs.FileSystemDescription {
Expand Down
24 changes: 19 additions & 5 deletions test/e2e/suites/unmanaged/unmanaged_functional_clusterclass_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"context"
"fmt"
"path/filepath"
"time"

"github.com/gofrs/flock"
"github.com/onsi/ginkgo/v2"
Expand Down Expand Up @@ -81,11 +82,24 @@ var _ = ginkgo.Context("[unmanaged] [functional] [ClusterClass]", func() {
WaitForControlPlaneIntervals: e2eCtx.E2EConfig.GetIntervals(specName, "wait-control-plane"),
}, result)

ginkgo.By("Checking if bastion host is running")
awsCluster, err := GetAWSClusterByName(ctx, e2eCtx.Environment.BootstrapClusterProxy, namespace.Name, clusterName)
Expect(err).To(BeNil())
Expect(awsCluster.Status.Bastion.State).To(Equal(infrav1.InstanceStateRunning))
expectAWSClusterConditions(awsCluster, []conditionAssertion{{infrav1.BastionHostReadyCondition, corev1.ConditionTrue, "", ""}})
Eventually(func(gomega Gomega) (bool, error) {
ginkgo.By("Checking if the bastion is ready")
awsCluster, err := GetAWSClusterByName(ctx, e2eCtx.Environment.BootstrapClusterProxy, namespace.Name, clusterName)
if err != nil {
return false, err
}
if awsCluster.Status.Bastion.State != infrav1.InstanceStateRunning {
shared.Byf("Bastion is not running, state is %s", awsCluster.Status.Bastion.State)
return false, nil
}

if !hasAWSClusterConditions(awsCluster, []conditionAssertion{{infrav1.BastionHostReadyCondition, corev1.ConditionTrue, "", ""}}) {
ginkgo.By("AWSCluster missing bastion host ready condition")
return false, nil
}

return true, nil
}, 15*time.Minute, 30*time.Second).Should(BeTrue(), "Should've eventually succeeded creating bastion host")

ginkgo.By("PASSED!")
})
Expand Down
22 changes: 18 additions & 4 deletions test/e2e/suites/unmanaged/unmanaged_functional_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,24 @@ var _ = ginkgo.Context("[unmanaged] [functional]", func() {
}, result)

// Check if bastion host is up and running
awsCluster, err := GetAWSClusterByName(ctx, e2eCtx.Environment.BootstrapClusterProxy, namespace.Name, clusterName)
Expect(err).To(BeNil())
Expect(awsCluster.Status.Bastion.State).To(Equal(infrav1.InstanceStateRunning))
expectAWSClusterConditions(awsCluster, []conditionAssertion{{infrav1.BastionHostReadyCondition, corev1.ConditionTrue, "", ""}})
Eventually(func(gomega Gomega) (bool, error) {
ginkgo.By("Checking if the bastion is ready")
awsCluster, err := GetAWSClusterByName(ctx, e2eCtx.Environment.BootstrapClusterProxy, namespace.Name, clusterName)
if err != nil {
return false, err
}
if awsCluster.Status.Bastion.State != infrav1.InstanceStateRunning {
shared.Byf("Bastion is not running, state is %s", awsCluster.Status.Bastion.State)
return false, nil
}

if !hasAWSClusterConditions(awsCluster, []conditionAssertion{{infrav1.BastionHostReadyCondition, corev1.ConditionTrue, "", ""}}) {
ginkgo.By("AWSCluster missing bastion host ready condition")
return false, nil
}

return true, nil
}, 15*time.Minute, 30*time.Second).Should(BeTrue(), "Should've eventually succeeded creating bastion host")

mdName := clusterName + "-md01"
machineTempalte := makeAWSMachineTemplate(namespace.Name, mdName, e2eCtx.E2EConfig.GetVariable(shared.AwsNodeMachineType), nil)
Expand Down