Add new logic to support custom namespaces for both operator and applications #2216

CFSNM · 2025-02-06T13:13:31Z

Related ticket: https://issues.redhat.com/browse/RHOAIENG-18169

Adding new logic to support a custom namespace for the operator, and a custom namespace for the applications

openshift-ci · 2025-02-06T13:13:36Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: CFSNM

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

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

+
+    # Next step, add the label opendatahub.io/application-namespace: true to the namespace
+    ${add_label_rc} =    Run And Return Rc     oc label namespace ${namespace} opendatahub.io/application-namespace=true
+    IF   ${add_label_rc} == 0


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

+  # This is needed because by default, the DSCI is automatically created pointing to the default apps namespace.
+      Wait For DSCInitialization CustomResource To Be Ready    timeout=180
+      ${delete_dsci_rc} =    Run And Return Rc    oc delete DSCInitialization --all --ignore-not-found
+      IF   ${delete_dsci_rc} == 0


asanzgom · 2025-02-06T14:44:27Z

@CFSNM Can you provide a successful run of the whole Operator Test Suite, as this can have an impact on regression for RHOAI install?

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

CFSNM · 2025-02-06T14:46:52Z

@asanzgom Jenkins job running to test the 3 PRs together

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

ods_ci/tests/Resources/RHOSi.resource

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

+    ${rc}=    Run And Return Rc    oc get namespace ${namespace}
+    IF  ${rc} != ${0}
+         ${create_ns_rc} =    Run And Return Rc    oc create namespace ${namespace}
+         IF   ${create_ns_rc} == 0


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

+    [Documentation]    Configures a custom namespace to be able to be used as the ODH/RHOAI applications namespace.
+    ...                If this namespace does not exist, its created.
+    [Arguments]    ${namespace}
+    ${rc}=    Run And Return Rc    oc get namespace ${namespace}


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

+    ${rc}=    Run And Return Rc    oc get namespace ${namespace}
+    IF  ${rc} != ${0}
+        ${create_ns_rc} =    Run And Return Rc    oc create namespace ${namespace}
+        IF   ${create_ns_rc} == 0


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

+
+    # Next step, add the label opendatahub.io/application-namespace: true to the namespace
+    ${add_label_rc} =    Run And Return Rc     oc label namespace ${namespace} opendatahub.io/application-namespace=true
+    IF   ${add_label_rc} == 0


ods_ci/tests/Resources/RHOSi.resource

@@ -105,16 +105,17 @@

 Assign Vars According To Product
    [Documentation]    Assign vars related to product
+    # Common vars
+    Set Suite Variable    ${OPERATOR_SUBSCRIPTION_LABEL}     operators.coreos.com/rhods-operator.${OPERATOR_NAMESPACE}


ods_ci/tests/Resources/RHOSi.resource

@@ -105,16 +105,17 @@

 Assign Vars According To Product
    [Documentation]    Assign vars related to product
+    # Common vars
+    Set Suite Variable    ${OPERATOR_SUBSCRIPTION_LABEL}     operators.coreos.com/rhods-operator.${OPERATOR_NAMESPACE}


ods_ci/tests/Resources/RHOSi.resource

@@ -105,16 +105,17 @@

 Assign Vars According To Product
    [Documentation]    Assign vars related to product
+    # Common vars
+    Set Suite Variable    ${OPERATOR_SUBSCRIPTION_LABEL}     operators.coreos.com/rhods-operator.${OPERATOR_NAMESPACE}
+    Set Suite Variable    ${AUTHORINO_CR_NS}    ${APPLICATIONS_NAMESPACE}-auth-provider


ods_ci/tests/Resources/RHOSi.resource

@@ -105,16 +105,17 @@

 Assign Vars According To Product
    [Documentation]    Assign vars related to product
+    # Common vars
+    Set Suite Variable    ${OPERATOR_SUBSCRIPTION_LABEL}     operators.coreos.com/rhods-operator.${OPERATOR_NAMESPACE}
+    Set Suite Variable    ${AUTHORINO_CR_NS}    ${APPLICATIONS_NAMESPACE}-auth-provider


asanzgom · 2025-02-11T13:47:26Z

@CFSNM Can you specify the job and build number for a successful run?

CFSNM · 2025-02-11T14:09:45Z

@asanzgom this PR needs a jenkins PR too, and these ones are tested in a local jenkins instance, so cannot share any link :(

bdattoma · 2025-02-11T15:47:50Z

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

+      # If the applications namespace is not the default one, we need to add a new workflow where we need to wait the
+      # DSCI to be deleted and recreate it using the proper applications namespace.
+      # This is needed because by default, the DSCI is automatically created pointing to the default apps namespace.


does it mean the default namspaces get created regardless the user choice? would they be deleted afterwards?

they are created just if they are not the default ones. Then, they are deleted as part of the cleanup.sh script in the olminstall repo

I mean to say, even if the user is selecting some custom namespaces, the default ones get created in any case.

yeah, the default application namespace (redhat-ods-applications/opendatahub) is always created because we dont have the ability to let the operator know which namespace use when the DSCI is automatically created.

So, we need to delete the DSCI that is created by default, and create another one pointing to the custom apps namespace.

bdattoma · 2025-02-11T15:54:25Z

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

+      # and create if not prior to installing ODH/RHOAI. Adding a custom label for automation purposes.
+      Configure Custom Operator Namespace    ${OPERATOR_NAMESPACE}
+  END
+  IF   "${APPLICATIONS_NAMESPACE}" != "redhat-ods-applications" and "${APPLICATIONS_NAMESPACE}" != "opendatahub"


what about putting the default namespace names into constants?

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

 ${CUSTOM_MANIFESTS}=    ${EMPTY}

 *** Keywords ***
 Install RHODS
  [Arguments]  ${cluster_type}     ${image_url}
  Install Kserve Dependencies
  Clone OLM Install Repo
-  IF  "${PRODUCT}" == "ODH"
-      ${csv_display_name} =    Set Variable    ${ODH_CSV_DISPLAY}
+  IF   "${OPERATOR_NAMESPACE}" != "${DEFAULT_OPERATOR_NAMESPACE_RHOAI}" and "${OPERATOR_NAMESPACE}" != "${DEFAULT_OPERATOR_NAMESPACE_ODH}"


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

+      # and create if not prior to installing ODH/RHOAI. Adding a custom label for automation purposes.
+      Configure Custom Operator Namespace    ${OPERATOR_NAMESPACE}
+  END
+  IF   "${APPLICATIONS_NAMESPACE}" != "${DEFAULT_APPLICATIONS_NAMESPACE_RHOAI}" and "${APPLICATIONS_NAMESPACE}" != "${DEFAULT_APPLICATIONS_NAMESPACE_ODH}"


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

-            ${timeout_in_seconds} =   Set Variable   180
-        ELSE
-            ${timeout_in_seconds} =   Set Variable   60
+  IF   "${APPLICATIONS_NAMESPACE}" != "${DEFAULT_APPLICATIONS_NAMESPACE_RHOAI}" and "${APPLICATIONS_NAMESPACE}" != "${DEFAULT_APPLICATIONS_NAMESPACE_ODH}"


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

@@ -191,7 +217,7 @@
     Log  Verified Monitoring NS: ${MONITORING_NAMESPACE}  console=yes
  END

-Verify Builds In redhat-ods-applications
+Verify Builds In Application Namespace


…ator and applications

sonarqubecloud · 2025-02-12T10:35:09Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

CFSNM self-assigned this Feb 6, 2025

CFSNM marked this pull request as draft February 6, 2025 13:13

openshift-ci bot added the do-not-merge/work-in-progress label Feb 6, 2025

github-advanced-security bot found potential problems Feb 6, 2025

View reviewed changes

CFSNM force-pushed the support_custom_namespaces branch from a784c53 to d9d3e5a Compare February 6, 2025 13:51

github-advanced-security bot found potential problems Feb 6, 2025

View reviewed changes

CFSNM force-pushed the support_custom_namespaces branch 5 times, most recently from 15f9f45 to cfd3f2e Compare February 6, 2025 13:59

CFSNM marked this pull request as ready for review February 6, 2025 14:41

openshift-ci bot removed the do-not-merge/work-in-progress label Feb 6, 2025

CFSNM force-pushed the support_custom_namespaces branch from cfd3f2e to 1ac1f60 Compare February 6, 2025 14:41

CFSNM requested review from MarianMacik and asanzgom February 6, 2025 14:42

CFSNM force-pushed the support_custom_namespaces branch from 1ac1f60 to 28bb90e Compare February 6, 2025 14:46

github-advanced-security bot found potential problems Feb 6, 2025

View reviewed changes

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot Fixed Show fixed Hide fixed

CFSNM force-pushed the support_custom_namespaces branch from 28bb90e to 0465efa Compare February 6, 2025 15:12

github-advanced-security bot found potential problems Feb 6, 2025

View reviewed changes

CFSNM force-pushed the support_custom_namespaces branch from 0465efa to 23a0158 Compare February 6, 2025 15:16

github-advanced-security bot found potential problems Feb 6, 2025

View reviewed changes

CFSNM force-pushed the support_custom_namespaces branch 2 times, most recently from c07322b to 365043e Compare February 6, 2025 15:28

github-advanced-security bot found potential problems Feb 6, 2025

View reviewed changes

CFSNM force-pushed the support_custom_namespaces branch 2 times, most recently from 43d6dd8 to ab064be Compare February 7, 2025 14:36

CFSNM force-pushed the support_custom_namespaces branch 3 times, most recently from 9b6ae93 to 8c7f45a Compare February 10, 2025 12:08

github-advanced-security bot found potential problems Feb 10, 2025

View reviewed changes

ods_ci/tests/Resources/RHOSi.resource Fixed Show fixed Hide fixed

ods_ci/tests/Resources/RHOSi.resource Fixed Show fixed Hide fixed

ods_ci/tests/Resources/RHOSi.resource Fixed Show fixed Hide fixed

ods_ci/tests/Resources/RHOSi.resource Fixed Show fixed Hide fixed

CFSNM force-pushed the support_custom_namespaces branch 5 times, most recently from 1820fe3 to 22ee8c7 Compare February 10, 2025 13:24

github-advanced-security bot found potential problems Feb 10, 2025

View reviewed changes

CFSNM force-pushed the support_custom_namespaces branch from 22ee8c7 to 5c52f63 Compare February 10, 2025 14:26

github-advanced-security bot found potential problems Feb 10, 2025

View reviewed changes

CFSNM force-pushed the support_custom_namespaces branch 3 times, most recently from f892fb4 to 5f49a27 Compare February 11, 2025 10:35

github-advanced-security bot found potential problems Feb 11, 2025

View reviewed changes

CFSNM force-pushed the support_custom_namespaces branch 3 times, most recently from fed72c5 to 7b6b9fd Compare February 11, 2025 11:03

CFSNM added the verified This PR has been tested with Jenkins label Feb 11, 2025

bdattoma reviewed Feb 11, 2025

View reviewed changes

CFSNM force-pushed the support_custom_namespaces branch from 7b6b9fd to 9d7e266 Compare February 12, 2025 09:43

github-advanced-security bot found potential problems Feb 12, 2025

View reviewed changes

CFSNM requested a review from bdattoma February 12, 2025 09:47

enhancement: add new logic to support custom namespaces for both oper…

d53b44e

…ator and applications

CFSNM force-pushed the support_custom_namespaces branch from 9d7e266 to d53b44e Compare February 12, 2025 10:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add new logic to support custom namespaces for both operator and applications #2216

Add new logic to support custom namespaces for both operator and applications #2216

CFSNM commented Feb 6, 2025

openshift-ci bot commented Feb 6, 2025

asanzgom commented Feb 6, 2025

CFSNM commented Feb 6, 2025

asanzgom commented Feb 11, 2025

CFSNM commented Feb 11, 2025

bdattoma Feb 11, 2025

CFSNM Feb 11, 2025

bdattoma Feb 11, 2025

CFSNM Feb 12, 2025

bdattoma Feb 11, 2025

CFSNM Feb 12, 2025

sonarqubecloud bot commented Feb 12, 2025

Add new logic to support custom namespaces for both operator and applications #2216

Are you sure you want to change the base?

Add new logic to support custom namespaces for both operator and applications #2216

Conversation

CFSNM commented Feb 6, 2025

openshift-ci bot commented Feb 6, 2025

asanzgom commented Feb 6, 2025

CFSNM commented Feb 6, 2025

asanzgom commented Feb 11, 2025

CFSNM commented Feb 11, 2025

bdattoma Feb 11, 2025

Choose a reason for hiding this comment

CFSNM Feb 11, 2025

Choose a reason for hiding this comment

bdattoma Feb 11, 2025

Choose a reason for hiding this comment

CFSNM Feb 12, 2025

Choose a reason for hiding this comment

bdattoma Feb 11, 2025

Choose a reason for hiding this comment

CFSNM Feb 12, 2025

Choose a reason for hiding this comment

sonarqubecloud bot commented Feb 12, 2025

Quality Gate passed