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

bundle: adjust for Konflux onboarding, 2.8 #2322

Open
wants to merge 6 commits into
base: rhoai-2.8
Choose a base branch
from

Conversation

ykaliuta
Copy link

@ykaliuta ykaliuta commented Jan 29, 2025

Jira: https://issues.redhat.com/browse/RHOAIENG-18669

For CSV Take CPaaS manifests and remove template variables
For other manifests, fetch minor differences from CPaaS

Description

How Has This Been Tested?

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

@ykaliuta ykaliuta force-pushed the jira-rhoaieng-18669-konflux-2.8 branch from c81528e to 59c1069 Compare January 29, 2025 16:44
@ykaliuta ykaliuta marked this pull request as draft January 29, 2025 17:12
@ykaliuta ykaliuta force-pushed the jira-rhoaieng-18669-konflux-2.8 branch from 59c1069 to 52f6709 Compare February 10, 2025 17:16
@ykaliuta
Copy link
Author

Will it be what is expected in the final result? That moment, when it should be squashed :)

@ykaliuta ykaliuta marked this pull request as ready for review February 11, 2025 08:54
@@ -1,27 +0,0 @@
apiVersion: v1
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we deleted this file? 🤔

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's in Jira request. How is that supposed to be used? Our manager is configured with command line as a part of Deployment in CSV, isn't it?

I see mounts of manager-config ConfigMap in some other manifests, but not redhat-ods-operator-manager-config

@dchourasia

Copy link

@zdtsw zdtsw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one comments for the CM file, otherwise LGTM

@ykaliuta
Copy link
Author

/cc @dchourasia

ykaliuta added 6 commits March 5, 2025 13:15
Prepare for konflux build. Since the latest shipped version is in
CPaaS, sync with it.

kueue: default Removed
trustyai: deprecated

Signed-off-by: Yauheni Kaliuta <[email protected]>
Prepare for konflux build. Since the latest shipped version is in
CPaaS, sync with it.

descriptions: add final periods
servicemesh: default Managed
customCABundle: required

Signed-off-by: Yauheni Kaliuta <[email protected]>
Prepare for konflux build.

Signed-off-by: Yauheni Kaliuta <[email protected]>
Prepare for konflux build.

Signed-off-by: Yauheni Kaliuta <[email protected]>
Prepare for konflux build.

Sync with CPaaS.

Commit CPaaS version as is before adjusting to konflux.

Signed-off-by: Yauheni Kaliuta <[email protected]>
Replace variables values with placehoulders
- name (rhods-operator.NAME)
- containerImage (REPLACE_IMAGE:latest)
- createdAt (REPLACE_DATE)
- version (REPLACE_VERSION)
- image (REPLACE_IMAGE:latest)

Remove "RELATED_IMAGE*" environment variables.
Remove images from annotations.
Removed fields:
- replaces
- olm.skipRange

Signed-off-by: Yauheni Kaliuta <[email protected]>
@ykaliuta ykaliuta force-pushed the jira-rhoaieng-18669-konflux-2.8 branch from 52f6709 to 9d1d4a3 Compare March 5, 2025 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants