Update references to OCP 4.9

Signed-off-by: Yussuf Shaikh <[email protected]>

README.md

@@ -16,12 +16,14 @@ This project leverages the helpernode [ansible playbook](https://github.com/RedH
 
 ## Before You Start
 
+This branch must be used with OCP 4.9.x versions only.
+
 The [main](https://github.com/ocp-power-automation/ocp4-upi-powervs/tree/master) branch must be used with latest OCP pre-release versions only. 
 Ensure you checkout the correct `release-VERSION` branch depending on the version (4.5, 4.6 ...) of RedHat OpenShift you want to install:
 
-For example to use OCP 4.8 perform the following
+For example to use OCP 4.9 perform the following
 ```
-export VERSION=4.8
+export VERSION=4.9
 git clone --single-branch --branch release-$VERSION https://github.com/ocp-power-automation/ocp4-upi-powervs.git
 ```
 

docs/ocp_prereqs_powervs.md

@@ -203,9 +203,9 @@ Further, the image disk should be minimum of 120 GB in size.
 - Qcow2 Image Links
   - RHEL 8.3 Qcow2 image is available from the following [link](https://access.redhat.com/downloads/content/279/ver=/rhel---8/8.3/ppc64le/product-software)
   - CentOS 8.3 Wcow2 image is available from the following [link](https://cloud.centos.org/centos/8/ppc64le/images/CentOS-8-GenericCloud-8.3.2011-20201204.2.ppc64le.qcow2)
-  - RHCOS Qcow2 image is available from the following [link](https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.6/latest/rhcos-4.6.1-ppc64le-openstack.ppc64le.qcow2.gz)
+  - RHCOS Qcow2 image is available from the following [link](https://mirror.openshift.com/pub/openshift-v4/ppc64le/dependencies/rhcos/4.9/latest/rhcos-openstack.ppc64le.qcow2.gz)
 
-Note: RHCOS image version is tied to the specific OCP release. For example RHCOS-4.6 image needs to be used for OCP 4.6 release.
+Note: RHCOS image version is tied to the specific OCP release. For example RHCOS-4.9 image needs to be used for OCP 4.9 release.
 ### Uploading to IBM Cloud Object Storage
 
 - **Create IBM Cloud Object Storage service and bucket**

docs/quickstart.md

@@ -202,12 +202,12 @@ $ scp -r -i data/id_rsa [email protected]:~/openstack-upi/auth/\* .
 
 OpenShift CLI `oc` can be downloaded from the following links. Use the one specific to your client system architecture.
 
-- [Mac OSX](https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest/openshift-client-mac.tar.gz)
-- [Linux (x86_64)](https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest/openshift-client-linux.tar.gz)
-- [Windows](https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest/openshift-client-windows.zip)
+- [Mac OSX](https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable-4.9/openshift-client-mac.tar.gz)
+- [Linux (x86_64)](https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable-4.9/openshift-client-linux.tar.gz)
+- [Windows](https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable-4.9/openshift-client-windows.zip)
 
 Download the specific file, extract it and place the binary in a directory that is on your `PATH`
-For more details check the following [link](https://docs.openshift.com/container-platform/4.6/cli_reference/openshift_cli/getting-started-cli.html)
+For more details check the following [link](https://docs.openshift.com/container-platform/4.9/cli_reference/openshift_cli/getting-started-cli.html)
 
 The CLI login URL `oc_server_url` will be printed at the end of successful install.
 Alternatively you can retrieve it anytime by running `terraform output oc_server_url` from the install directory.
@@ -230,11 +230,11 @@ To further debug and diagnose cluster problems, use 'kubectl cluster-info dump'
 
 $ oc get nodes
 NAME       STATUS   ROLES    AGE   VERSION
-master-0   Ready    master   11h   v1.19.0+43983cd
-master-1   Ready    master   11h   v1.19.0+43983cd
-master-2   Ready    master   11h   v1.19.0+43983cd
-worker-0   Ready    worker   11h   v1.19.0+43983cd
-worker-1   Ready    worker   11h   v1.19.0+43983cd
+master-0   Ready    master   11h   v1.22.0+894a78b
+master-1   Ready    master   11h   v1.22.0+894a78b
+master-2   Ready    master   11h   v1.22.0+894a78b
+worker-0   Ready    worker   11h   v1.22.0+894a78b
+worker-1   Ready    worker   11h   v1.22.0+894a78b
 ```
 
 >**Note:** The OpenShift command-line client `oc` is already configured on the bastion node with kubeconfig placed at `~/.kube/config`.

docs/var.tfvars-doc.md

@@ -114,7 +114,7 @@ Here are some examples to help you understand the relationship.
   ```
 
 These set of variables specify the RHEL and RHCOS boot image names. These images should have been already imported in your PowerVS service instance.
-Change the image names according to your environment. Ensure that you use the correct RHCOS image specific to the pre-release version
+Change the image names according to your environment. Ensure that you use the correct RHCOS image specific to the release version.
 ```
 rhel_image_name     = "<rhel_or_centos_image-name>"
 rhcos_image_name    = "<rhcos-image-name>"
@@ -178,11 +178,11 @@ rhel_smt                    = 4
 ### OpenShift Installation Details
 
 These variables specify the URL for the OpenShift installer and client binaries.
-Change the URL to the specific pre-release version that you want to install on PowerVS.
-Reference link - `https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp-dev-preview`
+Change the URL to the specific release version that you want to install on PowerVS.
+Reference link - `https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp`
 ```
-openshift_install_tarball   = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp-dev-preview/latest/openshift-install-linux.tar.gz"
-openshift_client_tarball    = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp-dev-preview/latest/openshift-client-linux.tar.gz"
+openshift_install_tarball   = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.9/openshift-install-linux.tar.gz"
+openshift_client_tarball    = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.9/openshift-client-linux.tar.gz"
 ```
 
 This variable specifies the OpenShift pull secret. This is available from the following link -  https://cloud.redhat.com/openshift/install/power/user-provisioned
@@ -299,7 +299,7 @@ This variable specifies the external DNS servers to forward DNS queries that can
 dns_forwarders              = "1.1.1.1; 9.9.9.9"
 ```
 
-List of [day-1 kernel arguments](https://docs.openshift.com/container-platform/4.8/installing/install_config/installing-customizing.html#installation-special-config-kargs_installing-customizing) for the cluster nodes.
+List of [day-1 kernel arguments](https://docs.openshift.com/container-platform/4.9/installing/install_config/installing-customizing.html#installation-special-config-kargs_installing-customizing) for the cluster nodes.
 To add kernel arguments to master or worker nodes, using MachineConfig object and inject that object into the set of manifest files used by Ignition during cluster setup.
 ```
 rhcos_pre_kernel_options        = []
@@ -309,7 +309,8 @@ rhcos_pre_kernel_options        = []
   rhcos_pre_kernel_options   = ["rd.multipath=default","root=/dev/disk/by-label/dm-mpath-root"]
   ```
 
-List of [kernel arguments](https://docs.openshift.com/container-platform/4.4/nodes/nodes/nodes-nodes-working.html#nodes-nodes-kernel-arguments_nodes-nodes-working) for the cluster nodes.
+
+List of [kernel arguments](https://docs.openshift.com/container-platform/4.9/nodes/nodes/nodes-nodes-working.html#nodes-nodes-kernel-arguments_nodes-nodes-working) for the cluster nodes.
 Note that this will be applied after the cluster is installed and all the nodes are in `Ready` status.
 ```
 rhcos_kernel_options        = []

var.tfvars

@@ -21,7 +21,7 @@ worker    = { memory = "32", processors = "0.5", "count" = 2 }
 #worker    = { memory = "32", processors = "0.5", "count" = 2, data_volume_count  = 0, data_volume_size  = 100 }
 
 rhel_image_name  = "rhel-8.3"
-rhcos_image_name = "rhcos-4.6"
+rhcos_image_name = "rhcos-4.9"
 
 ### Provide these parameters if RHCOS image needs to be imported from public bucket of cloud object storage to PVS. 
 ### When this is provided, data provided through parameter "rhcos_image_name" will be ignored.
@@ -45,8 +45,8 @@ rhel_smt                        = 4
 
 ### OpenShift Installation Details
 
-openshift_install_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp-dev-preview/latest/openshift-install-linux.tar.gz"
-openshift_client_tarball  = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp-dev-preview/latest/openshift-client-linux.tar.gz"
+openshift_install_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.9/openshift-install-linux.tar.gz"
+openshift_client_tarball  = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.9/openshift-client-linux.tar.gz"
 pull_secret_file          = "data/pull-secret.txt"
 
 cluster_domain    = "ibm.com"  #Set domain to nip.io or xip.io if you prefer using online wildcard domain and avoid modifying /etc/hosts

variables.tf

@@ -130,7 +130,7 @@ variable "rhel_image_name" {
 variable "rhcos_image_name" {
   type        = string
   description = "Name of the RHCOS image that you want to use for OCP nodes"
-  default     = "rhcos-4.6"
+  default     = "rhcos-4.9"
 }
 
 variable "processor_type" {
@@ -422,12 +422,12 @@ locals {
 ################################################################
 variable "openshift_install_tarball" {
   type    = string
-  default = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp-dev-preview/latest/openshift-install-linux.tar.gz"
+  default = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.9/openshift-install-linux.tar.gz"
 }
 
 variable "openshift_client_tarball" {
   type    = string
-  default = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp-dev-preview/latest/openshift-client-linux.tar.gz"
+  default = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.9/openshift-client-linux.tar.gz"
 }
 
 variable "release_image_override" {