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

fix: update logic to preserve k8s specific labels & annotations #819

Merged
merged 1 commit into from
Dec 5, 2024

Conversation

svghadi
Copy link
Member

@svghadi svghadi commented Dec 5, 2024

What type of PR is this?
/kind bug

What does this PR do / why we need it:
Pull argoproj-labs/argocd-operator#1616 fix into gitops-operator
https://issues.redhat.com/browse/GITOPS-5976

Signed-off-by: Siddhesh Ghadi <[email protected]>
@openshift-ci openshift-ci bot added the kind/bug Something isn't working label Dec 5, 2024
@openshift-ci openshift-ci bot requested review from sbose78 and varshab1210 December 5, 2024 13:44
Copy link
Collaborator

@ishitasequeira ishitasequeira left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@svghadi
Copy link
Member Author

svghadi commented Dec 5, 2024

/retest

@anandf
Copy link
Member

anandf commented Dec 5, 2024

/approve

Copy link

openshift-ci bot commented Dec 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anandf, ishitasequeira

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 Dec 5, 2024
@svghadi
Copy link
Member Author

svghadi commented Dec 5, 2024

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit 1a02aef into redhat-developer:v1.15 Dec 5, 2024
20 checks passed
@svghadi svghadi deleted the reg-fix branch December 6, 2024 01:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved kind/bug Something isn't working lgtm
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants