Support custom port for powervs cluster apiserver (#1251)

Signed-off-by: Prajyot-Parab <[email protected]>

Author: Prajyot-Parab

docs/book/src/topics/powervs/creating-a-cluster.md

@@ -77,6 +77,11 @@ following the steps below.
     IBMPOWERVS_COMPUTE_PROCTYPE
     ```
 
+    Additional parameters for modifying PowerVS Cluster API server port
+    ```
+    API_SERVER_PORT
+    ```
+
 3. Check the state of the provisioned cluster and machine objects within the local management cluster
 
     Clusters

templates/README.md

@@ -50,3 +50,8 @@ IBMPOWERVS_COMPUTE_PROCESSORS
 IBMPOWERVS_COMPUTE_SYSTYPE
 IBMPOWERVS_COMPUTE_PROCTYPE
 ```
+
+### Additional parameters for modifying PowerVS Cluster API server port
+```
+API_SERVER_PORT
+```

templates/cluster-template-powervs-cloud-provider.yaml

@@ -35,7 +35,7 @@ spec:
     name: "${IBMPOWERVS_NETWORK_NAME}"
   controlPlaneEndpoint:
     host: "${IBMPOWERVS_VIP_EXTERNAL}"
-    port: 6443
+    port: ${API_SERVER_PORT:=6443}
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
@@ -57,7 +57,7 @@ spec:
           - "${IBMPOWERVS_VIP_EXTERNAL}"
         extraArgs:
           cloud-provider: external
-      controlPlaneEndpoint: ${IBMPOWERVS_VIP}:6443
+      controlPlaneEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
       controllerManager:
         extraArgs:
           cloud-provider: external
@@ -72,7 +72,7 @@ spec:
     joinConfiguration:
       discovery:
         bootstrapToken:
-          apiServerEndpoint: ${IBMPOWERVS_VIP}:6443
+          apiServerEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
           token: ""
           caCertHashes: [ ]
           unsafeSkipCAVerification: false
@@ -106,7 +106,7 @@ spec:
               - name: vip_arp
                 value: "true"
               - name: port
-                value: "6443"
+                value: "${API_SERVER_PORT:=6443}"
               - name: vip_interface
                 value: env2
               - name: vip_cidr
@@ -226,7 +226,7 @@ spec:
       joinConfiguration:
         discovery:
           bootstrapToken:
-            apiServerEndpoint: ${IBMPOWERVS_VIP}:6443
+            apiServerEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
             token: ""
             caCertHashes: []
             unsafeSkipCAVerification: false

templates/cluster-template-powervs.yaml

@@ -34,7 +34,7 @@ spec:
     name: "${IBMPOWERVS_NETWORK_NAME}"
   controlPlaneEndpoint:
     host: "${IBMPOWERVS_VIP_EXTERNAL}"
-    port: 6443
+    port: ${API_SERVER_PORT:=6443}
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
@@ -54,7 +54,7 @@ spec:
         certSANs:
           - "${IBMPOWERVS_VIP}"
           - "${IBMPOWERVS_VIP_EXTERNAL}"
-      controlPlaneEndpoint: ${IBMPOWERVS_VIP}:6443
+      controlPlaneEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
       controllerManager:
         extraArgs:
           enable-hostpath-provisioner: "true"
@@ -69,7 +69,7 @@ spec:
     joinConfiguration:
       discovery:
         bootstrapToken:
-          apiServerEndpoint: ${IBMPOWERVS_VIP}:6443
+          apiServerEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
           token: ""
           caCertHashes: [ ]
           unsafeSkipCAVerification: false
@@ -104,7 +104,7 @@ spec:
               - name: vip_arp
                 value: "true"
               - name: port
-                value: "6443"
+                value: "${API_SERVER_PORT:=6443}"
               - name: vip_interface
                 value: env2
               - name: vip_cidr
@@ -223,7 +223,7 @@ spec:
       joinConfiguration:
         discovery:
           bootstrapToken:
-            apiServerEndpoint: ${IBMPOWERVS_VIP}:6443
+            apiServerEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
             token: ""
             caCertHashes: []
             unsafeSkipCAVerification: false

templates/cluster-template-simple-powervs-clusterclass.yaml

@@ -69,7 +69,7 @@ spec:
     spec:
       controlPlaneEndpoint:
         host: "${IBMPOWERVS_VIP_EXTERNAL}"
-        port: 6443
+        port: ${API_SERVER_PORT:=6443}
       network:
         name: "${IBMPOWERVS_NETWORK_NAME}"
       serviceInstanceID: "${IBMPOWERVS_SERVICE_INSTANCE_ID}"
@@ -89,7 +89,7 @@ spec:
               - "${IBMPOWERVS_VIP_EXTERNAL}"
             extraArgs:
               cloud-provider: external
-          controlPlaneEndpoint: ${IBMPOWERVS_VIP}:6443
+          controlPlaneEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
           controllerManager:
             extraArgs:
               cloud-provider: external
@@ -110,7 +110,7 @@ spec:
                   - name: vip_arp
                     value: "true"
                   - name: port
-                    value: "6443"
+                    value: "${API_SERVER_PORT:=6443}"
                   - name: vip_interface
                     value: env2
                   - name: vip_cidr
@@ -168,7 +168,7 @@ spec:
         joinConfiguration:
           discovery:
             bootstrapToken:
-              apiServerEndpoint: 192.168.167.85:6443
+              apiServerEndpoint: 192.168.167.85:${API_SERVER_PORT:=6443}
               caCertHashes: []
               token: ""
               unsafeSkipCAVerification: false
@@ -199,7 +199,7 @@ spec:
       joinConfiguration:
         discovery:
           bootstrapToken:
-            apiServerEndpoint: ${IBMPOWERVS_VIP}:6443
+            apiServerEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
             caCertHashes: []
             token: ""
             unsafeSkipCAVerification: false