Add support for EKS Provisioned Control Plane

cespo · cespo · commit 8868cc414e13 · 2025-12-01T08:47:55.000+11:00
This change adds support for the EKS Provisioned Control Plane feature,
which allows users to select from a set of scaling tiers (standard,
tier-xl, tier-2xl, tier-4xl) for predictable, high performance from
the cluster's control plane.

Changes:
- Add ControlPlaneScalingConfig field to AWSManagedControlPlane API
- Add ControlPlaneScalingTier enum type with validation
- Implement converters between CAPA and AWS SDK types
- Update cluster creation to include scaling configuration
- Add reconciliation logic for updating scaling configuration
- Update v1beta1 conversion functions for backward compatibility
- Upgrade AWS SDK for EKS to v1.75.1 to support the new API
diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml
@@ -2411,6 +2411,23 @@ spec:
                 - host
                 - port
                 type: object
+              controlPlaneScalingConfig:
+                description: |-
+                  ControlPlaneScalingConfig specifies the scaling configuration for the EKS control plane.
+                  This allows you to select from a set of scaling tiers for predictable, high performance from the cluster's control plane.
+                  (Official AWS docs: https://docs.aws.amazon.com/eks/latest/userguide/eks-provisioned-control-plane.html)
+                properties:
+                  tier:
+                    description: |-
+                      Tier specifies the tier for the EKS control plane.
+                      Valid values are: standard, tier-xl, tier-2xl, tier-4xl
+                    enum:
+                    - standard
+                    - tier-xl
+                    - tier-2xl
+                    - tier-4xl
+                    type: string
+                type: object
               eksClusterName:
                 description: |-
                   EKSClusterName allows you to specify the name of the EKS cluster in
diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanetemplates.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanetemplates.yaml
@@ -187,6 +187,23 @@ spec:
                         - host
                         - port
                         type: object
+                      controlPlaneScalingConfig:
+                        description: |-
+                          ControlPlaneScalingConfig specifies the scaling configuration for the EKS control plane.
+                          This allows you to select from a set of scaling tiers for predictable, high performance from the cluster's control plane.
+                          (Official AWS docs: https://docs.aws.amazon.com/eks/latest/userguide/eks-provisioned-control-plane.html)
+                        properties:
+                          tier:
+                            description: |-
+                              Tier specifies the tier for the EKS control plane.
+                              Valid values are: standard, tier-xl, tier-2xl, tier-4xl
+                            enum:
+                            - standard
+                            - tier-xl
+                            - tier-2xl
+                            - tier-4xl
+                            type: string
+                        type: object
                       eksClusterName:
                         description: |-
                           EKSClusterName allows you to specify the name of the EKS cluster in
diff --git a/controlplane/eks/api/v1beta1/conversion.go b/controlplane/eks/api/v1beta1/conversion.go
@@ -121,6 +121,7 @@ func (r *AWSManagedControlPlane) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Status.Version = restored.Status.Version
 	dst.Spec.BootstrapSelfManagedAddons = restored.Spec.BootstrapSelfManagedAddons
 	dst.Spec.UpgradePolicy = restored.Spec.UpgradePolicy
+	dst.Spec.ControlPlaneScalingConfig = restored.Spec.ControlPlaneScalingConfig
 	return nil
 }
 
diff --git a/controlplane/eks/api/v1beta1/zz_generated.conversion.go b/controlplane/eks/api/v1beta1/zz_generated.conversion.go
diff --git a/controlplane/eks/api/v1beta2/awsmanagedcontrolplane_types.go b/controlplane/eks/api/v1beta2/awsmanagedcontrolplane_types.go
@@ -221,6 +221,12 @@ type AWSManagedControlPlaneSpec struct { //nolint: maligned
 	// +kubebuilder:validation:Enum=extended;standard
 	// +optional
 	UpgradePolicy UpgradePolicy `json:"upgradePolicy,omitempty"`
+
+	// ControlPlaneScalingConfig specifies the scaling configuration for the EKS control plane.
+	// This allows you to select from a set of scaling tiers for predictable, high performance from the cluster's control plane.
+	// (Official AWS docs: https://docs.aws.amazon.com/eks/latest/userguide/eks-provisioned-control-plane.html)
+	// +optional
+	ControlPlaneScalingConfig *ControlPlaneScalingConfig `json:"controlPlaneScalingConfig,omitempty"`
 }
 
 // KubeProxy specifies how the kube-proxy daemonset is managed.
diff --git a/controlplane/eks/api/v1beta2/types.go b/controlplane/eks/api/v1beta2/types.go
@@ -259,6 +259,32 @@ func (e UpgradePolicy) String() string {
 	return string(e)
 }
 
+// ControlPlaneScalingConfig represents the configuration for EKS Control Plane scaling.
+type ControlPlaneScalingConfig struct {
+	// Tier specifies the tier for the EKS control plane.
+	// Valid values are: standard, tier-xl, tier-2xl, tier-4xl
+	// +optional
+	// +kubebuilder:validation:Enum=standard;tier-xl;tier-2xl;tier-4xl
+	Tier *ControlPlaneScalingTier `json:"tier,omitempty"`
+}
+
+// ControlPlaneScalingTier defines the scaling tier for the EKS control plane.
+type ControlPlaneScalingTier string
+
+var (
+	// ControlPlaneScalingTierStandard indicates standard scaling tier (default).
+	ControlPlaneScalingTierStandard = ControlPlaneScalingTier("standard")
+
+	// ControlPlaneScalingTierXL indicates XL tier.
+	ControlPlaneScalingTierXL = ControlPlaneScalingTier("tier-xl")
+
+	// ControlPlaneScalingTier2XL indicates 2XL tier.
+	ControlPlaneScalingTier2XL = ControlPlaneScalingTier("tier-2xl")
+
+	// ControlPlaneScalingTier4XL indicates 4XL tier.
+	ControlPlaneScalingTier4XL = ControlPlaneScalingTier("tier-4xl")
+)
+
 const (
 	// SecurityGroupCluster is the security group for communication between EKS
 	// control plane and managed node groups.
diff --git a/controlplane/eks/api/v1beta2/zz_generated.deepcopy.go b/controlplane/eks/api/v1beta2/zz_generated.deepcopy.go
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/apparentlymart/go-cidr v1.1.0
 	github.com/aws/amazon-vpc-cni-k8s v1.15.5
 	github.com/aws/aws-lambda-go v1.41.0
-	github.com/aws/aws-sdk-go-v2 v1.39.2
+	github.com/aws/aws-sdk-go-v2 v1.40.0
 	github.com/aws/aws-sdk-go-v2/config v1.31.12
 	github.com/aws/aws-sdk-go-v2/credentials v1.18.16
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.12
@@ -17,7 +17,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.233.0
 	github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0
 	github.com/aws/aws-sdk-go-v2/service/efs v1.39.0
-	github.com/aws/aws-sdk-go-v2/service/eks v1.64.0
+	github.com/aws/aws-sdk-go-v2/service/eks v1.75.1
 	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.6
 	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2
 	github.com/aws/aws-sdk-go-v2/service/iam v1.32.0
@@ -26,7 +26,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6
 	github.com/aws/aws-sdk-go-v2/service/ssm v1.59.1
 	github.com/aws/aws-sdk-go-v2/service/sts v1.38.6
-	github.com/aws/smithy-go v1.23.0
+	github.com/aws/smithy-go v1.23.2
 	github.com/awslabs/goformation/v4 v4.19.5
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/coreos/ignition v0.35.0
@@ -112,8 +112,8 @@ require (
 	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.9 // indirect
 	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.50.0
diff --git a/go.sum b/go.sum
@@ -48,8 +48,8 @@ github.com/aws/amazon-vpc-cni-k8s v1.15.5 h1:/mqTXB4HoGYg4CiU4Gco9iEvZ+V/309Na4H
 github.com/aws/amazon-vpc-cni-k8s v1.15.5/go.mod h1:jV4wNtmgT2Ra1/oZU99DPOFsCUKnf0mYfIyzDyAUVAY=
 github.com/aws/aws-lambda-go v1.41.0 h1:l/5fyVb6Ud9uYd411xdHZzSf2n86TakxzpvIoz7l+3Y=
 github.com/aws/aws-lambda-go v1.41.0/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM=
-github.com/aws/aws-sdk-go-v2 v1.39.2 h1:EJLg8IdbzgeD7xgvZ+I8M1e0fL0ptn/M47lianzth0I=
-github.com/aws/aws-sdk-go-v2 v1.39.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY=
+github.com/aws/aws-sdk-go-v2 v1.40.0 h1:/WMUA0kjhZExjOQN2z3oLALDREea1A7TobfuiBrKlwc=
+github.com/aws/aws-sdk-go-v2 v1.40.0/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00=
 github.com/aws/aws-sdk-go-v2/config v1.31.12 h1:pYM1Qgy0dKZLHX2cXslNacbcEFMkDMl+Bcj5ROuS6p8=
@@ -60,10 +60,10 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 h1:Mv4Bc0mWmv6oDuSWTKnk+wg
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9/go.mod h1:IKlKfRppK2a1y0gy1yH6zD+yX5uplJ6UuPlgd48dJiQ=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.12 h1:ofHawDLJTI6ytDIji+g4dXQ6u2idzTb04tDlN9AS614=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.12/go.mod h1:f5pL4iLDfbcxj1SZcdRdIokBB5eHbuYPS/Fs9DwUPRQ=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 h1:se2vOWGD3dWQUtfn4wEjRQJb1HK1XsNIt825gskZ970=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9/go.mod h1:hijCGH2VfbZQxqCDN7bwz/4dzxV+hkyhjawAtdPWKZA=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 h1:6RBnKZLkJM4hQ+kN6E7yWFveOTg8NLPHAkqrs4ZPlTU=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9/go.mod h1:V9rQKRmK7AWuEsOMnHzKj8WyrIir1yUJbZxDuZLFvXI=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 h1:PZHqQACxYb8mYgms4RZbhZG0a7dPW06xOjmaH0EJC/I=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14/go.mod h1:VymhrMJUWs69D8u0/lZ7jSB6WgaG/NqHi3gX0aYf6U0=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 h1:bOS19y6zlJwagBfHxs0ESzr1XCOU2KXJCWcq3E2vfjY=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14/go.mod h1:1ipeGBMAxZ0xcTm6y6paC2C/J6f6OO7LBODV9afuAyM=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.9 h1:w9LnHqTq8MEdlnyhV4Bwfizd65lfNCNgdlNC6mM5paE=
@@ -82,8 +82,8 @@ github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 h1:8GcatvIKYx5WkwjwY4H+K7
 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0/go.mod h1:yz4NeCWotlbHoT41Vc9NofCbKEyiNlKYZFT4SiqVQCY=
 github.com/aws/aws-sdk-go-v2/service/efs v1.39.0 h1:nxn7P1nAd7ThB1B0WASAKvjddJQcvLzaOo9iN4tp3ZU=
 github.com/aws/aws-sdk-go-v2/service/efs v1.39.0/go.mod h1:8Ij4/TIExqfWWjcyQy82/V/aec2kQruuyndljE+Vuo0=
-github.com/aws/aws-sdk-go-v2/service/eks v1.64.0 h1:EYeOThTRysemFtC6J6h6b7dNg3jN03QuO5cg92ojIQE=
-github.com/aws/aws-sdk-go-v2/service/eks v1.64.0/go.mod h1:v1xXy6ea0PHtWkjFUvAUh6B/5wv7UF909Nru0dOIJDk=
+github.com/aws/aws-sdk-go-v2/service/eks v1.75.1 h1:WFcSYWHNNdnRnN8H2jyokrn3Yz5T1DMg+D3CWog4luk=
+github.com/aws/aws-sdk-go-v2/service/eks v1.75.1/go.mod h1:lrJRZkSj6nIXH/SN3gbGQp4i4AtNyha0wT7VgYZ3KDw=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.6 h1:9grU/+HRwLXJV8XUjEPThJj/H+0oHkeNBFpSSfZekeg=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.6/go.mod h1:N4fs285CsnBHlAkzBpQapefR/noggTyF09fWs72EzB4=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2 h1:vX70Z4lNSr7XsioU0uJq5yvxgI50sB66MvD+V/3buS4=
@@ -120,8 +120,8 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1 h1:5fm5RTONng73/QA73LhCNR7U
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1/go.mod h1:xBEjWD13h+6nq+z4AkqSfSvqRKFgDIQeaMguAJndOWo=
 github.com/aws/aws-sdk-go-v2/service/sts v1.38.6 h1:p3jIvqYwUZgu/XYeI48bJxOhvm47hZb5HUQ0tn6Q9kA=
 github.com/aws/aws-sdk-go-v2/service/sts v1.38.6/go.mod h1:WtKK+ppze5yKPkZ0XwqIVWD4beCwv056ZbPQNoeHqM8=
-github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE=
-github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
+github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=
+github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
 github.com/awslabs/goformation/v4 v4.19.5 h1:Y+Tzh01tWg8gf//AgGKUamaja7Wx9NPiJf1FpZu4/iU=
 github.com/awslabs/goformation/v4 v4.19.5/go.mod h1:JoNpnVCBOUtEz9bFxc9sjy8uBUCLF5c4D1L7RhRTVM8=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
diff --git a/pkg/cloud/converters/eks.go b/pkg/cloud/converters/eks.go
@@ -300,3 +300,26 @@ func SupportTypeToSDK(input ekscontrolplanev1.UpgradePolicy) ekstypes.SupportTyp
 	}
 	return ekstypes.SupportTypeExtended
 }
+
+// ControlPlaneScalingConfigToSDK converts CAPA ControlPlaneScalingConfig to AWS SDK ControlPlaneScalingConfig.
+func ControlPlaneScalingConfigToSDK(config *ekscontrolplanev1.ControlPlaneScalingConfig) *ekstypes.ControlPlaneScalingConfig {
+	if config == nil || config.Tier == nil {
+		return nil
+	}
+
+	return &ekstypes.ControlPlaneScalingConfig{
+		Tier: ekstypes.ProvisionedControlPlaneTier(*config.Tier),
+	}
+}
+
+// ControlPlaneScalingConfigFromSDK converts AWS SDK ControlPlaneScalingConfig to CAPA ControlPlaneScalingConfig.
+func ControlPlaneScalingConfigFromSDK(config *ekstypes.ControlPlaneScalingConfig) *ekscontrolplanev1.ControlPlaneScalingConfig {
+	if config == nil {
+		return nil
+	}
+
+	tier := ekscontrolplanev1.ControlPlaneScalingTier(config.Tier)
+	return &ekscontrolplanev1.ControlPlaneScalingConfig{
+		Tier: &tier,
+	}
+}
diff --git a/pkg/cloud/endpoints/partitions.go b/pkg/cloud/endpoints/partitions.go
diff --git a/pkg/cloud/services/eks/cluster.go b/pkg/cloud/services/eks/cluster.go
@@ -504,6 +504,8 @@ func (s *Service) createCluster(ctx context.Context, eksClusterName string) (*ek
 		}
 	}
 
+	controlPlaneScalingConfig := converters.ControlPlaneScalingConfigToSDK(s.scope.ControlPlane.Spec.ControlPlaneScalingConfig)
+
 	bootstrapAddon := s.scope.BootstrapSelfManagedAddons()
 	input := &eks.CreateClusterInput{
 		Name:                       aws.String(eksClusterName),
@@ -517,6 +519,7 @@ func (s *Service) createCluster(ctx context.Context, eksClusterName string) (*ek
 		KubernetesNetworkConfig:    netConfig,
 		BootstrapSelfManagedAddons: bootstrapAddon,
 		UpgradePolicy:              upgradePolicy,
+		ControlPlaneScalingConfig:  controlPlaneScalingConfig,
 	}
 
 	var out *eks.CreateClusterOutput
@@ -577,6 +580,11 @@ func (s *Service) reconcileClusterConfig(ctx context.Context, cluster *ekstypes.
 		input.UpgradePolicy = updateUpgradePolicy
 	}
 
+	if updateScalingConfig := s.reconcileScalingConfig(cluster.ControlPlaneScalingConfig); updateScalingConfig != nil {
+		needsUpdate = true
+		input.ControlPlaneScalingConfig = updateScalingConfig
+	}
+
 	if needsUpdate {
 		if err := wait.WaitForWithRetryable(wait.NewBackoff(), func() (bool, error) {
 			if _, err := s.EKSClient.UpdateClusterConfig(ctx, input); err != nil {
@@ -834,6 +842,26 @@ func (s *Service) reconcileUpgradePolicy(upgradePolicy *ekstypes.UpgradePolicyRe
 	}
 }
 
+func (s *Service) reconcileScalingConfig(scalingConfig *ekstypes.ControlPlaneScalingConfig) *ekstypes.ControlPlaneScalingConfig {
+	// If no scaling config is specified in the spec, don't update
+	if s.scope.ControlPlane.Spec.ControlPlaneScalingConfig == nil {
+		return nil
+	}
+
+	// If the cluster doesn't have a scaling config yet, or if it differs from the spec, update it
+	desiredConfig := converters.ControlPlaneScalingConfigToSDK(s.scope.ControlPlane.Spec.ControlPlaneScalingConfig)
+	if desiredConfig == nil {
+		return nil
+	}
+
+	// If current config is nil or tier differs, update is needed
+	if scalingConfig == nil || scalingConfig.Tier != desiredConfig.Tier {
+		return desiredConfig
+	}
+
+	return nil
+}
+
 func (s *Service) describeEKSCluster(ctx context.Context, eksClusterName string) (*ekstypes.Cluster, error) {
 	input := &eks.DescribeClusterInput{
 		Name: aws.String(eksClusterName),

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ func (r *AWSManagedControlPlane) ConvertTo(dstRaw conversion.Hub) error {`
`121`	`121`	`dst.Status.Version = restored.Status.Version`
`122`	`122`	`dst.Spec.BootstrapSelfManagedAddons = restored.Spec.BootstrapSelfManagedAddons`
`123`	`123`	`dst.Spec.UpgradePolicy = restored.Spec.UpgradePolicy`
	`124`	`+ dst.Spec.ControlPlaneScalingConfig = restored.Spec.ControlPlaneScalingConfig`
`124`	`125`	`return nil`
`125`	`126`	`}`
`126`	`127`