openshift-docs icon indicating copy to clipboard operation
openshift-docs copied to clipboard

[WIP] OSDOCS-15110 incorporated edits

Open wgabor0427 opened this issue 4 months ago • 2 comments

Version(s): 18+

Issue: https://issues.redhat.com/browse/OSDOCS-15110

Link to docs preview:

QE review:

  • [ ] QE has approved this change.

Additional information:

wgabor0427 avatar Jun 27 '25 21:06 wgabor0427

🤖 Thu Sep 04 12:21:02 - Prow CI generated the docs preview:

https://95399--ocpdocs-pr.netlify.app/ https://95399--ocpdocs-pr.netlify.app/openshift-enterprise/latest/security/zero_trust_workload_identity_manager/zero-trust-manager-configuration.html https://95399--ocpdocs-pr.netlify.app/openshift-enterprise/latest/security/zero_trust_workload_identity_manager/zero-trust-manager-install.html https://95399--ocpdocs-pr.netlify.app/openshift-enterprise/latest/security/zero_trust_workload_identity_manager/zero-trust-manager-monitoring.html https://95399--ocpdocs-pr.netlify.app/openshift-enterprise/latest/security/zero_trust_workload_identity_manager/zero-trust-manager-overview.html https://95399--ocpdocs-pr.netlify.app/openshift-enterprise/latest/security/zero_trust_workload_identity_manager/zero-trust-manager-release-notes.html https://95399--ocpdocs-pr.netlify.app/openshift-enterprise/latest/security/zero_trust_workload_identity_manager/zero-trust-manager-uninstall.html

ocpdocs-previewbot avatar Jun 27 '25 21:06 ocpdocs-previewbot

/merge-review-needed

wgabor0427 avatar Jul 03 '25 21:07 wgabor0427

@lunarwhite @snarayan-redhat I've changed all instances of server and agent to lowercase. It can be peer-reviewed again

wgabor0427 avatar Jul 07 '25 18:07 wgabor0427

@wgabor0427 Could you please address my legacy comment first before moving forward

For Uninstalling section, could you open a PR to change the "Procedure 1"'s commands order on enterprise-4.18 branch to be the same as main branch?

That's what https://issues.redhat.com/browse/OCPBUGS-57776 is reporting, the fix has been patched to 4.19, 4,20, main branches, but not 4.18 yet. Without fixing it first, this PR's auto cherrypick would still fail on 4.18 branch.

lunarwhite avatar Jul 08 '25 01:07 lunarwhite

@lunarwhite Since https://issues.redhat.com/browse/OCPBUGS-57776 has been closed, can we move forward with this.

wgabor0427 avatar Jul 10 '25 13:07 wgabor0427

Hi @wgabor0427, any updates on this PR? I think we could proceed with merge once my last group of comments are addressed. This can go as part of 0.2.0 release

lunarwhite avatar Aug 29 '25 07:08 lunarwhite

/lgtm

lunarwhite avatar Sep 03 '25 03:09 lunarwhite

/label peer-review-needed

lunarwhite avatar Sep 03 '25 03:09 lunarwhite

@lunarwhite: The label(s) /label peer-review-needed cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, ux-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, run-integration-tests, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, cloud-experts, cnv, dev-tools, distributed-tracing, ims, jira/valid-bug, merge-review-in-progress, merge-review-needed, mtc, multi-arch, oadp, ok-to-test, rhacs, rhv, sd-docs, serverless, service-mesh, sme-review-done, sme-review-needed, stability-fix-approved, staff-eng-approved, telco. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

In response to this:

/label peer-review-needed

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[bot] avatar Sep 03 '25 03:09 openshift-ci[bot]

/label merge-review-needed

lunarwhite avatar Sep 03 '25 03:09 lunarwhite

/label merge-review-needed

wgabor0427 avatar Sep 03 '25 16:09 wgabor0427

/label merge-review-needed

wgabor0427 avatar Sep 03 '25 16:09 wgabor0427

New changes are detected. LGTM label has been removed.

openshift-ci[bot] avatar Sep 04 '25 12:09 openshift-ci[bot]

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

openshift-ci[bot] avatar Sep 04 '25 12:09 openshift-ci[bot]

/cherrypick enterprise-4.20

ShaunaDiaz avatar Sep 04 '25 13:09 ShaunaDiaz

/cherrypick enterprise-4.19

ShaunaDiaz avatar Sep 04 '25 13:09 ShaunaDiaz

/cherrypick enterprise-4.18

ShaunaDiaz avatar Sep 04 '25 13:09 ShaunaDiaz

@ShaunaDiaz: new pull request created: #98501

In response to this:

/cherrypick enterprise-4.20

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.

@ShaunaDiaz: new pull request created: #98502

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.

@ShaunaDiaz: #95399 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS_15110 deleted headings in assembly
.git/rebase-apply/patch:186: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	modules/zero-trust-manager-about-agent.adoc
M	modules/zero-trust-manager-about-attestation.adoc
M	modules/zero-trust-manager-about-components.adoc
M	modules/zero-trust-manager-about-spire.adoc
M	modules/zero-trust-manager-how-it-works.adoc
M	modules/zero-trust-manager-install-cli.adoc
M	modules/zero-trust-manager-install-console.adoc
M	modules/zero-trust-manager-oidc-config.adoc
M	modules/zero-trust-manager-spiffe-csidriver-config.adoc
M	modules/zero-trust-manager-spire-agent-config.adoc
M	modules/zero-trust-manager-spire-server-config.adoc
M	modules/zero-trust-manager-uninstall-console.adoc
M	modules/zero-trust-manager-uninstall-resources.adoc
M	security/zero_trust_workload_identity_manager/zero-trust-manager-configuration.adoc
M	security/zero_trust_workload_identity_manager/zero-trust-manager-overview.adoc
M	security/zero_trust_workload_identity_manager/zero-trust-manager-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging security/zero_trust_workload_identity_manager/zero-trust-manager-release-notes.adoc
Auto-merging security/zero_trust_workload_identity_manager/zero-trust-manager-overview.adoc
Auto-merging security/zero_trust_workload_identity_manager/zero-trust-manager-configuration.adoc
Auto-merging modules/zero-trust-manager-uninstall-resources.adoc
Auto-merging modules/zero-trust-manager-uninstall-console.adoc
CONFLICT (content): Merge conflict in modules/zero-trust-manager-uninstall-console.adoc
Auto-merging modules/zero-trust-manager-spire-server-config.adoc
Auto-merging modules/zero-trust-manager-spire-agent-config.adoc
Auto-merging modules/zero-trust-manager-spiffe-csidriver-config.adoc
Auto-merging modules/zero-trust-manager-oidc-config.adoc
Auto-merging modules/zero-trust-manager-install-console.adoc
CONFLICT (content): Merge conflict in modules/zero-trust-manager-install-console.adoc
Auto-merging modules/zero-trust-manager-install-cli.adoc
Auto-merging modules/zero-trust-manager-how-it-works.adoc
CONFLICT (content): Merge conflict in modules/zero-trust-manager-how-it-works.adoc
Auto-merging modules/zero-trust-manager-about-spire.adoc
CONFLICT (content): Merge conflict in modules/zero-trust-manager-about-spire.adoc
Auto-merging modules/zero-trust-manager-about-components.adoc
CONFLICT (content): Merge conflict in modules/zero-trust-manager-about-components.adoc
Auto-merging modules/zero-trust-manager-about-attestation.adoc
CONFLICT (content): Merge conflict in modules/zero-trust-manager-about-attestation.adoc
Auto-merging modules/zero-trust-manager-about-agent.adoc
CONFLICT (content): Merge conflict in modules/zero-trust-manager-about-agent.adoc
Auto-merging _topic_maps/_topic_map.yml
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 OSDOCS_15110 deleted headings in assembly

In response to this:

/cherrypick enterprise-4.18

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.