Bump default channel to v4.6 and increase waiting time (#1879)

Signed-off-by: YuChen <[email protected]>

cp3pt0-deployment/common/utils.sh

@@ -483,7 +483,7 @@ function wait_for_operator_upgrade() {
     local install_mode=$4
     local condition="${OC} get subscription.operators.coreos.com -l operators.coreos.com/${package_name}.${namespace}='' -n ${namespace} -o yaml -o jsonpath='{.items[*].status.installedCSV}' | grep -w $channel"
 
-    local retries=10
+    local retries=20
     local sleep_time=30
     local total_time_mins=$(( sleep_time * retries / 60))
     local wait_message="Waiting for operator ${package_name} to be upgraded"

cp3pt0-deployment/migrate_tenant.sh

@@ -18,7 +18,7 @@ OPERATOR_NS=""
 SERVICES_NS=""
 NS_LIST=""
 CONTROL_NS=""
-CHANNEL="v4.5"
+CHANNEL="v4.6"
 ODLM_CHANNEL="v4.3"
 MAINTAINED_CHANNEL="v4.2"
 SOURCE="opencloud-operators"
@@ -273,7 +273,7 @@ function print_usage() {
     echo "   --enable-license-service-reporter  Optional. Set this flag to migrate ibm-license-service-reporter"
     echo "   --lsr-source string                Optional. CatalogSource name of ibm-license-service-reporter-operator. This assumes your CatalogSource is already created. Default is ibm-license-service-reporter-bundle-catalog"
     echo "   --lsr-namespace                    Optional. Namespace to migrate License Service Reporter. Default is ibm-lsr"
-    echo "   -c, --channel string               Optional. Channel for Subscription(s). Default is v4.5"   
+    echo "   -c, --channel string               Optional. Channel for Subscription(s). Default is v4.6"   
     echo "   -i, --install-mode string          Optional. InstallPlan Approval Mode. Default is Automatic. Set to Manual for manual approval mode"
     echo "   -s, --source string                Optional. CatalogSource name. This assumes your CatalogSource is already created. Default is opencloud-operators"
     echo "   -v, --debug integer                Optional. Verbosity of logs. Default is 0. Set to 1 for debug logs."

cp3pt0-deployment/setup_tenant.sh

@@ -17,7 +17,7 @@ YQ=yq
 ENABLE_LICENSING=0
 MINIMAL_RBAC_ENABLED=0
 MINIMAL_RBAC=""
-CHANNEL="v4.5"
+CHANNEL="v4.6"
 MAINTAINED_CHANNEL="v4.2"
 SOURCE="opencloud-operators"
 SOURCE_NS="openshift-marketplace"
@@ -170,7 +170,7 @@ function print_usage() {
     echo "   --license-accept               Required. Set this flag to accept the license agreement"
     echo "   --enable-private-catalog       Optional. Set this flag to use namespace scoped CatalogSource. Default is in openshift-marketplace namespace"
     echo "   --with-minimal-rbac string     Optional. Provide "skip" or file path to the minimal RBAC permissions required by the namespace scope operator for all to be deployed services"
-    echo "   -c, --channel string           Optional. Channel for Subscription(s). Default is v4.5"
+    echo "   -c, --channel string           Optional. Channel for Subscription(s). Default is v4.6"
     echo "   -i, --install-mode string      Optional. InstallPlan Approval Mode. Default is Automatic. Set to Manual for manual approval mode"
     echo "   -s, --source string            Optional. CatalogSource name. This assumes your CatalogSource is already created. Default is opencloud-operators"
     echo "   -n, --namespace string         Optional. Namespace of CatalogSource. Default is openshift-marketplace"

isolate.sh

@@ -583,7 +583,7 @@ function export_k8s_list_yaml() {
 function check_CSCR() {
     local ns=$1
 
-    local retries=30
+    local retries=60
     local sleep_time=15
     local total_time_mins=$(( sleep_time * retries / 60))
     info "Waiting for IBM Common Services CR is Succeeded"
@@ -962,7 +962,7 @@ function patch_opconfig_for_management_ingress() {
         "${YQ}" -i eval '(.spec.services[] |= select(.name == "ibm-management-ingress-operator").spec.managementIngress.multipleInstancesEnabled = false)' tmp_oc_cr.yaml
     fi
 
-    local retries=10
+    local retries=12
     local sleep_time=5
     local total_time_mins=$(( sleep_time * retries / 60))
     local wait_message="Waiting for operandconfig common-service in namespace ${MASTER_NS} to be updated for management ingress CR ..."
@@ -1022,7 +1022,7 @@ function wait_for_cs_cr_exist() {
 
 function wait_for_opconfig_exist() {
     local condition="${OC} get operandconfig common-service -n ${MASTER_NS} --ignore-not-found || true"
-    local retries=20
+    local retries=60
     local sleep_time=10
     local total_time_mins=$(( sleep_time * retries / 60))
     local wait_message="Waiting for operandconfig common-service in namespace ${MASTER_NS} to be created ..."