Enhance image building instructions (#1167)

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

Author: Prajyot-Parab

docs/book/src/developer/build-images.md

@@ -1,11 +1,27 @@
 # How to build the machine boot images
 
 ## VPC
-TO-DO
 
-## Power VS
+- [Building CAPI Images for IBMCLOUD (CAPIBM) VPC](https://image-builder.sigs.k8s.io/capi/providers/ibmcloud.html#capibm---vpc)
 
-Compose the `user-varibales.json` file contains the information for the Power VS
+### Example
+
+To build an image using a specific version of Kubernetes use the "PACKER_FLAGS" environment variable like in the example below:
+
+```shell
+# Clone the image-builder repository
+$ git clone https://github.com/kubernetes-sigs/image-builder.git
+$ cd image-builder/images/capi
+$ PACKER_FLAGS="--var 'kubernetes_rpm_version=1.26.2-0' --var 'kubernetes_semver=v1.26.2' --var 'kubernetes_series=v1.26' --var 'kubernetes_deb_version=1.26.2-00'" make build-qemu-ubuntu-2004
+```
+
+## PowerVS
+
+- [Building CAPI Images for IBMCLOUD (CAPIBM) PowerVS](https://image-builder.sigs.k8s.io/capi/providers/ibmcloud.html#capibm---powervs)
+
+### Example
+
+Compose the `user-variables.json` file containing the information for the PowerVS
 
 ```json
 {
@@ -29,23 +45,23 @@ Compose the `user-varibales.json` file contains the information for the Power VS
 
 - `account_id`: IBM Cloud account ID
 - `apikey`: IBM Cloud API Key
-- `capture_cos_access_key`: Access key for the IBM Cloud Object Storage(COS) to export the image to
+- `capture_cos_access_key`: IBM Cloud Object Storage(COS) access key where the image will be exported
 - `capture_cos_bucket`: IBM Cloud Object Storage(COS) bucket name
 - `capture_cos_region`: IBM Cloud Object Storage(COS) bucket region
 - `capture_cos_secret_key`: IBM Cloud Object Storage(COS) secret key
-- `key_pair_name`: SSH key name present in the Power VS
+- `key_pair_name`: SSH key name present in the PowerVS
 - `kubernetes_deb_version`: Kubernetes deb version, e.g: 1.24.2-00
 - `kubernetes_rpm_version`: Kubernetes RPM package version, e.g: 1.24.2-0
 - `kubernetes_semver`: e.g: v1.24.2
 - `kubernetes_series`: e.g: v1.24
-- `region`: Power VS region, e.g: osa
-- `service_instance_id`: Power VS service instance ID
+- `region`: PowerVS region, e.g: osa
+- `service_instance_id`: PowerVS service instance ID
 - `ssh_private_key_file`: Path to the SSH private key file used to connect to the vm while image preparation, e.g: /Users/manjunath/.ssh/id_rsa
-- `zone`: Power VS zone, e.g: osa21
+- `zone`: PowerVS zone, e.g: osa21
 
 ```shell
 # Clone the image-builder repository
 $ git clone https://github.com/kubernetes-sigs/image-builder.git
 $ cd image-builder/images/capi
-$ PACKER_VAR_FILES=user-variables.json make build-powervs-centos-8
+$ ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa" PACKER_VAR_FILES=user-variables.json make build-powervs-centos-8
 ```

docs/book/src/machine-images/powervs.md

@@ -1,4 +1,4 @@
-# Power VS Images
+# PowerVS Images
 
 
 | Region   | Bucket           | Object                                                          | Kubernetes Version |
@@ -10,7 +10,7 @@
 | us-south | power-oss-bucket | [capibm-powervs-centos-streams8-1-23-5.ova.gz][streams8-1-23-5] | 1.23.5             |
 | us-south | power-oss-bucket | [capibm-powervs-centos-streams8-1-22-4.ova.gz][streams8-1-22-4] | 1.22.4             |
 
-Note: These images are built using the [image-builder][image-builder] tool and more information can be found [here](../developer/build-images.md#power-vs)
+Note: These images are built using the [image-builder][image-builder] tool and more information can be found [here](../developer/build-images.md#powervs)
 
 [streams8-1-26-2]: https://power-oss-bucket.s3.us-south.cloud-object-storage.appdomain.cloud/capibm-powervs-centos-streams8-1-26-2.ova.gz
 [streams8-1-25-6]: https://power-oss-bucket.s3.us-south.cloud-object-storage.appdomain.cloud/capibm-powervs-centos-streams8-1-25-6.ova.gz

docs/book/src/machine-images/vpc.md

@@ -7,7 +7,7 @@
 | us-south | power-oss-bucket | [capibm-vpc-ubuntu-2004-kube-v1-25-6.qcow2][kube-1-25-6] | 1.25.6             |
 | us-south | power-oss-bucket | [capibm-vpc-ubuntu-2004-kube-v1-25-2.qcow2][kube-1-25-2] | 1.25.2             |
 
-Note: These images are built using the [image-builder][image-builder] tool and more information can be found [here](../topics/vpc/prerequisites.html#build-workload-cluster-image)
+Note: These images are built using the [image-builder][image-builder] tool and more information can be found [here](../developer/build-images.md#vpc)
 
 [kube-1-26-2]: https://power-oss-bucket.s3.us-south.cloud-object-storage.appdomain.cloud/capibm-vpc-ubuntu-2004-kube-v1-26-2.qcow2
 [kube-1-25-6]: https://power-oss-bucket.s3.us-south.cloud-object-storage.appdomain.cloud/capibm-vpc-ubuntu-2004-kube-v1-25-6.qcow2

docs/book/src/topics/vpc/prerequisites.md

@@ -11,8 +11,10 @@
 
 ### Build workload cluster image:
 
-1. Build a qcow2 image suitable for use as a Kubernetes cluster machine as detailed in the image builder [book](https://image-builder.sigs.k8s.io/capi/providers/raw.html).
+1. Build a qcow2 image suitable for use as a Kubernetes cluster machine as detailed in the image builder [book](https://image-builder.sigs.k8s.io/capi/providers/ibmcloud.html#capibm---vpc).
 
     **Note:** Rename the output image to add the `.qcow2` extension. This is required by the next step.
 
+    For more information about the images can be found at [machine-images](../../machine-images/vpc.md) section
+
 2. Upload the VPC Gen2 custom image to IBM Cloud following [this section](uploading-an-image.md) or the detailed explainations in the VPC [documentation](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images).

docs/book/src/topics/vpc/uploading-an-image.md

@@ -1,7 +1,7 @@
 # Uploading an image to the IBM Cloud
 
 Build the Ubuntu image as described in the previous [VPC section](prerequisites.md).
-Make sure to build the qcow2 version by following the instructions for [raw image build](https://image-builder.sigs.k8s.io/capi/providers/raw.html).
+Make sure to build the qcow2 version by following the instructions for [ibmcloud vpc image build](https://image-builder.sigs.k8s.io/capi/providers/ibmcloud.html#capibm---vpc).
 
 Since the IBM Cloud does not support dots before the qcow2 extension, rename the file as follows:
 ```console