Skip to content

Commit

Permalink
Allow disabling default addons with Auto Mode
Browse files Browse the repository at this point in the history
  • Loading branch information
anefedov-align committed Jan 28, 2025
1 parent f4d4076 commit a41adc9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkg/ctl/cmdutils/configfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -485,18 +485,18 @@ func validateDryRunOptions(cmd *cobra.Command, incompatibleFlags []string) error
return nil
}

// validateBareCluster validates a cluster for unsupported fields if VPC CNI is disabled.
// validateBareCluster validates a cluster for unsupported fields if VPC CNI and Auto Mode is disabled.
func validateBareCluster(clusterConfig *api.ClusterConfig) error {
if !clusterConfig.AddonsConfig.DisableDefaultAddons || slices.ContainsFunc(clusterConfig.Addons, func(addon *api.Addon) bool {
if !clusterConfig.AddonsConfig.DisableDefaultAddons || clusterConfig.IsAutoModeEnabled() || slices.ContainsFunc(clusterConfig.Addons, func(addon *api.Addon) bool {
return addon.Name == api.VPCCNIAddon
}) {
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)) {
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")
"and iam.podIdentityAssociations are not supported during cluster creation in a cluster without VPC CNI if Auto Mode is disabled; " +
"please remove these fields and add them back after cluster creation is successful")
}
return nil
}
Expand Down

0 comments on commit a41adc9

Please sign in to comment.