Merge pull request #3917 from Ankitasw/set-default-lb

k8s-ci-robot · web-flow · commit cb077a406c53 · 2022-12-06T08:40:38.000-08:00
Always populate ControlPlaneLoadBalancer type as classic if not provided by user
diff --git a/api/v1beta2/defaults.go b/api/v1beta2/defaults.go
@@ -63,10 +63,12 @@ func SetDefaults_AWSClusterSpec(s *AWSClusterSpec) { //nolint:golint,stylecheck
 	}
 	if s.ControlPlaneLoadBalancer == nil {
 		s.ControlPlaneLoadBalancer = &AWSLoadBalancerSpec{
-			Scheme:           &ELBSchemeInternetFacing,
-			LoadBalancerType: LoadBalancerTypeClassic,
+			Scheme: &ELBSchemeInternetFacing,
 		}
 	}
+	if s.ControlPlaneLoadBalancer.LoadBalancerType == "" {
+		s.ControlPlaneLoadBalancer.LoadBalancerType = LoadBalancerTypeClassic
+	}
 }
 
 // SetDefaults_Labels is used to default cluster scope resources for clusterctl move.

Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,12 @@ func SetDefaults_AWSClusterSpec(s *AWSClusterSpec) { //nolint:golint,stylecheck`
`63`	`63`	`}`
`64`	`64`	`if s.ControlPlaneLoadBalancer == nil {`
`65`	`65`	`s.ControlPlaneLoadBalancer = &AWSLoadBalancerSpec{`
`66`		`- Scheme: &ELBSchemeInternetFacing,`
`67`		`- LoadBalancerType: LoadBalancerTypeClassic,`
	`66`	`+ Scheme: &ELBSchemeInternetFacing,`
`68`	`67`	`}`
`69`	`68`	`}`
	`69`	`+ if s.ControlPlaneLoadBalancer.LoadBalancerType == "" {`
	`70`	`+ s.ControlPlaneLoadBalancer.LoadBalancerType = LoadBalancerTypeClassic`
	`71`	`+ }`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`// SetDefaults_Labels is used to default cluster scope resources for clusterctl move.`