Disable metrics-server default addon creation for unsupported regions

eksctl-io · Jan 16, 2025 · be94ef8 · be94ef8
1 parent 714de76
commit be94ef8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/pkg/actions/addon/tasks.go b/pkg/actions/addon/tasks.go
@@ -18,15 +18,15 @@ import (
 	"github.com/weaveworks/eksctl/pkg/utils/tasks"
 )
 
-func CreateAddonTasks(ctx context.Context, cfg *api.ClusterConfig, clusterProvider *eks.ClusterProvider, iamRoleCreator IAMRoleCreator, forceAll bool, timeout time.Duration) (*tasks.TaskTree, *tasks.TaskTree, *tasks.GenericTask, []string) {
+func CreateAddonTasks(ctx context.Context, cfg *api.ClusterConfig, clusterProvider *eks.ClusterProvider, iamRoleCreator IAMRoleCreator, forceAll bool, timeout time.Duration, region string) (*tasks.TaskTree, *tasks.TaskTree, *tasks.GenericTask, []string) {
 	var addons []*api.Addon
 	var autoDefaultAddonNames []string
 	if !cfg.AddonsConfig.DisableDefaultAddons {
 		addons = make([]*api.Addon, len(cfg.Addons))
 		copy(addons, cfg.Addons)
 
 		for addonName, addonInfo := range api.KnownAddons {
-			if addonInfo.IsDefault && !slices.ContainsFunc(cfg.Addons, func(a *api.Addon) bool {
+			if addonInfo.IsDefault && !slices.Contains(addonInfo.ExcludedRegions, region) && !slices.ContainsFunc(cfg.Addons, func(a *api.Addon) bool {
 				return strings.EqualFold(a.Name, addonName)
 			}) {
 				if !cfg.IsAutoModeEnabled() || addonInfo.IsDefaultAutoMode {

diff --git a/pkg/apis/eksctl.io/v1alpha5/known_addons.go b/pkg/apis/eksctl.io/v1alpha5/known_addons.go
@@ -6,6 +6,7 @@ var KnownAddons = map[string]struct {
 	IsDefault             bool
 	CreateBeforeNodeGroup bool
 	IsDefaultAutoMode     bool
+	ExcludedRegions       []string
 }{
 	VPCCNIAddon: {
 		IsDefault:             true,
@@ -28,6 +29,15 @@ var KnownAddons = map[string]struct {
 		IsDefault:             true,
 		CreateBeforeNodeGroup: true,
 		IsDefaultAutoMode:     true,
+		ExcludedRegions: []string{
+			RegionCNNorthwest1,
+			RegionCNNorth1,
+			RegionUSISOEast1,
+			RegionUSISOWest1,
+			RegionUSISOBEast1,
+			RegionUSGovWest1,
+			RegionUSGovEast1,
+		},
 	},
 }
 

diff --git a/pkg/ctl/create/cluster.go b/pkg/ctl/create/cluster.go
@@ -374,7 +374,7 @@ func doCreateCluster(cmd *cmdutils.Cmd, ngFilter *filter.NodeGroupFilter, params
 		ClusterName:  cfg.Metadata.Name,
 		StackCreator: stackManager,
 	}
-	preNodegroupAddons, postAddons, updateVPCCNITask, autoDefaultAddons := addon.CreateAddonTasks(ctx, cfg, ctl, iamRoleCreator, true, cmd.ProviderConfig.WaitTimeout)
+	preNodegroupAddons, postAddons, updateVPCCNITask, autoDefaultAddons := addon.CreateAddonTasks(ctx, cfg, ctl, iamRoleCreator, true, cmd.ProviderConfig.WaitTimeout, meta.Region)
 	if len(autoDefaultAddons) > 0 {
 		logger.Info("default addons %s were not specified, will install them as EKS addons", strings.Join(autoDefaultAddons, ", "))
 	}