Skip to content
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

Allow disabling default addons with Auto Mode #8165

Merged
merged 1 commit into from
Jan 30, 2025
+6 −6
Merged

Allow disabling default addons with Auto Mode #8165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions pkg/ctl/cmdutils/configfile.go
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions pkg/ctl/cmdutils/configfile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,8 @@ var _ = Describe("cmdutils configfile", func() {
}).Load()
if e.expectErr {
Expect(err).To(MatchError("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"))
} else {
Expect(err).NotTo(HaveOccurred())
}
Expand Down
Loading