make powervs cluster setup with external cloud provider as default

Signed-off-by: Prajyot Parab <Prajyot.Parab2@ibm.com>

Author: Prajyot-Parab

Makefile

@@ -181,7 +181,7 @@ generate-go-conversions: $(CONVERSION_GEN) ## Generate conversions go code
 .PHONY: generate-templates
 generate-templates: $(KUSTOMIZE) ## Generate cluster templates
 	$(KUSTOMIZE) build $(TEMPLATES_DIR)/cluster-template --load-restrictor LoadRestrictionsNone > $(TEMPLATES_DIR)/cluster-template.yaml
-	$(KUSTOMIZE) build $(TEMPLATES_DIR)/cluster-template-powervs-cloud-provider --load-restrictor LoadRestrictionsNone > $(TEMPLATES_DIR)/cluster-template-powervs-cloud-provider.yaml
+	$(KUSTOMIZE) build $(TEMPLATES_DIR)/cluster-template-powervs --load-restrictor LoadRestrictionsNone > $(TEMPLATES_DIR)/cluster-template-powervs.yaml
 	$(KUSTOMIZE) build $(TEMPLATES_DIR)/cluster-template-powervs-clusterclass --load-restrictor LoadRestrictionsNone > $(TEMPLATES_DIR)/cluster-template-powervs-clusterclass.yaml
 	$(KUSTOMIZE) build $(TEMPLATES_DIR)/cluster-template-vpc-clusterclass --load-restrictor LoadRestrictionsNone > $(TEMPLATES_DIR)/cluster-template-vpc-clusterclass.yaml
 

docs/book/src/developer/tilt.md

@@ -84,6 +84,7 @@ enable_providers:
 - kubeadm-control-plane
 kustomize_substitutions:
   IBMCLOUD_API_KEY: "XXXXXXXXXXXXXXXXXX"
+  EXP_CLUSTER_RESOURCE_SET: "true"
 ```
 
 Add following extra_args to log PowerVS REST API Requests/Responses
@@ -100,7 +101,7 @@ extra_args:
 
 ### 1.  Configuration to deploy workload cluster with external cloud controller manager
 
-To deploy workload cluster with cloud controller manager, set `PROVIDER_ID_FORMAT` to `v2` and enable cluster resourceset feature gate by setting `EXP_CLUSTER_RESOURCE_SET` to `true under kustomize_substitutions.
+To deploy workload cluster with cloud controller manager, enable cluster resourceset feature gate by setting `EXP_CLUSTER_RESOURCE_SET` to `true` under kustomize_substitutions.
 
 ```yaml
 default_registry: "gcr.io/you-project-name-here"
@@ -112,13 +113,12 @@ enable_providers:
 - kubeadm-control-plane
 kustomize_substitutions:
   IBMCLOUD_API_KEY: "XXXXXXXXXXXXXXXXXX"
-  PROVIDER_ID_FORMAT: "v2"
   EXP_CLUSTER_RESOURCE_SET: "true"
 ```
 
 ### 2.  Configuration to deploy workload cluster from ClusterClass template
 
-To deploy workload cluster with [clusterclass-template](/topics/powervs/clusterclass-cluster.html), set the `PROVIDER_ID_FORMAT` to `v2` and enable the feature gates `EXP_CLUSTER_RESOURCE_SET` and `CLUSTER_TOPOLOGY` to `true`under kustomize_substitutions.
+To deploy workload cluster with [clusterclass-template](/topics/powervs/clusterclass-cluster.html), enable the feature gates `EXP_CLUSTER_RESOURCE_SET` and `CLUSTER_TOPOLOGY` to `true` under kustomize_substitutions.
 
 ```yaml
 default_registry: "gcr.io/you-project-name-here"
@@ -130,7 +130,6 @@ enable_providers:
 - kubeadm-control-plane
 kustomize_substitutions:
   IBMCLOUD_API_KEY: "XXXXXXXXXXXXXXXXXX"
-  PROVIDER_ID_FORMAT: "v2"
   EXP_CLUSTER_RESOURCE_SET: "true"
   CLUSTER_TOPOLOGY: "true"
 ```
@@ -171,7 +170,6 @@ enable_providers:
   - kubeadm-control-plane
 kustomize_substitutions:
   IBMCLOUD_API_KEY: "XXXXXXXXXXXXXXXXXX"
-  PROVIDER_ID_FORMAT: "v2"
   EXP_CLUSTER_RESOURCE_SET: "true"
 extra_args:
    core:

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

@@ -2,7 +2,6 @@
 
 > **Note:**
 > A PowerVS cluster can be deployed with different customisations. Pick one of the following templates as per your need and fulfill the [prerequisites](prerequisites.md) before proceeding with cluster creation.
-> - [PowerVS cluster with user provided resources](#deploy-a-powervs-cluster-with-user-provided-resources)
 > - [PowerVS cluster with infrastructure creation](#deploy-a-powervs-cluster-with-infrastructure-creation)
 > - [PowerVS cluster with external cloud provider](#deploy-a-powervs-cluster-with-external-cloud-provider)
 > - [PowerVS cluster with cluster class](#deploy-a-powervs-cluster-with-cluster-class)
@@ -40,7 +39,8 @@ following the steps below.
   **Replace the following snippet with the template of your choice.**
 
     > **Note:**
-    > The `IBMPOWERVS_IMAGE_ID` value below should reflect the ID of the custom image and the `kubernetes-version` value below should reflect the kubernetes version of the custom image.
+    > - Set `EXP_CLUSTER_RESOURCE_SET` to `true` as the cluster will be deployed with external cloud provider which will create the resources to run the cloud controller manager.
+    > - The `IBMPOWERVS_IMAGE_NAME` value below should reflect the name of the custom image and the `kubernetes-version` value below should reflect the kubernetes version of the custom image.
 
     ```console
     IBMPOWERVS_SSHKEY_NAME="my-pub-key" \
@@ -50,6 +50,10 @@ following the steps below.
     IBMPOWERVS_IMAGE_NAME="capibm-powervs-centos-streams8-1-26-2" \
     IBMPOWERVS_SERVICE_INSTANCE_ID="3229a94c-af54-4212-bf60-6202b6fd0a07" \
     IBMPOWERVS_NETWORK_NAME="capi-test" \
+    IBMACCOUNT_ID="ibm-accountid" \
+    IBMPOWERVS_REGION="osa" \
+    IBMPOWERVS_ZONE="osa21" \
+    BASE64_API_KEY=$(echo -n $IBMCLOUD_API_KEY | base64) \
     clusterctl generate cluster ibm-powervs-1 --kubernetes-version v1.26.2 \
     --target-namespace default \
     --control-plane-machine-count=3 \
@@ -131,31 +135,11 @@ following the steps below.
     ibm-powervs-1-md-0-4dc5c             Ready    <none>   41h   v1.26.2
     ibm-powervs-1-md-0-dbxb7             Ready    <none>   20h   v1.26.2
 
-### Deploy a PowerVS cluster with user provided resources
-
-  ```
-  IBMPOWERVS_SSHKEY_NAME="my-pub-key" \
-  IBMPOWERVS_VIP="192.168.167.6" \
-  IBMPOWERVS_VIP_EXTERNAL="163.68.65.6" \
-  IBMPOWERVS_VIP_CIDR="29" \
-  IBMPOWERVS_IMAGE_NAME="capibm-powervs-centos-streams8-1-26-2" \
-  IBMPOWERVS_SERVICE_INSTANCE_ID="3229a94c-af54-4212-bf60-6202b6fd0a07" \
-  IBMPOWERVS_NETWORK_NAME="capi-test" \
-  clusterctl generate cluster ibm-powervs-1 --kubernetes-version v1.26.2 \
-  --target-namespace default \
-  --control-plane-machine-count=3 \
-  --worker-machine-count=1 \
-  --flavor=powervs | kubectl apply -f -
-  ```
-
 ### Deploy a PowerVS cluster with infrastructure creation
 
 #### Prerequisites: 
-- Set `EXP_CLUSTER_RESOURCE_SET` to true as the cluster will be deployed with external cloud provider which will create the resources to run the cloud controller manager.
-- Set the `provider-id-fmt` [flag](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/5e7f80878f2252c6ab13c16102de90c784a2624d/main.go#L168-L173) to `v2` via `PROVIDER_ID_FORMAT` environment variable.
+- Set `EXP_CLUSTER_RESOURCE_SET` to `true` as the cluster will be deployed with external cloud provider which will create the resources to run the cloud controller manager.
 - Already existing infrasturcture resources can be used for cluster creation by setting either the ID or name in spec. If neither are specified, the cluster name will be used for constructing the resource name. For example, if cluster name is `capi-powervs`, PowerVS workspace will be created with name `capi-powervs-serviceInstance`.
-  ```
-  ```
 
   ```
     IBMCLOUD_API_KEY=XXXXXXXXXXXX \
@@ -179,8 +163,7 @@ following the steps below.
 ### Deploy a PowerVS cluster with external cloud provider
 
 #### Prerequisites:
-- Set `EXP_CLUSTER_RESOURCE_SET` to true as the cluster will be deployed with external cloud provider which will create the resources to run the cloud controller manager.
-- Set the `provider-id-fmt` [flag](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/5e7f80878f2252c6ab13c16102de90c784a2624d/main.go#L168-L173) to `v2` via `PROVIDER_ID_FORMAT` environment variable.
+- Set `EXP_CLUSTER_RESOURCE_SET` to `true` as the cluster will be deployed with external cloud provider which will create the resources to run the cloud controller manager.
 
   ```
   IBMPOWERVS_SSHKEY_NAME="my-pub-key" \
@@ -198,15 +181,14 @@ following the steps below.
   --target-namespace default \
   --control-plane-machine-count=3 \
   --worker-machine-count=1 \
-  --flavor=powervs-cloud-provider | kubectl apply -f -
+  --flavor=powervs | kubectl apply -f -
   ```
 
 ### Deploy a PowerVS cluster with cluster class
 
 #### Prerequisites:
 - To deploy a cluster using [ClusterClass](https://cluster-api.sigs.k8s.io/tasks/experimental-features/cluster-class/index.html), set `CLUSTER_TOPOLOGY` environment variable to `true`.
-- Set `EXP_CLUSTER_RESOURCE_SET` to true as the cluster will be deployed with external cloud provider which will create the resources to run the cloud controller manager.
-- Set the `provider-id-fmt` [flag](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/5e7f80878f2252c6ab13c16102de90c784a2624d/main.go#L168-L173) to `v2` via `PROVIDER_ID_FORMAT` environment variable.
+- Set `EXP_CLUSTER_RESOURCE_SET` to `true` as the cluster will be deployed with external cloud provider which will create the resources to run the cloud controller manager.
 
   ```
   IBMPOWERVS_CLUSTER_CLASS_NAME="powervs-cc" \

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

@@ -5,10 +5,9 @@ following the steps below.
 
 > **Note**:
 > 1. The cluster will be deployed with [cloud controller manager](https://kubernetes.io/docs/concepts/architecture/cloud-controller/)
-> 2. The [template](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/main/templates/cluster-template.yaml) uses the experimental feature gate [clusterresourceset](https://cluster-api.sigs.k8s.io/tasks/experimental-features/cluster-resource-set.html) which will create the necessary config map, secret and roles to run the cloud controller manager. Set `EXP_CLUSTER_RESOURCE_SET` to true.
-> 3. As a prerequisite, set the `provider-id-fmt` [flag](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/bfb33f159d5edd87dcbbb45942a6ffdc3aedb067/main.go#L137) to `v2` via `PROVIDER_ID_FORMAT` environment variable.
-> 4. To deploy a cluster using [ClusterClass](https://cluster-api.sigs.k8s.io/tasks/experimental-features/cluster-class/index.html), refer [here](#deploy-a-cluster-using-ibm-cloud-vpc-infrastructure-using-clusterclass). In additional to the above flags, set `CLUSTER_TOPOLOGY` environment variable to `true`. 
-> 5. The list of IBM Cloud VPC Regions and Zones can be found [here](../../reference/regions-zones-mapping.md).
+> 2. The [template](https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/blob/main/templates/cluster-template.yaml) uses the experimental feature gate [clusterresourceset](https://cluster-api.sigs.k8s.io/tasks/experimental-features/cluster-resource-set.html) which will create the necessary config map, secret and roles to run the cloud controller manager. Set `EXP_CLUSTER_RESOURCE_SET` to `true`.
+> 3. To deploy a cluster using [ClusterClass](https://cluster-api.sigs.k8s.io/tasks/experimental-features/cluster-class/index.html), refer [here](#deploy-a-cluster-using-ibm-cloud-vpc-infrastructure-using-clusterclass). In addition to the above flags, set `CLUSTER_TOPOLOGY` environment variable to `true`. 
+> 4. The list of IBM Cloud VPC Regions and Zones can be found [here](../../reference/regions-zones-mapping.md).
 
 
 1. Using clusterctl, render the yaml through templates and deploy the cluster

templates/README.md

@@ -20,15 +20,22 @@ clusterctl generate cluster ibm-vpc-1 --kubernetes-version v1.14.3 \
 
 ## Power VS
 
+> **Note:**
+> Set `EXP_CLUSTER_RESOURCE_SET` to true as the cluster will be deployed with external cloud provider which will create the resources to run the cloud controller manager.
+
 ```shell
-IBMPOWERVS_SSHKEY_NAME="mkumatag-pub-key" \
-IBMPOWERVS_VIP="192.168.150.125" \
-IBMPOWERVS_VIP_EXTERNAL="158.175.161.125" \
+IBMPOWERVS_SSHKEY_NAME="my-pub-key" \
+IBMPOWERVS_VIP="192.168.167.6" \
+IBMPOWERVS_VIP_EXTERNAL="163.68.65.6" \
 IBMPOWERVS_VIP_CIDR="29" \
-IBMPOWERVS_IMAGE_NAME="capibm-powervs-centos-8-1-22-4" \
-IBMPOWERVS_SERVICE_INSTANCE_ID="e449d86e-c3a0-4c07-959e-8557fdf55482" \
-IBMPOWERVS_NETWORK_NAME="capi-test-3" \
-clusterctl generate cluster ibm-powervs-1 --kubernetes-version v1.21.2 \
+IBMPOWERVS_IMAGE_NAME="capibm-powervs-centos-streams8-1-26-2" \
+IBMPOWERVS_SERVICE_INSTANCE_ID="3229a94c-af54-4212-bf60-6202b6fd0a07" \
+IBMPOWERVS_NETWORK_NAME="capi-test" \
+IBMACCOUNT_ID="ibm-accountid" \
+IBMPOWERVS_REGION="osa" \
+IBMPOWERVS_ZONE="osa21" \
+BASE64_API_KEY=$(echo -n $IBMCLOUD_API_KEY | base64) \
+clusterctl generate cluster ibm-powervs-1 --kubernetes-version v1.26.2 \
 --target-namespace default \
 --control-plane-machine-count=3 \
 --worker-machine-count=1 \