Skip to content

Commit 908c3a5

Browse files
authored
Remove Serverless and ServiceMesh as dependency operator (#2692)
Remove Serverless and ServiceMesh as dependency operators This reapplies the changes that were lost during the merge with master. The operators are no longer needed as dependencies for RHOAI 3.0. Signed-off-by: Arthy Loganathan <[email protected]>
1 parent df8c2a1 commit 908c3a5

File tree

1 file changed

+4
-58
lines changed

1 file changed

+4
-58
lines changed

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

Lines changed: 4 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ ${DSCI_NAME} = default-dsci
2121
... modelregistry
2222
... feastoperator
2323
... llamastackoperator
24-
${SERVERLESS_OP_NAME}= serverless-operator
25-
${SERVERLESS_SUB_NAME}= serverless-operator
26-
${SERVERLESS_NS}= openshift-serverless
27-
${SERVICEMESH_OP_NAME}= servicemeshoperator
28-
${SERVICEMESH_SUB_NAME}= servicemeshoperator
24+
${LWS_OP_NAME}= leader-worker-set
25+
${LWS_OP_NS}= openshift-lws-operator
26+
${LWS_SUB_NAME}= leader-worker-set
27+
${LWS_CHANNEL_NAME}= stable-v1.0
2928
${OPENSHIFT_OPERATORS_NS}= openshift-operators
3029
${COMMUNITY_OPERATORS_NS}= openshift-marketplace
3130
${COMMUNITY_OPERATORS_CS}= community-operators
@@ -83,7 +82,6 @@ Install RHODS
8382
Log Start installing RHOAI with:\n\- cluster type: ${cluster_type}\n\- image_url: ${image_url}\n\- update_channel: ${UPDATE_CHANNEL} console=yes #robocop:disable
8483
Log \- rhoai_version: ${rhoai_version}\n\- is_upgrade: ${is_upgrade}\n\- install_plan_approval: ${install_plan_approval}\n\- CATALOG_SOURCE: ${CATALOG_SOURCE} console=yes #robocop:disable
8584
Assign Vars According To Product
86-
Install Rhoai Dependencies
8785
${enable_new_observability_stack} = Is New Observability Stack Enabled
8886
IF ${enable_new_observability_stack}
8987
Install Observability Dependencies
@@ -682,58 +680,6 @@ Install Kueue Dependencies
682680
Install Cert Manager Operator Via Cli
683681
Install Kueue Operator Via Cli
684682

685-
Install Service Mesh Operator Via Cli
686-
[Documentation] Install Service Mesh Operator Via CLI
687-
${is_installed} = Check If Operator Is Installed Via CLI ${SERVICEMESH_OP_NAME}
688-
IF not ${is_installed}
689-
Install ISV Operator From OperatorHub Via CLI operator_name=${SERVICEMESH_OP_NAME}
690-
... subscription_name=${SERVICEMESH_SUB_NAME}
691-
... catalog_source_name=redhat-operators
692-
Wait Until Operator Subscription Last Condition Is
693-
... type=CatalogSourcesUnhealthy status=False
694-
... reason=AllCatalogSourcesHealthy subscription_name=${SERVICEMESH_SUB_NAME}
695-
... retry=150
696-
Wait For Pods To Be Ready label_selector=name=istio-operator
697-
... namespace=${OPENSHIFT_OPERATORS_NS}
698-
ELSE
699-
Log To Console message=Service Mesh Operator is already installed
700-
END
701-
702-
Install Serverless Operator Via Cli
703-
[Documentation] Install Serverless Operator Via CLI
704-
${is_installed} = Check If Operator Is Installed Via CLI ${SERVERLESS_OP_NAME}
705-
IF not ${is_installed}
706-
${rc} ${out} = Run And Return Rc And Output oc create namespace ${SERVERLESS_NS}
707-
Install ISV Operator From OperatorHub Via CLI operator_name=${SERVERLESS_OP_NAME}
708-
... namespace=${SERVERLESS_NS}
709-
... subscription_name=${SERVERLESS_SUB_NAME}
710-
... catalog_source_name=redhat-operators
711-
... operator_group_name=serverless-operators
712-
... operator_group_ns=${SERVERLESS_NS}
713-
... operator_group_target_ns=${NONE}
714-
Wait Until Operator Subscription Last Condition Is
715-
... type=CatalogSourcesUnhealthy status=False
716-
... reason=AllCatalogSourcesHealthy subscription_name=${SERVERLESS_SUB_NAME}
717-
... namespace=${SERVERLESS_NS}
718-
... retry=150
719-
Wait For Pods To Be Ready label_selector=name=knative-openshift
720-
... namespace=${SERVERLESS_NS}
721-
Wait For Pods To Be Ready label_selector=name=knative-openshift-ingress
722-
... namespace=${SERVERLESS_NS}
723-
Wait For Pods To Be Ready label_selector=name=knative-operator
724-
... namespace=${SERVERLESS_NS}
725-
ELSE
726-
Log To Console message=Serverless Operator is already installed
727-
END
728-
729-
Install Rhoai Dependencies
730-
[Documentation] Install Dependent Operators For Rhoai
731-
Set Suite Variable ${FILES_RESOURCES_DIRPATH} tests/Resources/Files
732-
Set Suite Variable ${SUBSCRIPTION_YAML_TEMPLATE_FILEPATH} ${FILES_RESOURCES_DIRPATH}/isv-operator-subscription.yaml
733-
Set Suite Variable ${OPERATORGROUP_YAML_TEMPLATE_FILEPATH} ${FILES_RESOURCES_DIRPATH}/isv-operator-group.yaml
734-
Install Service Mesh Operator Via Cli
735-
Install Serverless Operator Via Cli
736-
737683
Install Cluster Observability Operator Via Cli
738684
[Documentation] Install Cluster Observability Operator Via CLI
739685
${is_installed} = Check If Operator Is Installed Via CLI ${CLUSTER_OBS_OP_NAME}

0 commit comments

Comments
 (0)