RHDEVDOCS-3053: Tracker for PR #33193, Fix missing label on OpenShift … #33202

rolfedh · 2021-06-08T12:47:29Z

Aligned team: Dev Tools
For branches: 4.5, 4.6, 4.7, 4.8
Jira: https://issues.redhat.com/browse/RHDEVDOCS-3053
Direct link to doc preview: https://deploy-preview-33202--osdocs.netlify.app/openshift-enterprise/latest/logging/cluster-logging-deploying?utm_source=github&utm_campaign=bot_dp#cluster-logging-deploy-multitenant_cluster-logging-deploying
SME review: @periklis
QE review: @kabirbhartiRH
Peer review: @jboxman
All reviews complete. Please merge now.

netlify · 2021-06-08T12:49:00Z

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: f0f9ba3

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/60c7df40e15cf70007e126c9

😎 Browse the preview: https://deploy-preview-33202--osdocs.netlify.app/openshift-enterprise/latest/logging/cluster-logging-deploying

jboxman

Left a few comments from networking side.

modules/cluster-logging-deploy-multitenant.adoc

jboxman

Left somewhat coherent thoughts; extended power outage days leave me without an ability for clear thinking.

modules/cluster-logging-deploy-multitenant.adoc

periklis

Looks good to me from a logging standpoint. The network policy for either SDN solution should allow access from openshift-operators-redhat to `openshift-logging.

jboxman

Looks good, just a few additional comments.

modules/cnf-performing-end-to-end-tests-for-platform-verification.adoc

modules/cluster-logging-deploy-multitenant.adoc

periklis

Still looks good to me

kabirbhartiRH · 2021-06-14T12:44:30Z

/lgtm

openshift-ci · 2021-06-14T16:59:27Z

New changes are detected. LGTM label has been removed.

rolfedh · 2021-06-14T18:53:37Z

@jboxman Please review and approve. Thanks.

jboxman

@rolfedh LGTM

logging/cluster-logging-deploying.adoc

…Logging with multitenant isolation mode

neal-timpe · 2021-06-15T12:49:59Z

/cherrypick enterprise-4.5

openshift-cherrypick-robot · 2021-06-15T12:50:36Z

@neal-timpe: #33202 failed to apply on top of branch "enterprise-4.5":

Applying: RHDEVDOCS-3053 Tracker for PR #33193, Fix missing label on OpenShift Logging with multitenant isolation mode
Using index info to reconstruct a base tree...
M	logging/cluster-logging-deploying.adoc
M	modules/cluster-logging-deploy-multitenant.adoc
M	modules/cnf-performing-end-to-end-tests-for-platform-verification.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cnf-performing-end-to-end-tests-for-platform-verification.adoc
CONFLICT (content): Merge conflict in modules/cnf-performing-end-to-end-tests-for-platform-verification.adoc
Auto-merging modules/cluster-logging-deploy-multitenant.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-multitenant.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 RHDEVDOCS-3053 Tracker for PR #33193, Fix missing label on OpenShift Logging with multitenant isolation mode
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.5

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.

neal-timpe · 2021-06-15T12:51:47Z

/cherrypick enterprise-4.6

openshift-cherrypick-robot · 2021-06-15T12:52:23Z

@neal-timpe: #33202 failed to apply on top of branch "enterprise-4.6":

Applying: RHDEVDOCS-3053 Tracker for PR #33193, Fix missing label on OpenShift Logging with multitenant isolation mode
Using index info to reconstruct a base tree...
M	logging/cluster-logging-deploying.adoc
M	modules/cluster-logging-deploy-multitenant.adoc
M	modules/cnf-performing-end-to-end-tests-for-platform-verification.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cnf-performing-end-to-end-tests-for-platform-verification.adoc
CONFLICT (content): Merge conflict in modules/cnf-performing-end-to-end-tests-for-platform-verification.adoc
Auto-merging modules/cluster-logging-deploy-multitenant.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-multitenant.adoc
Auto-merging logging/cluster-logging-deploying.adoc
CONFLICT (content): Merge conflict in 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 RHDEVDOCS-3053 Tracker for PR #33193, Fix missing label on OpenShift Logging with multitenant isolation mode
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.6

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.

neal-timpe · 2021-06-15T12:52:50Z

/cherrypick enterprise-4.7

openshift-cherrypick-robot · 2021-06-15T12:53:29Z

@neal-timpe: #33202 failed to apply on top of branch "enterprise-4.7":

Applying: RHDEVDOCS-3053 Tracker for PR #33193, Fix missing label on OpenShift Logging with multitenant isolation mode
Using index info to reconstruct a base tree...
M	logging/cluster-logging-deploying.adoc
M	modules/cnf-performing-end-to-end-tests-for-platform-verification.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cnf-performing-end-to-end-tests-for-platform-verification.adoc
CONFLICT (content): Merge conflict in modules/cnf-performing-end-to-end-tests-for-platform-verification.adoc
Auto-merging logging/cluster-logging-deploying.adoc
CONFLICT (content): Merge conflict in 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 RHDEVDOCS-3053 Tracker for PR #33193, Fix missing label on OpenShift Logging with multitenant isolation mode
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.

neal-timpe · 2021-06-15T12:53:42Z

/cherrypick enterprise-4.8

openshift-cherrypick-robot · 2021-06-15T12:54:18Z

@neal-timpe: #33202 failed to apply on top of branch "enterprise-4.8":

Applying: RHDEVDOCS-3053 Tracker for PR #33193, Fix missing label on OpenShift Logging with multitenant isolation mode
Using index info to reconstruct a base tree...
M	logging/cluster-logging-deploying.adoc
Falling back to patching base and 3-way merge...
Auto-merging logging/cluster-logging-deploying.adoc
CONFLICT (content): Merge conflict in 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 RHDEVDOCS-3053 Tracker for PR #33193, Fix missing label on OpenShift Logging with multitenant isolation mode
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.

[enterprise-4.5] Manually cherry pick #33202 to enterprise-4.5

[enterprise-4.6] Manually cherry pick #33202 to enterprise-4.6

[enterprise-4.7] Manually cherry pick #33202 to enterprise-4.7

[enterprise-4.8] Manually cherry pick #33202 to enterprise-4.8

openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 8, 2021

rolfedh mentioned this pull request Jun 8, 2021

Fix missing label on OpenShift Logging with multitenant isolation mode #33193

Closed

jboxman reviewed Jun 8, 2021

View reviewed changes

modules/cluster-logging-deploy-multitenant.adoc Outdated Show resolved Hide resolved

modules/cluster-logging-deploy-multitenant.adoc Outdated Show resolved Hide resolved

rolfedh commented Jun 9, 2021

View reviewed changes

modules/cluster-logging-deploy-multitenant.adoc Outdated Show resolved Hide resolved

rolfedh commented Jun 9, 2021

View reviewed changes

modules/cluster-logging-deploy-multitenant.adoc Outdated Show resolved Hide resolved

jboxman reviewed Jun 9, 2021

View reviewed changes

periklis reviewed Jun 10, 2021

View reviewed changes

vikram-redhat changed the title ~~RHDEVDOCS-3053 Tracker for PR #33193, Fix missing label on OpenShift …~~ RHDEVDOCS-3053: Tracker for PR #33193, Fix missing label on OpenShift … Jun 10, 2021

openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 11, 2021

jboxman reviewed Jun 11, 2021

View reviewed changes

periklis reviewed Jun 11, 2021

View reviewed changes

openshift-ci bot assigned kabirbhartiRH Jun 14, 2021

openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Jun 14, 2021

jboxman reviewed Jun 14, 2021

View reviewed changes

logging/cluster-logging-deploying.adoc Outdated Show resolved Hide resolved

logging/cluster-logging-deploying.adoc Outdated Show resolved Hide resolved

RHDEVDOCS-3053 Tracker for PR #33193, Fix missing label on OpenShift …

f0f9ba3

…Logging with multitenant isolation mode

neal-timpe merged commit e94380c into openshift:master Jun 15, 2021

neal-timpe added a commit that referenced this pull request Jun 15, 2021

Merge pull request #33458 from rolfedh/manual-cp-#33202-to-4.5

6ee702c

[enterprise-4.5] Manually cherry pick #33202 to enterprise-4.5

neal-timpe added a commit that referenced this pull request Jun 15, 2021

Merge pull request #33457 from rolfedh/manual-cp-#33202-to-4.6

b6b1638

[enterprise-4.6] Manually cherry pick #33202 to enterprise-4.6

neal-timpe added a commit that referenced this pull request Jun 15, 2021

Merge pull request #33454 from rolfedh/manual-cp-#33202-to-4.7

a7d2708

[enterprise-4.7] Manually cherry pick #33202 to enterprise-4.7

neal-timpe added a commit that referenced this pull request Jun 15, 2021

Merge pull request #33452 from rolfedh/manual-cp-#33202-to-4.8

6e463e4

[enterprise-4.8] Manually cherry pick #33202 to enterprise-4.8

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

RHDEVDOCS-3053: Tracker for PR #33193, Fix missing label on OpenShift … #33202

RHDEVDOCS-3053: Tracker for PR #33193, Fix missing label on OpenShift … #33202

rolfedh commented Jun 8, 2021 •

edited

netlify bot commented Jun 8, 2021 •

edited

jboxman left a comment

jboxman left a comment

periklis left a comment

jboxman left a comment

periklis left a comment

kabirbhartiRH commented Jun 14, 2021

openshift-ci bot commented Jun 14, 2021

rolfedh commented Jun 14, 2021

jboxman left a comment

neal-timpe commented Jun 15, 2021

openshift-cherrypick-robot commented Jun 15, 2021

neal-timpe commented Jun 15, 2021

openshift-cherrypick-robot commented Jun 15, 2021

neal-timpe commented Jun 15, 2021

openshift-cherrypick-robot commented Jun 15, 2021

neal-timpe commented Jun 15, 2021

openshift-cherrypick-robot commented Jun 15, 2021

RHDEVDOCS-3053: Tracker for PR #33193, Fix missing label on OpenShift … #33202

RHDEVDOCS-3053: Tracker for PR #33193, Fix missing label on OpenShift … #33202

Conversation

rolfedh commented Jun 8, 2021 • edited

netlify bot commented Jun 8, 2021 • edited

jboxman left a comment

Choose a reason for hiding this comment

jboxman left a comment

Choose a reason for hiding this comment

periklis left a comment

Choose a reason for hiding this comment

jboxman left a comment

Choose a reason for hiding this comment

periklis left a comment

Choose a reason for hiding this comment

kabirbhartiRH commented Jun 14, 2021

openshift-ci bot commented Jun 14, 2021

rolfedh commented Jun 14, 2021

jboxman left a comment

Choose a reason for hiding this comment

neal-timpe commented Jun 15, 2021

openshift-cherrypick-robot commented Jun 15, 2021

neal-timpe commented Jun 15, 2021

openshift-cherrypick-robot commented Jun 15, 2021

neal-timpe commented Jun 15, 2021

openshift-cherrypick-robot commented Jun 15, 2021

neal-timpe commented Jun 15, 2021

openshift-cherrypick-robot commented Jun 15, 2021

rolfedh commented Jun 8, 2021 •

edited

netlify bot commented Jun 8, 2021 •

edited