Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

init: import code from rhods-operator 2.15 + new commits for 2.16 from incubation #1309

Merged
merged 20 commits into from
Nov 4, 2024

Conversation

zdtsw
Copy link
Member

@zdtsw zdtsw commented Oct 18, 2024

Description

apart from listed jira,

Jira list
to fix:
https://issues.redhat.com/browse/RHOAIENG-14768
https://issues.redhat.com/browse/RHOAIENG-14120
including:

How Has This Been Tested?

local build: quay.io/wenzhou/rhods-operator-catalog:v2.16.14768-2
install catalogsource
run e2e

go test ./tests/e2e/ -run ^TestOdhOperator -v --operator-namespace=redhat-ods-operator "--skip-deletion=true" -timeout 10m
=== RUN   TestOdhOperator
=== RUN   TestOdhOperator/validate_operator_pod_is_running
=== RUN   TestOdhOperator/validate_operator_pod_is_running/validate_RHOAI_Operator_pod
=== RUN   TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator
=== RUN   TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator/Validate_DSC_CRD
=== PAUSE TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator/Validate_DSC_CRD
=== RUN   TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator/Validate_DSCI_CRD
=== PAUSE TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator/Validate_DSCI_CRD
=== RUN   TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator/Validate_FeatureTracker_CRD
=== PAUSE TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator/Validate_FeatureTracker_CRD
=== CONT  TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator/Validate_DSC_CRD
=== CONT  TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator/Validate_FeatureTracker_CRD
=== CONT  TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator/Validate_DSCI_CRD
=== RUN   TestOdhOperator/create_Opendatahub_components
    helper_test.go:408: Ensuring serverless-operator is installed
    helper_test.go:408: Ensuring servicemeshoperator is installed
DEBUG WEN Subscription servicemeshoperator created
DEBUG WEN Subscription serverless-operator created
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Creation_of_DSCI_CR
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Creation_of_more_than_one_of_DSCInitialization_instance
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_DSCInitialization_instance
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Check_owned_namespaces_exist
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Creation_of_DataScienceCluster_instance
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Creation_of_more_than_one_of_DataScienceCluster_instance
2024-11-02T17:50:52+01:00       INFO    KubeAPIWarningLogger    unknown field "spec.components.codeflare.component"
2024-11-02T17:50:52+01:00       INFO    KubeAPIWarningLogger    unknown field "spec.components.dashboard.component"
2024-11-02T17:50:52+01:00       INFO    KubeAPIWarningLogger    unknown field "spec.components.datasciencepipelines.component"
2024-11-02T17:50:52+01:00       INFO    KubeAPIWarningLogger    unknown field "spec.components.kserve.component"
2024-11-02T17:50:52+01:00       INFO    KubeAPIWarningLogger    unknown field "spec.components.kueue.component"
2024-11-02T17:50:52+01:00       INFO    KubeAPIWarningLogger    unknown field "spec.components.modelmeshserving.component"
2024-11-02T17:50:52+01:00       INFO    KubeAPIWarningLogger    unknown field "spec.components.modelregistry.component"
2024-11-02T17:50:52+01:00       INFO    KubeAPIWarningLogger    unknown field "spec.components.ray.component"
2024-11-02T17:50:52+01:00       INFO    KubeAPIWarningLogger    unknown field "spec.components.trainingoperator.component"
2024-11-02T17:50:52+01:00       INFO    KubeAPIWarningLogger    unknown field "spec.components.trustyai.component"
2024-11-02T17:50:52+01:00       INFO    KubeAPIWarningLogger    unknown field "spec.components.workbenches.component"
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_Ownerrefrences_exist
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_dashboard
=== PAUSE TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_dashboard
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_workbenches
=== PAUSE TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_workbenches
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_model-mesh
=== PAUSE TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_model-mesh
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_data-science-pipelines-operator
=== PAUSE TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_data-science-pipelines-operator
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_kserve
=== PAUSE TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_kserve
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_kueue
=== PAUSE TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_kueue
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_codeflare
=== PAUSE TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_codeflare
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_ray
=== PAUSE TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_ray
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_trustyai
=== PAUSE TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_trustyai
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_trainingoperator
=== PAUSE TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_trainingoperator
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_model-registry-operator
=== PAUSE TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_model-registry-operator
=== CONT  TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_dashboard
=== CONT  TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_codeflare
=== CONT  TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_data-science-pipelines-operator
=== CONT  TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_kueue
=== CONT  TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_model-mesh
=== CONT  TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_model-registry-operator
=== CONT  TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_kserve
=== CONT  TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_workbenches
=== CONT  TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_trustyai
=== CONT  TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_trainingoperator
=== CONT  TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_ray
2024/11/02 17:52:23 waiting for component deployments to be in Ready state: notebook-controller-deployment
2024/11/02 17:52:33 waiting for component deployments to be in Ready state: etcd
2024/11/02 17:52:43 waiting for component deployments to be in Ready state: etcd
2024/11/02 17:52:53 waiting for component deployments to be in Ready state: etcd
2024/11/02 17:53:13 waiting for component deployments to be in Ready state: data-science-pipelines-operator-controller-manager
2024/11/02 17:54:13 waiting for component deployments to be in Ready state: kserve-controller-manager
2024/11/02 17:54:23 waiting for component deployments to be in Ready state: kserve-controller-manager
2024/11/02 17:54:43 waiting for component deployments to be in Ready state: kueue-controller-manager
2024/11/02 17:55:03 waiting for component deployments to be in Ready state: codeflare-operator-manager
2024/11/02 17:55:23 waiting for component deployments to be in Ready state: trustyai-service-operator-controller-manager
2024/11/02 17:55:23 waiting for component deployments to be in Ready state: kuberay-operator
2024/11/02 17:55:33 waiting for component deployments to be in Ready state: trustyai-service-operator-controller-manager
2024/11/02 17:55:33 waiting for component deployments to be in Ready state: kuberay-operator
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_DSC_Ready
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_Knative_resoruce
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_default_certs_available
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_model_registry_cert_config
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_default_model_registry_cert_available
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_model_registry_servicemeshmember_available
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_Controller_reconcile
=== RUN   TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_Component_Enabled_field
--- PASS: TestOdhOperator (497.23s)
    --- PASS: TestOdhOperator/validate_operator_pod_is_running (21.31s)
        --- PASS: TestOdhOperator/validate_operator_pod_is_running/validate_RHOAI_Operator_pod (10.73s)
        --- PASS: TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator (0.00s)
            --- PASS: TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator/Validate_FeatureTracker_CRD (10.48s)
            --- PASS: TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator/Validate_DSCI_CRD (10.48s)
            --- PASS: TestOdhOperator/validate_operator_pod_is_running/validate_CRDs_owned_by_the_operator/Validate_DSC_CRD (10.58s)
    --- PASS: TestOdhOperator/create_Opendatahub_components (475.91s)
        --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc (434.94s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Creation_of_DSCI_CR (10.60s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Creation_of_more_than_one_of_DSCInitialization_instance (0.30s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_DSCInitialization_instance (0.00s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Check_owned_namespaces_exist (0.20s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Creation_of_DataScienceCluster_instance (10.62s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Creation_of_more_than_one_of_DataScienceCluster_instance (0.27s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_Ownerrefrences_exist (0.17s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components (60.21s)
                --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_model-registry-operator (0.11s)
                --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_dashboard (0.11s)
                --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_trainingoperator (0.11s)
                --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_workbenches (40.23s)
                --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_model-mesh (70.23s)
                --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_data-science-pipelines-operator (90.12s)
                --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_kserve (160.12s)
                --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_kueue (180.12s)
                --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_codeflare (200.12s)
                --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_trustyai (230.12s)
                --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_all_deployed_components/Validate_ray (230.12s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_DSC_Ready (0.17s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_Knative_resoruce (0.00s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_default_certs_available (0.74s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_model_registry_cert_config (0.37s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_default_model_registry_cert_available (0.00s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_model_registry_servicemeshmember_available (0.00s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_Controller_reconcile (40.48s)
            --- PASS: TestOdhOperator/create_Opendatahub_components/e2e-test-dsc/Validate_Component_Enabled_field (80.47s)
PASS
ok      github.com/opendatahub-io/opendatahub-operator/v2/tests/e2e     497.242s

Screenshot or short clip

Merge criteria

  • You have read the contributors guide.
  • Commit messages are meaningful - have a clear and concise summary and detailed explanation of what was changed and why.
  • Pull Request contains a description of the solution, a link to the JIRA issue, and to any dependent or related Pull Request.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

Signed-off-by: Wen Zhou <[email protected]>
Copy link

codecov bot commented Oct 18, 2024

Codecov Report

Attention: Patch coverage is 20.35088% with 227 lines in your changes missing coverage. Please review.

Please upload report for BASE (rhoai@4d7e041). Learn more about missing BASE report.

Files with missing lines Patch % Lines
...atasciencecluster/datasciencecluster_controller.go 0.00% 169 Missing ⚠️
.../dscinitialization/dscinitialization_controller.go 50.00% 48 Missing and 10 partials ⚠️
Additional details and impacted files
@@           Coverage Diff            @@
##             rhoai    #1309   +/-   ##
========================================
  Coverage         ?   19.04%           
========================================
  Files            ?       30           
  Lines            ?     3308           
  Branches         ?        0           
========================================
  Hits             ?      630           
  Misses           ?     2609           
  Partials         ?       69           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Wen Zhou <[email protected]>
@VaishnaviHire
Copy link
Member

@zdtsw I think we also need to add rhoai to openshift-ci config to run rhoai tests

@zdtsw
Copy link
Member Author

zdtsw commented Oct 22, 2024

@zdtsw I think we also need to add rhoai to openshift-ci config to run rhoai tests

yes, i am prepare for openshift-ci on this branch

@VaishnaviHire
Copy link
Member

/test all

@zdtsw zdtsw force-pushed the rhoai_215 branch 2 times, most recently from f9a7ffe to 41a46c8 Compare October 24, 2024 16:09
@zdtsw
Copy link
Member Author

zdtsw commented Oct 25, 2024

/test ci-index

mlassak and others added 3 commits October 28, 2024 09:45
…o#1281)

* update: remove dsp with v1(tekton)backend related code

- images
- tekton rbac
- descriptions

Signed-off-by: Wen Zhou <[email protected]>
Co-authored-by: Humair Khan <[email protected]>

---------

Signed-off-by: Wen Zhou <[email protected]>
Co-authored-by: Humair Khan <[email protected]>
(cherry picked from commit 133b710)
@zdtsw zdtsw changed the title init: import code from rhods-operator 2.15 init: import code from rhods-operator 2.15 + new commits after 2.15 from incubation Oct 28, 2024
zdtsw and others added 2 commits October 28, 2024 09:59
Signed-off-by: Wen Zhou <[email protected]>
Co-authored-by: ajaypratap003 <[email protected]>
(cherry picked from commit 511977e)
* chore: Tidy run-nowebhook recipe

The suggestion to tidy up the run-nowebhook recipe comes from this
conversation:
https://github.com/opendatahub-io/opendatahub-operator/pull/1304/files#r1806731373

* chore: Make `clean` a PHONY target

I believe `clean` should be a PHONY target, since it doesn't create a
file called `clean`

(cherry picked from commit b91bd29)
@zdtsw zdtsw changed the title init: import code from rhods-operator 2.15 + new commits after 2.15 from incubation init: import code from rhods-operator 2.15 + new commits for 2.16 from incubation Oct 28, 2024
@VaishnaviHire
Copy link
Member

/test all

1 similar comment
@VaishnaviHire
Copy link
Member

/test all

@zdtsw
Copy link
Member Author

zdtsw commented Oct 31, 2024

/test opendatahub-operator-e2e

zdtsw and others added 2 commits October 31, 2024 16:42
-  we should watch IngressController from operator.openshift.io, not the k8s ingress
-  this matched the cache we added in main

Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit 8ea9ea0)
* chore(linter): update golangci-lint to v1.61.0

* chore(linter): fix findings

(cherry picked from commit 87c87ab)
@zdtsw
Copy link
Member Author

zdtsw commented Nov 1, 2024

finally! 😂

@VaishnaviHire
Copy link
Member

@zdtsw Update in deployment name to match with cpaas-midstream will be included in follow up PR?

@zdtsw
Copy link
Member Author

zdtsw commented Nov 1, 2024

@zdtsw Update in deployment name to match with cpaas-midstream will be included in follow up PR?

updated in new commit, let e2e run and see how it goes

- this only apply for deplenet odh-model-controller
- no need to set it in the default map, a waste

Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit 1f5af72)
@VaishnaviHire
Copy link
Member

Thanks for the changes!

/lgtm

Copy link

openshift-ci bot commented Nov 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: VaishnaviHire

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@openshift-ci openshift-ci bot added the approved label Nov 4, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit a9422e8 into opendatahub-io:rhoai Nov 4, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants