Add e2e test for custom LB port

Signed-off-by: Damien DASSIEU <[email protected]>

Author: damsien

docs/scalewaycluster.md

@@ -151,6 +151,28 @@ For more information about private DNS, please refer to the [Understanding Scale
 When creating a `ScalewayCluster`, a "main" Load Balancer is always created.
 It is also possible to specify "extra" Load Balancers to achieve regional redundancy.
 
+#### Front API server port
+
+The kube-apiserver Load Balancer's front port can be set at the cluster creation in the `Cluster` object.
+
+Here is an example of the main Load Balancer port configuration:
+
+```yaml
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: my-cluster
+  namespace: default
+spec:
+  ...
+  clusterNetwork:
+    apiServerPort: 443
+  ...
+```
+
+- The `apiServerPort` field specifies the port of the Load Balancer frontend that exposes the kube-apiserver(s).
+  This field should not be changed after the creation of the cluster.
+
 #### Main Load Balancer
 
 The main Load Balancer is always created by default, it is not possible to disable it.
@@ -189,26 +211,6 @@ spec:
 > When `private` is set to `true`, make sure your management cluster has network access
 > to the Private Network where the workload cluster will be created.
 
-The main Load Balancer's port can be set at the cluster creation in the `Cluster` object.
-
-Here is an example of the main Load Balancer port configuration:
-
-```yaml
-apiVersion: cluster.x-k8s.io/v1beta1
-kind: Cluster
-metadata:
-  name: my-cluster
-  namespace: default
-spec:
-  ...
-  clusterNetwork:
-    apiServerPort: 443
-  ...
-```
-
-- The `apiServerPort` field specifies the port of the Load Balancer frontend that exposes the kube-apiserver(s).
-  This field is immutable.
-
 #### Extra Load Balancers
 
 To specify extra Load Balancers, it is required to also set the `network.controlPlaneDNS`

internal/service/scaleway/lb/lb_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"go.uber.org/mock/gomock"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
@@ -128,6 +129,79 @@ func TestService_Reconcile(t *testing.T) {
 				g.Expect(c.ScalewayCluster.Status.Network.LoadBalancerIP).To(Equal(scw.StringPtr("42.42.42.42")))
 			},
 		},
+		{
+			name: "custom public LB, no extra LB, no Private Network, no ACL: create",
+			fields: fields{
+				Cluster: &scope.Cluster{
+					ScalewayCluster: &v1alpha1.ScalewayCluster{
+						ObjectMeta: v1.ObjectMeta{
+							Name:      "cluster",
+							Namespace: "default",
+						},
+					},
+					Cluster: &v1beta1.Cluster{
+						ObjectMeta: v1.ObjectMeta{
+							Name:      "cluster",
+							Namespace: "default",
+						},
+						Spec: v1beta1.ClusterSpec{
+							ClusterNetwork: &v1beta1.ClusterNetwork{
+								APIServerPort: ptr.To(int32(4242)),
+							},
+						},
+					},
+				},
+			},
+			args: args{
+				ctx: context.TODO(),
+			},
+			expect: func(i *mock_client.MockInterfaceMockRecorder) {
+				tags := []string{"caps-namespace=default", "caps-scalewaycluster=cluster"}
+
+				// Main LB
+				i.GetZoneOrDefault(nil).Return(scw.ZoneFrPar1, nil)
+				i.FindLB(gomock.Any(), scw.ZoneFrPar1, append(tags, CAPSMainLBTag)).Return(nil, client.ErrNoItemFound)
+				i.CreateLB(gomock.Any(), scw.ZoneFrPar1, "cluster", "LB-S", nil, false, append(tags, CAPSMainLBTag)).Return(&lb.LB{
+					ID:     lbID,
+					Name:   "cluster",
+					Status: lb.LBStatusReady,
+					Zone:   scw.ZoneFrPar1,
+					IP:     []*lb.IP{{IPAddress: "42.42.42.42"}},
+				}, nil)
+
+				// Extra LBs
+				i.FindLBs(gomock.Any(), append(tags, CAPSExtraLBTag)).Return([]*lb.LB{}, nil)
+
+				// Backend
+				i.FindBackend(gomock.Any(), scw.ZoneFrPar1, lbID, BackendName).Return(nil, client.ErrNoItemFound)
+				i.CreateBackend(gomock.Any(), scw.ZoneFrPar1, lbID, BackendName, nil, backendControlPlanePort).Return(&lb.Backend{
+					ID: backendID,
+					LB: &lb.LB{
+						ID:   lbID,
+						Zone: scw.ZoneFrPar1,
+					},
+				}, nil)
+
+				// Frontend
+				i.FindFrontend(gomock.Any(), scw.ZoneFrPar1, lbID, FrontendName).Return(nil, client.ErrNoItemFound)
+				i.CreateFrontend(gomock.Any(), scw.ZoneFrPar1, lbID, FrontendName, backendID, int32(4242)).Return(&lb.Frontend{
+					ID: frontendID,
+					LB: &lb.LB{
+						ID:   lbID,
+						Zone: scw.ZoneFrPar1,
+					},
+				}, nil)
+
+				// ACL
+				i.FindLBACLByName(gomock.Any(), scw.ZoneFrPar1, frontendID, allowedRangesACLName).Return(nil, client.ErrNoItemFound)
+				i.FindLBACLByName(gomock.Any(), scw.ZoneFrPar1, frontendID, publicGatewayACLName).Return(nil, client.ErrNoItemFound)
+				i.FindLBACLByName(gomock.Any(), scw.ZoneFrPar1, frontendID, denyAllACLName).Return(nil, client.ErrNoItemFound)
+			},
+			asserts: func(g *WithT, c *scope.Cluster) {
+				g.Expect(c.ScalewayCluster.Status.Network).ToNot(BeNil())
+				g.Expect(c.ScalewayCluster.Status.Network.LoadBalancerIP).To(Equal(scw.StringPtr("42.42.42.42")))
+			},
+		},
 		{
 			name: "public LB, extra LBs, Private Network, ACL: up-to-date",
 			fields: fields{

templates/cluster-template-private-network.yaml

@@ -4,6 +4,7 @@ metadata:
   name: ${CLUSTER_NAME}
 spec:
   clusterNetwork:
+    apiServerPort: ${API_SERVER_PORT:=null}
     pods:
       cidrBlocks:
         - 10.244.0.0/16

test/e2e/scaleway_test.go

@@ -54,4 +54,22 @@ var _ = Describe("Workload cluster creation", func() {
 			}
 		})
 	})
+
+	Context("Running the CAPSClusterDeploymentSpec with front api custom port", func() {
+		CAPSClusterDeploymentSpec(func() CAPSClusterDeploymentSpecInput {
+			return CAPSClusterDeploymentSpecInput{
+				E2EConfig:                e2eConfig,
+				ClusterctlConfigPath:     clusterctlConfigPath,
+				BootstrapClusterProxy:    bootstrapClusterProxy,
+				ArtifactFolder:           artifactFolder,
+				SkipCleanup:              skipCleanup,
+				ControlPlaneMachineCount: 3,
+				WorkerMachineCount:       2,
+				Flavor:                   "",
+				ClusterctlVariables: map[string]string{
+					"API_SERVER_PORT": "443",
+				},
+			}
+		})
+	})
 })