Skip to content

Conversation

jcantrill
Copy link
Contributor

Description

This PR:

  • updates the provider in the manifest so the console will evaluate it as an official Red Hat operator

Links

https://issues.redhat.com/browse/LOG-5587

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 15, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 15, 2024

@jcantrill: This pull request references LOG-5587 which is a valid jira issue.

In response to this:

Description

This PR:

  • updates the provider in the manifest so the console will evaluate it as an official Red Hat operator

Links

https://issues.redhat.com/browse/LOG-5587

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 openshift-eng/jira-lifecycle-plugin repository.

@jcantrill jcantrill added release/6.0 and removed jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Oct 15, 2024
@jcantrill
Copy link
Contributor Author

/cherrypick master

@openshift-cherrypick-robot

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

In response to this:

/cherrypick master

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.

@jcantrill
Copy link
Contributor Author

/cherrypick release-5.8

@openshift-cherrypick-robot

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

In response to this:

/cherrypick release-5.8

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.

@openshift-ci openshift-ci bot requested review from cahartma and vparfonov October 15, 2024 13:45
Copy link
Contributor

openshift-ci bot commented Oct 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill

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 Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 15, 2024
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 15, 2024
@openshift-ci openshift-ci bot added the midstream/Dockerfile A Dockerfile.in sync is needed with midstream label Oct 15, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 15, 2024
Copy link
Contributor

openshift-ci bot commented Oct 15, 2024

@jcantrill: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@Clee2691
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 17, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit ef8cf19 into openshift:release-6.0 Oct 17, 2024
7 checks passed
@openshift-cherrypick-robot

@jcantrill: #2828 failed to apply on top of branch "release-5.8":

Applying: NO-JIRA: Update golang builder and dev tools for 1.22
Using index info to reconstruct a base tree...
A	bundle/manifests/cluster-logging.clusterserviceversion.yaml
A	config/manifests/bases/cluster-logging.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): config/manifests/bases/cluster-logging.clusterserviceversion.yaml deleted in HEAD and modified in NO-JIRA: Update golang builder and dev tools for 1.22. Version NO-JIRA: Update golang builder and dev tools for 1.22 of config/manifests/bases/cluster-logging.clusterserviceversion.yaml left in tree.
CONFLICT (modify/delete): bundle/manifests/cluster-logging.clusterserviceversion.yaml deleted in HEAD and modified in NO-JIRA: Update golang builder and dev tools for 1.22. Version NO-JIRA: Update golang builder and dev tools for 1.22 of bundle/manifests/cluster-logging.clusterserviceversion.yaml left in tree.
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 NO-JIRA: Update golang builder and dev tools for 1.22

In response to this:

/cherrypick release-5.8

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.

@openshift-cherrypick-robot

@jcantrill: #2828 failed to apply on top of branch "master":

Applying: NO-JIRA: Update golang builder and dev tools for 1.22
Using index info to reconstruct a base tree...
M	bundle/manifests/cluster-logging.clusterserviceversion.yaml
M	config/manifests/bases/cluster-logging.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging config/manifests/bases/cluster-logging.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in config/manifests/bases/cluster-logging.clusterserviceversion.yaml
Auto-merging bundle/manifests/cluster-logging.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/cluster-logging.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 NO-JIRA: Update golang builder and dev tools for 1.22

In response to this:

/cherrypick master

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 Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. midstream/Dockerfile A Dockerfile.in sync is needed with midstream release/6.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants