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 GitHub issue #32713: update the new logging operator name #32726

Merged
merged 1 commit into from
May 24, 2021

Conversation

lbscorpio
Copy link
Contributor

@lbscorpio lbscorpio commented May 23, 2021

@vikram-redhat This PR is to fix the issue#32713, minimum version that the change applies to should be 4.7 in my opinion, could you arrange someone to review them? Thanks.

Major changes on my commit:

  1. modules/cluster-logging-deploy-console.adoc
    On the Custom Resource Definition Overview page -> On the Custom Resource Definition details page(verified with the OCP 4.7.11)
  2. modules/cluster-logging-updating-logging.adoc
    Verify that the Cluster Logging Operator version is 5.0.x. -> Only changed this name to Red Hat OpenShift Logging on this file, because operator name will be changed after upgrading.
  3. All other Cluster Logging (only Operator name, not CR name) changed to Red Hat OpenShift Logging
  4. File name clo-xx.yaml change to olo-xx.yaml, because the operator name is changed so the short name can be changed.

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 23, 2021
@netlify
Copy link

netlify bot commented May 23, 2021

Deploy Preview for osdocs ready!

Built with commit 5ce6cb7

https://deploy-preview-32726--osdocs.netlify.app

@vikram-redhat vikram-redhat requested review from rolfedh and Preeticp May 23, 2021 03:33
Copy link
Contributor

@rolfedh rolfedh left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 24, 2021
@Preeticp Preeticp merged commit 77958ce into openshift:master May 24, 2021
@Preeticp
Copy link
Contributor

/cherrypick enterprise-4.7

@Preeticp
Copy link
Contributor

/cherrypick enterprise-4.8

@openshift-cherrypick-robot

@Preeticp: #32726 failed to apply on top of branch "enterprise-4.7":

Applying: Fix GitHub issue #32713: update the new logging operator name
Using index info to reconstruct a base tree...
M	logging/cluster-logging-deploying.adoc
M	modules/cluster-logging-about-crd.adoc
M	modules/cluster-logging-collector-log-forward-es.adoc
M	modules/cluster-logging-collector-log-forwarding-about.adoc
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploy-console.adoc
M	modules/cluster-logging-deploying-about.adoc
M	modules/cluster-logging-updating-logging.adoc
M	modules/dedicated-cluster-install-deploy.adoc
M	modules/gathering-data-specific-features.adoc
M	modules/infrastructure-moving-logging.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/infrastructure-moving-logging.adoc
Auto-merging modules/gathering-data-specific-features.adoc
Auto-merging modules/dedicated-cluster-install-deploy.adoc
Auto-merging modules/cluster-logging-updating-logging.adoc
Auto-merging modules/cluster-logging-deploying-about.adoc
Auto-merging modules/cluster-logging-deploy-console.adoc
Auto-merging modules/cluster-logging-deploy-cli.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-cli.adoc
Auto-merging modules/cluster-logging-collector-log-forwarding-about.adoc
Auto-merging modules/cluster-logging-collector-log-forward-es.adoc
Auto-merging modules/cluster-logging-about-crd.adoc
Auto-merging logging/cluster-logging-deploying.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix GitHub issue #32713: update the new logging operator name
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.7

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/test-infra repository.

@openshift-cherrypick-robot

@Preeticp: #32726 failed to apply on top of branch "enterprise-4.8":

Applying: Fix GitHub issue #32713: update the new logging operator name
Using index info to reconstruct a base tree...
M	logging/cluster-logging-deploying.adoc
M	logging/cluster-logging-external.adoc
M	modules/cluster-logging-about-crd.adoc
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploy-console.adoc
M	modules/cluster-logging-deploying-about.adoc
M	modules/cluster-logging-updating-logging.adoc
M	modules/dedicated-cluster-install-deploy.adoc
M	modules/gathering-data-specific-features.adoc
M	modules/infrastructure-moving-logging.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/infrastructure-moving-logging.adoc
Auto-merging modules/gathering-data-specific-features.adoc
Auto-merging modules/dedicated-cluster-install-deploy.adoc
Auto-merging modules/cluster-logging-updating-logging.adoc
Auto-merging modules/cluster-logging-deploying-about.adoc
Auto-merging modules/cluster-logging-deploy-console.adoc
Auto-merging modules/cluster-logging-deploy-cli.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-cli.adoc
Auto-merging modules/cluster-logging-about-crd.adoc
Auto-merging logging/cluster-logging-external.adoc
Auto-merging logging/cluster-logging-deploying.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix GitHub issue #32713: update the new logging operator name
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

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

@rolfedh
Copy link
Contributor

rolfedh commented May 24, 2021

I'll manually CP these changes into 4.7 and 4.8 later this week: https://issues.redhat.com/browse/RHDEVDOCS-3025

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged. 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.

4 participants