Skip to content

Conversation

@anandf
Copy link
Member

@anandf anandf commented Mar 18, 2025

What type of PR is this?
/kind bug

What does this PR do / why we need it:
Update argocd-operator to include the fix for GITOPS-6495
Have you updated the necessary documentation?

  • Documentation update is required by this PR.
  • Documentation has been updated.

Which issue(s) this PR fixes:

Fixes GITOPS-6495

Test acceptance criteria:

  • Unit Test
  • E2E Test

How to test changes / Special notes to the reviewer:

@openshift-ci openshift-ci bot added the kind/bug Something isn't working label Mar 18, 2025
@openshift-ci openshift-ci bot requested review from chetan-rns and jannfis March 18, 2025 10:48
@svghadi
Copy link
Member

svghadi commented Mar 18, 2025

/lgtm
/approve

@openshift-ci
Copy link

openshift-ci bot commented Mar 18, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: svghadi

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-merge-bot openshift-merge-bot bot merged commit 8640e39 into redhat-developer:master Mar 18, 2025
17 checks passed
@svghadi
Copy link
Member

svghadi commented Mar 18, 2025

/cherry-pick v1.16

@openshift-cherrypick-robot

@svghadi: #865 failed to apply on top of branch "v1.16":

Applying: GITOPS-6495 fix for cmp server crashing with busybox image
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 GITOPS-6495 fix for cmp server crashing with busybox image

In response to this:

/cherry-pick v1.16

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.

@anandf anandf deleted the fix_for_cmp_server_crash branch March 18, 2025 13:16
anandf added a commit to anandf/gitops-operator that referenced this pull request Mar 18, 2025
openshift-merge-bot bot pushed a commit that referenced this pull request Mar 18, 2025
varshab1210 pushed a commit to nmirasch/gitops-operator that referenced this pull request Jul 23, 2025
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