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

CLOUDDST-24254 : Merge index image failing with FBC operator present … #808

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

Conversation

ashwini3326
Copy link

This commit fix this bug by ignoring deprecation operators which are not available in database.
@release-engineering/exd-guild-hello-operator

@ashwini3326 ashwini3326 force-pushed the fix_merge_index_issue branch 2 times, most recently from c0ee208 to b803aa2 Compare February 5, 2025 03:11
@ashwini3326 ashwini3326 force-pushed the fix_merge_index_issue branch 4 times, most recently from 083f509 to 1b1b5de Compare February 6, 2025 11:25
@ashwini3326 ashwini3326 force-pushed the fix_merge_index_issue branch from 1b1b5de to a2c2e17 Compare February 7, 2025 17:15
@ashwini3326 ashwini3326 force-pushed the fix_merge_index_issue branch 2 times, most recently from 0cb3c3d to fcc9b6e Compare February 24, 2025 19:48
@ashwini3326
Copy link
Author

@lipoja @chandwanitulsi @xDaile PTAL

@ashwini3326 ashwini3326 force-pushed the fix_merge_index_issue branch from fcc9b6e to c57f6ed Compare March 3, 2025 12:59
@ashwini3326 ashwini3326 force-pushed the fix_merge_index_issue branch from c57f6ed to 57d860b Compare March 4, 2025 10:17
@ashwini3326 ashwini3326 requested a review from lipoja March 4, 2025 10:52
lipoja
lipoja previously approved these changes Mar 4, 2025
@yashvardhannanavati
Copy link
Collaborator

@ashwini3326 looks good! could you rebase the PR so we can merge it

Copy link
Contributor

@xDaile xDaile left a comment

Choose a reason for hiding this comment

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

Small comments, otherwise LGTM

@ashwini3326 ashwini3326 force-pushed the fix_merge_index_issue branch from 57d860b to 57f5bff Compare March 11, 2025 12:51
@xDaile
Copy link
Contributor

xDaile commented Mar 11, 2025

@ashwini3326 Do we need two commits here? Wouldn't one be enough?

@ashwini3326
Copy link
Author

@ashwini3326 Do we need two commits here? Wouldn't one be enough?

can't we squash the commits before merge?

@ashwini3326 ashwini3326 force-pushed the fix_merge_index_issue branch from 5549ce7 to d0174b4 Compare March 12, 2025 10:25
@JAVGan JAVGan force-pushed the fix_merge_index_issue branch 2 times, most recently from 1be54fe to 4aa9f73 Compare March 13, 2025 19:05
Ashwini Kumar added 3 commits March 14, 2025 18:23
@JAVGan JAVGan force-pushed the fix_merge_index_issue branch from 4aa9f73 to 550f23a Compare March 14, 2025 21:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants