[minor] Add support for OCP 4.13, OCP 4.14 and remove support for OCP…

… 4.10 (#700)

Co-authored-by: Daniel Istrate <[email protected]>

docs/commands/mirror-redhat-images.md

@@ -21,7 +21,7 @@ Usage
 - `--pullsecret REDHAT_PULLSECRET` [Red Hat OpenShift Pull Secret](https://console.redhat.com/openshift/install/pull-secret)
 
 ### Content Selection (Optional):
-- `--release OCP_RELEASE` OCP Release to mirror content for (e.g. 4.10, 4.12)
+- `--release OCP_RELEASE` OCP Release to mirror content for (e.g. 4.13, 4.14)
 
 ### Platform Version Range (Optional):
 - `--min-version OCP_MIN_VERSION` Minimum version of the OCP release to mirror
@@ -112,6 +112,6 @@ docker run -ti --rm -v /mnt/storage:/mnt/workspace --pull always quay.io/ibmmas/
   -u admin -p password \
   --mirror-platform \
   --mirror-operators \
-  --ocp-release 4.10 \
+  --ocp-release 4.14 \
   --no-confirm
 ```

docs/commands/provision-fyre.md

@@ -13,7 +13,7 @@ Usage
 - `-p|--product-id FYRE_PRODUCT_ID` FYRE product group ID that will own the cluster
 - `-q|--quota-type FYRE_QUOTA_TYPE` Declare the quota to use when provisioning the cluster ("quick_burn" or "product_group")
 - `-c|--cluster-name CLUSTER_NAME` Name of the cluster to be provisioned (lowercase only)
-- `-v|--ocp-version OCP_VERSION` OCP version to use (e.g 4.8, 4.10)
+- `-v|--ocp-version OCP_VERSION` OCP version to use (e.g 4.13, 4.14)
 - `-d|--description FYRE_DESCRIPTION` Description of the OCP cluster
 
 ### Worker Node Configuration
@@ -41,7 +41,7 @@ export FYRE_APIKEY=xxx
 docker run -ti --rm --pull always quay.io/ibmmas/cli mas provision-fyre \
   -u $FYRE_USERNAME -a $FYRE_APIKEY \
   -p 225 -q product_group \
-  -c masonfyre -d "My Cluster" -v 4.10 \
+  -c masonfyre -d "My Cluster" -v 4.14 \
   --worker-count 3 --worker-cpu 8 --worker-memory 32 \
   --no-confirm
 ```

docs/commands/provision-roks.md

@@ -11,7 +11,7 @@ Usage
 ### Cluster Configuration
 - `-r|--resource-group IBMCLOUD_RESOURCEGROUP` IBMCloud resource group to deploy the cluster in
 - `-c|--cluster-name CLUSTER_NAME` Name of the cluster to be provisioned
-- `-v|--ocp-version OCP_VERSION` OCP version to use (e.g 4.8_openshift, 4.10_openshift)
+- `-v|--ocp-version OCP_VERSION` OCP version to use (e.g 4.13_openshift, 4.14_openshift)
 
 ### Worker Node Configuration
 - `--worker-count ROKS_WORKERS` Number of worker nodes to provision
@@ -40,7 +40,7 @@ docker run -ti --rm --pull always quay.io/ibmmas/cli mas provision-roks
 export IBMCLOUD_APIKEY=xxx
 docker run -ti --rm --pull always quay.io/ibmmas/cli mas provision-roks \
   -a $IBMCLOUD_APIKEY -r mas-development \
-  -c masonroks -v 4.10_openshift \
+  -c masonroks -v 4.14_openshift \
   --worker-count 3 --worker-flavor b3c.16x64.300gb --worker-zone dal10 \
   --no-confirm
 ```

image/cli/mascli/functions/help/mirror_redhat_help

@@ -23,7 +23,7 @@ Red Hat Image Pull Secret (Required):
       --pullsecret ${COLOR_YELLOW}REDHAT_PULLSECRET${TEXT_RESET}              Red Hat OpenShift Pull Secret (https://console.redhat.com/openshift/install/pull-secret)
 
 Content Selection (Required):
-      --release ${COLOR_YELLOW}OCP_RELEASE${TEXT_RESET}                       OCP Release to mirror content for (e.g. 4.10, 4.12)
+      --release ${COLOR_YELLOW}OCP_RELEASE${TEXT_RESET}                       OCP Release to mirror content for (e.g. 4.13, 4.14)
 
 Platform Version Range (Required when mirroring the platform):
       --min-version ${COLOR_YELLOW}OCP_MIN_VERSION${TEXT_RESET}               Minimum version of the OCP release to mirror

image/cli/mascli/functions/mirror_redhat

@@ -144,18 +144,26 @@ function mirror_redhat_interactive() {
   echo "${TEXT_DIM}IBM Maximo Application Suite currently supports Red Hat OpenShift Container Platform v4.11 and v4.12, select the release to mirror content for:"
 
   echo "Supported OCP Releases:"
-  echo "  1) 4.12"
-  echo "  2) 4.11"
+  echo "  1) 4.14"
+  echo "  2) 4.13"
+  echo "  3) 4.12"
+  echo "  4) 4.11"
   reset_colors
 
   echo
   prompt_for_input "Select OCP Release" OCP_RELEASE_SELECTION "1"
 
   case $OCP_RELEASE_SELECTION in
     1)
-      OCP_RELEASE=4.12
+      OCP_RELEASE=4.14
       ;;
     2)
+      OCP_RELEASE=4.13
+      ;;
+    3)
+      OCP_RELEASE=4.12
+      ;;
+    4)
       OCP_RELEASE=4.11
       ;;
     *)

image/cli/mascli/functions/provision_aws

@@ -15,7 +15,7 @@ AWS Credentials (Required):
 
 Cluster Configuration (Required):
   -c, --cluster-name ${COLOR_YELLOW}CLUSTER_NAME${TEXT_RESET}               Name of the cluster to be provisioned
-  -v, --ocp-version ${COLOR_YELLOW}OCP_VERSION${TEXT_RESET}                 OCP version to use (e.g 4.8_openshift, 4.10_openshift)
+  -v, --ocp-version ${COLOR_YELLOW}OCP_VERSION${TEXT_RESET}                 OCP version to use (e.g 4.13_openshift, 4.14_openshift)
 
 IPI Configuration (Required):
   -r, --region-name ${COLOR_YELLOW}IPI_REGION${TEXT_RESET}                  Region of the cluster to be provisioned (e.g. us-east-1, us-east-2)
@@ -137,12 +137,12 @@ function provision_aws_interactive() {
   # prompt_ocp_version                  # OCP_VERSION
   echo
   echo "OCP Version:"
-  echo "  1. 4.10 (MAS 8.9-8.10)"
+  echo "  1. 4.14 (MAS 8.10-8.11)"
   prompt_for_input "Select Version" OCP_VERSION_SELECTION "1"
 
   case $OCP_VERSION_SELECTION in
-    1|4.10)
-      export OCP_VERSION=latest-4.10
+    1|4.14)
+      export OCP_VERSION=latest-4.14
       ;;
     *)
       export OCP_VERSION=$OCP_VERSION_SELECTION

image/cli/mascli/functions/provision_fyre

@@ -18,7 +18,7 @@ Cluster Configuration (Required):
   -p, --product-id ${COLOR_YELLOW}FYRE_PRODUCT_ID${TEXT_RESET}        FYRE product group ID that will own the cluster
   -q, --quota-type ${COLOR_YELLOW}FYRE_QUOTA_TYPE${TEXT_RESET}        Declare the quota to use when provisioning the cluster ("quick_burn" or "product_group")
   -c, --cluster-name ${COLOR_YELLOW}CLUSTER_NAME${TEXT_RESET}         Name of the cluster to be provisioned (lowercase only)
-  -v, --ocp-version ${COLOR_YELLOW}OCP_VERSION${TEXT_RESET}           OCP version to use (e.g 4.8, 4.10)
+  -v, --ocp-version ${COLOR_YELLOW}OCP_VERSION${TEXT_RESET}           OCP version to use (e.g 4.13, 4.14)
   -d, --description ${COLOR_YELLOW}FYRE_DESCRIPTION${TEXT_RESET}      Description of the OCP cluster
   -l, --location ${COLOR_YELLOW}FYRE_SITE${TEXT_RESET}                FYRE site where cluster will be provisioned (default is svl)
 
@@ -129,16 +129,16 @@ function provision_fyre_interactive() {
 
   echo
   echo "OCP Version:"
-  echo "  1. 4.10 (MAS 8.9-8.10)"
-  echo "  2. 4.12 (MAS 8.10-8.11)"
+  echo "  1. 4.12 (MAS 8.9-8.10)"
+  echo "  2. 4.14 (MAS 8.10-8.11)"
   prompt_for_input "Select Version" OCP_VERSION_SELECTION "1"
 
   case $OCP_VERSION_SELECTION in
-    1|4.10)
-      export OCP_VERSION=4.10
+    1|4.12)
+      export OCP_VERSION=4.12
       ;;
-    2|4.12)
-      export OCP_VERSION=4.12.22
+    2|4.14)
+      export OCP_VERSION=4.14.12
       ;;
     *)
       # Print out a warning as there could be a typo

image/cli/mascli/functions/provision_roks

@@ -15,7 +15,7 @@ IBMCloud Credentials (Required):
 Cluster Configuration (Required):
   -r, --resource-group ${COLOR_YELLOW}IBMCLOUD_RESOURCEGROUP${TEXT_RESET}   IBMCloud resource group to deploy the cluster in
   -c, --cluster-name ${COLOR_YELLOW}CLUSTER_NAME${TEXT_RESET}               Name of the cluster to be provisioned
-  -v, --ocp-version ${COLOR_YELLOW}OCP_VERSION${TEXT_RESET}                 OCP version to use (e.g 4.8_openshift, 4.10_openshift)
+  -v, --ocp-version ${COLOR_YELLOW}OCP_VERSION${TEXT_RESET}                 OCP version to use (e.g 4.13_openshift, 4.14_openshift)
 
 Worker Node Configuration (Required):
       --worker-count ${COLOR_YELLOW}ROKS_WORKERS${TEXT_RESET}               Number of worker nodes to provision
@@ -123,12 +123,12 @@ function provision_roks_interactive() {
 
   echo
   echo "OCP Version:"
-  echo "  1. 4.10 (MAS 8.9-8.10)"
+  echo "  1. 4.14 (MAS 8.10-8.11)"
   prompt_for_input "Select Version" OCP_VERSION_SELECTION "1"
 
   case $OCP_VERSION_SELECTION in
-    1|4.10)
-      export OCP_VERSION=4.10_openshift
+    1|4.14)
+      export OCP_VERSION=4.14_openshift
       ;;
 
     *)