revert change to ng role service

alam0rt · richardcase · commit a19d857b3683 · 2024-10-22T09:19:00.000+01:00
diff --git a/pkg/cloud/services/eks/roles.go b/pkg/cloud/services/eks/roles.go
@@ -183,7 +183,7 @@ func (s *NodegroupService) reconcileNodegroupIAMRole() error {
 			s.scope.Info("no EKS nodegroup role specified, using role based on nodegroup name")
 			roleName, err = eks.GenerateEKSName(
 				"nodegroup-iam-service-role",
-				fmt.Sprintf("%s-%s", s.scope.ClusterName(), s.scope.NodegroupName()),
+				fmt.Sprintf("%s-%s", s.scope.KubernetesClusterName(), s.scope.NodegroupName()),
 				maxIAMRoleNameLength,
 			)
 			if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ func (s *NodegroupService) reconcileNodegroupIAMRole() error {`
`183`	`183`	`s.scope.Info("no EKS nodegroup role specified, using role based on nodegroup name")`
`184`	`184`	`roleName, err = eks.GenerateEKSName(`
`185`	`185`	`"nodegroup-iam-service-role",`
`186`		`- fmt.Sprintf("%s-%s", s.scope.ClusterName(), s.scope.NodegroupName()),`
	`186`	`+ fmt.Sprintf("%s-%s", s.scope.KubernetesClusterName(), s.scope.NodegroupName()),`
`187`	`187`	`maxIAMRoleNameLength,`
`188`	`188`	`)`
`189`	`189`	`if err != nil {`