Merge pull request #7927 from EmmEff/resolve-segfault-with-vpc-cni-disabled

cPu1 · web-flow · commit 8e680a042742 · 2024-08-16T16:31:05.000+05:30
Fixes segfault when VPC CNI is disabled
diff --git a/pkg/ctl/cmdutils/configfile.go b/pkg/ctl/cmdutils/configfile.go
@@ -463,7 +463,7 @@ func validateBareCluster(clusterConfig *api.ClusterConfig) error {
 		return nil
 	}
 	if clusterConfig.HasNodes() || clusterConfig.IsFargateEnabled() || clusterConfig.Karpenter != nil || clusterConfig.HasGitOpsFluxConfigured() ||
-		(clusterConfig.IAM != nil && (len(clusterConfig.IAM.ServiceAccounts) > 0) || len(clusterConfig.IAM.PodIdentityAssociations) > 0) {
+		(clusterConfig.IAM != nil && ((len(clusterConfig.IAM.ServiceAccounts) > 0) || len(clusterConfig.IAM.PodIdentityAssociations) > 0)) {
 		return errors.New("fields nodeGroups, managedNodeGroups, fargateProfiles, karpenter, gitops, iam.serviceAccounts, " +
 			"and iam.podIdentityAssociations are not supported during cluster creation in a cluster without VPC CNI; please remove these fields " +
 			"and add them back after cluster creation is successful")

Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ func validateBareCluster(clusterConfig *api.ClusterConfig) error {`
`463`	`463`	`return nil`
`464`	`464`	`}`
`465`	`465`	`if clusterConfig.HasNodes() \|\| clusterConfig.IsFargateEnabled() \|\| clusterConfig.Karpenter != nil \|\| clusterConfig.HasGitOpsFluxConfigured() \|\|`
`466`		`- (clusterConfig.IAM != nil && (len(clusterConfig.IAM.ServiceAccounts) > 0) \|\| len(clusterConfig.IAM.PodIdentityAssociations) > 0) {`
	`466`	`+ (clusterConfig.IAM != nil && ((len(clusterConfig.IAM.ServiceAccounts) > 0) \|\| len(clusterConfig.IAM.PodIdentityAssociations) > 0)) {`
`467`	`467`	`return errors.New("fields nodeGroups, managedNodeGroups, fargateProfiles, karpenter, gitops, iam.serviceAccounts, " +`
`468`	`468`	`"and iam.podIdentityAssociations are not supported during cluster creation in a cluster without VPC CNI; please remove these fields " +`
`469`	`469`	`"and add them back after cluster creation is successful")`