Fix issue with upgrade policy not being applied (#8577)

Author: NicholasBlaskey

pkg/apis/eksctl.io/v1alpha5/types.go

@@ -1146,6 +1146,7 @@ func NewClusterConfig() *ClusterConfig {
 		},
 		PrivateCluster: &PrivateCluster{},
 		AccessConfig:   &AccessConfig{},
+		UpgradePolicy:  &UpgradePolicy{},
 	}
 
 	return cfg

pkg/cfn/builder/cluster.go

@@ -355,13 +355,23 @@ func (c *ClusterResourceSet) addResourcesForControlPlane(subnetDetails *SubnetDe
 		}
 	}
 
+	var upgradePolicy *gfneks.Cluster_UpgradePolicy
+	if c.spec.UpgradePolicy != nil {
+		if c.spec.UpgradePolicy.SupportType != "" {
+			upgradePolicy = &gfneks.Cluster_UpgradePolicy{
+				SupportType: gfnt.NewString(c.spec.UpgradePolicy.SupportType),
+			}
+		}
+	}
+
 	cluster := gfneks.Cluster{
 		EncryptionConfig:           encryptionConfigs,
 		Logging:                    makeClusterLogging(c.spec),
 		Name:                       gfnt.NewString(c.spec.Metadata.Name),
 		ResourcesVpcConfig:         clusterVPC,
 		RoleArn:                    serviceRoleARN,
 		BootstrapSelfManagedAddons: gfnt.NewBoolean(false),
+		UpgradePolicy:              upgradePolicy,
 		AccessConfig: &gfneks.Cluster_AccessConfig{
 			AuthenticationMode:                      gfnt.NewString(string(c.spec.AccessConfig.AuthenticationMode)),
 			BootstrapClusterCreatorAdminPermissions: gfnt.NewBoolean(!api.IsDisabled(c.spec.AccessConfig.BootstrapClusterCreatorAdminPermissions)),

pkg/cfn/builder/cluster_test.go

@@ -79,11 +79,25 @@ var _ = Describe("Cluster Template Builder", func() {
 			Expect(controlPlane.ResourcesVpcConfig.SubnetIDs).To(HaveLen(4))
 			Expect(controlPlane.RoleArn).To(ContainElement([]interface{}{"ServiceRole", "Arn"}))
 			Expect(controlPlane.EncryptionConfig).To(BeNil())
+			Expect(controlPlane.UpgradePolicy).To(BeNil())
 			Expect(controlPlane.KubernetesNetworkConfig.ServiceIPv4CIDR).To(Equal("131.10.55.70/18"))
 			Expect(controlPlane.KubernetesNetworkConfig.IPFamily).To(Equal("ipv4"))
 			Expect(controlPlane.AccessConfig.BootstrapClusterCreatorAdminPermissions).To(BeTrue())
 		})
 
+		Context("when UpgradePolicy is set with SupportType", func() {
+			BeforeEach(func() {
+				cfg.UpgradePolicy = &api.UpgradePolicy{
+					SupportType: api.SupportTypeStandard,
+				}
+			})
+
+			It("should include UpgradePolicy with SupportType in control plane resources", func() {
+				Expect(clusterTemplate.Resources["ControlPlane"].Properties.UpgradePolicy).NotTo(BeNil())
+				Expect(clusterTemplate.Resources["ControlPlane"].Properties.UpgradePolicy.SupportType).To(Equal(api.SupportTypeStandard))
+			})
+		})
+
 		It("should add vpc resources", func() {
 			Expect(clusterTemplate.Resources).To(HaveKey(vpcResourceKey))
 			Expect(clusterTemplate.Resources).To(HaveKey(igwKey))

pkg/cfn/builder/fakes/fake_cfn_template.go

@@ -55,6 +55,10 @@ type Properties struct {
 
 	VPCZoneIdentifier interface{}
 
+	UpgradePolicy *struct {
+		SupportType string
+	}
+
 	LoadBalancerNames                 []string
 	MetricsCollection                 []map[string]interface{}
 	TargetGroupARNs                   []string

pkg/ctl/cmdutils/configfile.go

@@ -50,6 +50,7 @@ var (
 		"version",
 		"cluster",
 		"namepace",
+		"support-type",
 	}
 	defaultFlagsIncompatibleWithoutConfigFile = []string{
 		"only",

pkg/ctl/cmdutils/filter/nodegroup_filter_test.go

@@ -350,6 +350,7 @@ const expected = `
 		  "region": "eu-central-1",
 		  "version": "1.32"
 		},
+		"upgradePolicy": {},
 		"kubernetesNetworkConfig": {
         	"ipFamily": "IPv4"
         },

pkg/ctl/create/cluster.go

@@ -99,6 +99,7 @@ func createClusterCmdWithRunFunc(cmd *cmdutils.Cmd, runFunc func(cmd *cmdutils.C
 		cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig)
 		fs.BoolVar(cfg.IAM.WithOIDC, "with-oidc", false, "Enable the IAM OIDC provider")
 		fs.StringSliceVar(&params.AvailabilityZones, "zones", nil, "(auto-select if unspecified)")
+		fs.StringVarP(&cfg.UpgradePolicy.SupportType, "support-type", "", "", "Set cluster's upgradePolicy supportType")
 		cmdutils.AddVersionFlag(fs, cfg.Metadata, "")
 		cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile)
 		cmdutils.AddTimeoutFlag(fs, &cmd.ProviderConfig.WaitTimeout)