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 constant reconcilation issue in helm controller #6895

Merged

Conversation

acornett21
Copy link
Contributor

Description of the change:

Motivation for the change:

Checklist

If the pull request includes user-facing changes, extra documentation is required:

@openshift-ci openshift-ci bot requested review from anik120 and theishshah January 13, 2025 19:58
@acornett21 acornett21 merged commit 84022fc into operator-framework:master Jan 13, 2025
23 checks passed
@acornett21
Copy link
Contributor Author

/cherry-pick v1.39.x

@openshift-cherrypick-robot

@acornett21: #6895 failed to apply on top of branch "v1.39.x":

Applying: fix constant reconcilation issue in helm controller
Using index info to reconstruct a base tree...
M	internal/helm/controller/reconcile.go
Falling back to patching base and 3-way merge...
Auto-merging internal/helm/controller/reconcile.go
CONFLICT (content): Merge conflict in internal/helm/controller/reconcile.go
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 fix constant reconcilation issue in helm controller

In response to this:

/cherry-pick v1.39.x

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.

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.

2 participants