Skip to content

Conversation

@mletalie
Copy link
Contributor

Reverts #99307

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 26, 2025

@mletalie: This pull request references OSDOCS-14501 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Reverts #99307

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.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 26, 2025
@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 26, 2025
@ocpdocs-previewbot
Copy link

🤖 Fri Sep 26 20:36:31 - Prow CI generated the docs preview:
https://99800--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

[IMPORTANT]
====
The Marketplace Operator, `openshift-marketplace`, manages the default `OperatorHub` custom resource's (CR). This CR manages `CatalogSource` objects. If you attempt to modify fields in the `CatalogSource` object's `spec.grpcPodConfig` section, the Marketplace Operator automatically reverts these modifications. By default, if you modify fields in the `spec.grpcPodConfig` section of the `CatalogSource` object, the Marketplace Operator automatically reverts these changes.
The Marketplace Operator, `openshift-marketplace`, manages the default `OperatorHub` custom resource's (CR). This CR manages `CatalogSource` objects. If you attempt to modify fields in the `CatalogSource` objects `spec.grpcPodConfig` section, the Marketplace Operator automatically reverts these modifications.By default, if you modify fields in the `spec.grpcPodConfig` section of the `CatalogSource` object, the Marketplace Operator automatically reverts these changes.
Copy link
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] RedHat.Spacing: Keep one space between words in 'modifications.By'. For more information, see RedHat.Spacing.

@openshift-ci
Copy link

openshift-ci bot commented Sep 26, 2025

@mletalie: 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.

@mletalie mletalie merged commit 80ec26f into main Sep 26, 2025
2 checks passed
@mletalie
Copy link
Contributor Author

/cherrypick enterprise-4.19

@openshift-cherrypick-robot

@mletalie: #99800 failed to apply on top of branch "enterprise-4.19":

Applying: Revert "OSDOCS-14501: Prune Operators"
Using index info to reconstruct a base tree...
M	modules/olm-about-catalogs.adoc
M	modules/olm-catalog-source-and-psa.adoc
M	modules/olm-catalogsource-image-template.adoc
M	modules/olm-colocation-namespaces.adoc
M	modules/olm-creating-catalog-from-index.adoc
M	modules/olm-creating-etcd-cluster-from-operator.adoc
M	modules/olm-csv.adoc
M	modules/olm-deleting-operators-from-a-cluster-using-cli.adoc
M	modules/olm-deleting-operators-from-a-cluster-using-web-console.adoc
M	modules/olm-dependency-resolution-preferences.adoc
M	modules/olm-filtering-fbc.adoc
M	modules/olm-injecting-custom-ca.adoc
M	modules/olm-installing-from-operatorhub-using-cli.adoc
M	modules/olm-installing-from-operatorhub-using-web-console.adoc
M	modules/olm-installing-global-namespaces.adoc
M	modules/olm-installing-operators-from-operatorhub.adoc
M	modules/olm-migrating-sqlite-catalog-to-fbc.adoc
M	modules/olm-multitenancy-solution.adoc
M	modules/olm-node-selector.adoc
M	modules/olm-operator-framework.adoc
M	modules/olm-operatorhub-architecture.adoc
M	modules/olm-overriding-operator-pod-affinity.adoc
M	modules/olm-overriding-operatorconditions.adoc
M	modules/olm-overriding-proxy-settings.adoc
M	modules/olm-overview.adoc
M	modules/olm-preparing-multitenant-operators.adoc
M	modules/olm-priority-class-name.adoc
M	modules/olm-sqlite-catalog-configuring-elevated-permissions.adoc
M	modules/olm-tolerations.adoc
M	modules/olm-updating-index-image.adoc
M	modules/olm-updating-sqlite-catalog-to-a-new-opm-version.adoc
M	operators/admin/olm-adding-operators-to-cluster.adoc
M	operators/admin/olm-configuring-proxy-support.adoc
M	operators/admin/olm-cs-podsched.adoc
M	operators/admin/olm-managing-custom-catalogs.adoc
M	operators/understanding/olm-multitenancy.adoc
M	operators/understanding/olm-packaging-format.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/olm-overriding-operator-pod-affinity.adoc
Auto-merging modules/olm-installing-operators-from-operatorhub.adoc
Auto-merging modules/olm-csv.adoc
Auto-merging modules/olm-catalogsource-image-template.adoc
CONFLICT (content): Merge conflict in modules/olm-catalogsource-image-template.adoc
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 Revert "OSDOCS-14501: Prune Operators"

In response to this:

/cherrypick enterprise-4.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

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants