Merge pull request #5111 from alam0rt/fix-role-validation-issue

k8s-ci-robot · web-flow · commit 06dd71621a00 · 2024-10-15T16:47:04.000+01:00
🐛 Standardize cluster name in Fargate role names to avoid errors on mismatch between Cluster CR and EKS cluster name
diff --git a/pkg/cloud/services/eks/roles.go b/pkg/cloud/services/eks/roles.go
@@ -304,7 +304,7 @@ func (s *FargateService) reconcileFargateIAMRole() (requeue bool, err error) {
 			s.scope.Info("no EKS fargate role specified, using role based on fargate profile name")
 			roleName, err = eks.GenerateEKSName(
 				"fargate",
-				fmt.Sprintf("%s-%s", s.scope.KubernetesClusterName(), s.scope.FargateProfile.Spec.ProfileName),
+				fmt.Sprintf("%s-%s", s.scope.ClusterName(), s.scope.FargateProfile.Spec.ProfileName),
 				maxIAMRoleNameLength,
 			)
 			if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ func (s *FargateService) reconcileFargateIAMRole() (requeue bool, err error) {`
`304`	`304`	`s.scope.Info("no EKS fargate role specified, using role based on fargate profile name")`
`305`	`305`	`roleName, err = eks.GenerateEKSName(`
`306`	`306`	`"fargate",`
`307`		`- fmt.Sprintf("%s-%s", s.scope.KubernetesClusterName(), s.scope.FargateProfile.Spec.ProfileName),`
	`307`	`+ fmt.Sprintf("%s-%s", s.scope.ClusterName(), s.scope.FargateProfile.Spec.ProfileName),`
`308`	`308`	`maxIAMRoleNameLength,`
`309`	`309`	`)`
`310`	`310`	`if err != nil {`