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

MGMT-19860: Revert remove dependencies from OpenShift AI operator #7342

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

jhernand
Copy link
Contributor

@jhernand jhernand commented Feb 24, 2025

This reverts commit 03c6b94 because we need to keep the server backwards compatible with the old version of the UI.

Version 2.37 of the UI doesn't support the concept of operator bundles yet, and we need to coexist with it for a while, as it may take up to one week till it is deployed to production. During that time the OpenShift AI operator won't work correctly because it won't automatically add the dependencies that it needs. On the other hand wwhen the new UI is deployed we will need to disable that. To make that possible this patch adds a new OPENSHIFT_AI_SUPPORT_UI_2_37
environment variable that will be set to true go support the old version of the UI, or to false to support the new version. By defalt it is set to true, so initially nothing needs to be changed. But when the new version of the UI is deployed the configuration will need to be changed.

List all the issues related to this PR

https://issues.redhat.com/browse/MGMT-19860

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see CONTRIBUTING guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

…penshift#7274)"

This reverts commit 03c6b94 because we
need to keep the server backwards compatible with the old version of the
UI.
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 24, 2025

@jhernand: This pull request references MGMT-19860 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

This reverts commit 03c6b94 because we need to keep the server backwards compatible with the old version of the UI.

List all the issues related to this PR

https://issues.redhat.com/browse/MGMT-19860

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see CONTRIBUTING guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 24, 2025
@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 24, 2025
Copy link

openshift-ci bot commented Feb 24, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhernand

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 Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 24, 2025
Version 2.37 of the UI doesn't support the concept of operator bundles
yet, and we need to coexist with it for a while, as it may take up to
one week till it is deployed to production. During that time the
OpenShift AI operator won't work correctly because it won't
automatically add the dependencies that it needs. On the other hand
wwhen the new UI is deployed we will need to disable that. To make that
possible this patch adds a new `OPENSHIFT_AI_SUPPORT_UI_2_37`
environment variable that will be set to `true` go support the old
version of the UI, or to `false` to support the new version. By defalt
it is set to `true`, so initially nothing needs to be changed. But when
the new version of the UI is deployed the configuration will need to be
changed.

Related: https://issues.redhat.com/browse/MGMT-19860
Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 24, 2025

@jhernand: This pull request references MGMT-19860 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

This reverts commit 03c6b94 because we need to keep the server backwards compatible with the old version of the UI.

Version 2.37 of the UI doesn't support the concept of operator bundles yet, and we need to coexist with it for a while, as it may take up to one week till it is deployed to production. During that time the OpenShift AI operator won't work correctly because it won't automatically add the dependencies that it needs. On the other hand wwhen the new UI is deployed we will need to disable that. To make that possible this patch adds a new OPENSHIFT_AI_SUPPORT_UI_2_37
environment variable that will be set to true go support the old version of the UI, or to false to support the new version. By defalt it is set to true, so initially nothing needs to be changed. But when the new version of the UI is deployed the configuration will need to be changed.

List all the issues related to this PR

https://issues.redhat.com/browse/MGMT-19860

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see CONTRIBUTING guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Copy link

codecov bot commented Feb 24, 2025

Codecov Report

Attention: Patch coverage is 30.00000% with 35 lines in your changes missing coverage. Please review.

Project coverage is 67.92%. Comparing base (39bc1ae) to head (f8e5de6).

Files with missing lines Patch % Lines
...nal/operators/openshiftai/openshift_ai_operator.go 30.00% 35 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7342      +/-   ##
==========================================
- Coverage   67.97%   67.92%   -0.05%     
==========================================
  Files         300      300              
  Lines       41014    41063      +49     
==========================================
+ Hits        27878    27894      +16     
- Misses      10633    10667      +34     
+ Partials     2503     2502       -1     
Files with missing lines Coverage Δ
...nal/operators/openshiftai/openshift_ai_operator.go 49.72% <30.00%> (-7.74%) ⬇️

... and 1 file with indirect coverage changes

@AlonaKaplan
Copy link
Contributor

/hold
There is a chance we have a way to deploy BE and UI together. In that case we won't need this workaround. We are investigating it.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2025
Copy link

openshift-ci bot commented Feb 24, 2025

@jhernand: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-agent-compact-ipv4 f8e5de6 link true /test e2e-agent-compact-ipv4
ci/prow/okd-scos-e2e-aws-ovn f8e5de6 link false /test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@AlonaKaplan
Copy link
Contributor

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2025
@AlonaKaplan
Copy link
Contributor

After a long discussion with the OCM team, we cannot control the UI deployment timing to OCM.

@AlonaKaplan
Copy link
Contributor

/hold
holding again, we will continue the discussion with the OCM team tomorrow.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants