[patch] Add options for OCP 4.15 (#1147)

Co-authored-by: David Parker <[email protected]>
ibm-mas · Aug 12, 2024 · 6c28889 · 6c28889
1 parent 0e02e6c
commit 6c28889
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 19 deletions.
diff --git a/docs/commands/mirror-redhat-images.md b/docs/commands/mirror-redhat-images.md
@@ -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.14 \
+  --ocp-release 4.15 \
   --no-confirm
 ```
diff --git a/docs/commands/provision-fyre.md b/docs/commands/provision-fyre.md
@@ -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.14 \
+  -c masonfyre -d "My Cluster" -v 4.15 \
   --worker-count 3 --worker-cpu 8 --worker-memory 32 \
   --no-confirm
 ```
diff --git a/docs/commands/provision-roks.md b/docs/commands/provision-roks.md
@@ -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.14_openshift \
+  -c masonroks -v 4.15_openshift \
   --worker-count 3 --worker-flavor b3c.16x64.300gb --worker-zone dal10 \
   --no-confirm
 ```
diff --git a/image/cli/mascli/functions/mirror_redhat b/image/cli/mascli/functions/mirror_redhat
@@ -144,27 +144,27 @@ 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.14"
-  echo "  2) 4.13"
-  echo "  3) 4.12"
-  echo "  4) 4.11"
+  echo "  1) 4.15"
+  echo "  2) 4.14"
+  echo "  3) 4.13"
+  echo "  4) 4.12"
   reset_colors
 
   echo
   prompt_for_input "Select OCP Release" OCP_RELEASE_SELECTION "1"
 
   case $OCP_RELEASE_SELECTION in
     1)
-      OCP_RELEASE=4.14
+      OCP_RELEASE=4.15
       ;;
     2)
-      OCP_RELEASE=4.13
+      OCP_RELEASE=4.14
       ;;
     3)
-      OCP_RELEASE=4.12
+      OCP_RELEASE=4.13
       ;;
     4)
-      OCP_RELEASE=4.11
+      OCP_RELEASE=4.12
       ;;
     *)
       echo_warning "Invalid selection"

diff --git a/image/cli/mascli/functions/provision_aws b/image/cli/mascli/functions/provision_aws
@@ -137,11 +137,15 @@ function provision_aws_interactive() {
   # prompt_ocp_version                  # OCP_VERSION
   echo
   echo "OCP Version:"
-  echo "  1. 4.14 (MAS 8.10-8.11)"
+  echo "  1. 4.15 (MAS 8.10-9.0)"
+  echo "  2. 4.14 (MAS 8.10-9.0)"
   prompt_for_input "Select Version" OCP_VERSION_SELECTION "1"
 
   case $OCP_VERSION_SELECTION in
-    1|4.14)
+    1|4.15)
+      export OCP_VERSION=latest-4.15
+      ;;
+    2|4.14)
       export OCP_VERSION=latest-4.14
       ;;
     *)

diff --git a/image/cli/mascli/functions/provision_fyre b/image/cli/mascli/functions/provision_fyre
@@ -131,13 +131,13 @@ function provision_fyre_interactive() {
 
   echo
   echo "OCP Version:"
-  echo "  1. 4.12 (MAS 8.9-8.10)"
-  echo "  2. 4.14 (MAS 8.10-8.11)"
+  echo "  1. 4.15 (MAS 8.10-9.0)"
+  echo "  2. 4.14 (MAS 8.10-9.0)"
   prompt_for_input "Select Version" OCP_VERSION_SELECTION "1"
 
   case $OCP_VERSION_SELECTION in
-    1|4.12)
-      export OCP_VERSION=4.12
+    1|4.15)
+      export OCP_VERSION=4.15
       ;;
     2|4.14)
       export OCP_VERSION=4.14

diff --git a/image/cli/mascli/functions/provision_roks b/image/cli/mascli/functions/provision_roks
@@ -123,11 +123,15 @@ function provision_roks_interactive() {
 
   echo
   echo "OCP Version:"
-  echo "  1. 4.14 (MAS 8.10-8.11)"
+  echo "  1. 4.15 (MAS 8.10-9.0)"
+  echo "  2. 4.14 (MAS 8.10-9.0)"
   prompt_for_input "Select Version" OCP_VERSION_SELECTION "1"
 
   case $OCP_VERSION_SELECTION in
-    1|4.14)
+    1|4.15)
+      export OCP_VERSION=4.15_openshift
+      ;;
+    2|4.14)
       export OCP_VERSION=4.14_openshift
       ;;