Skip to content

Conversation

@jgwest
Copy link
Member

@jgwest jgwest commented Nov 19, 2025

What type of PR is this?
/kind bug

What does this PR do / why we need it:
Cherry-pick #933 which was merged to 0.17 but not main

https://issues.redhat.com/browse/GITOPS-8152

Have you updated the necessary documentation?

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

Signed-off-by: Jonathan West <jgwest@gmail.com>
@openshift-ci openshift-ci bot added the kind/bug Something isn't working label Nov 19, 2025
@jgwest
Copy link
Member Author

jgwest commented Nov 19, 2025

/cherry-pick v1.19

@openshift-cherrypick-robot

@jgwest: once the present PR merges, I will cherry-pick it on top of v1.19 in a new PR and assign it to you.

In response to this:

/cherry-pick v1.19

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.

@svghadi
Copy link
Member

svghadi commented Nov 20, 2025

/lgtm
/approve

@openshift-ci
Copy link

openshift-ci bot commented Nov 20, 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 79832f4 into master Nov 20, 2025
20 checks passed
@openshift-cherrypick-robot

@jgwest: #1007 failed to apply on top of branch "v1.19":

Applying: fix: Add missing ingress.config.openshift.io permissions
Using index info to reconstruct a base tree...
M	bundle/manifests/gitops-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging bundle/manifests/gitops-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/gitops-operator.clusterserviceversion.yaml
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: Add missing ingress.config.openshift.io permissions

In response to this:

/cherry-pick v1.19

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

approved kind/bug Something isn't working lgtm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants