Skip to content

OSDOCS-14525 added files for the installation section#93011

Merged
snarayan-redhat merged 1 commit intoopenshift:mainfrom
wgabor0427:OSDOCS-14525
Jun 23, 2025
Merged

OSDOCS-14525 added files for the installation section#93011
snarayan-redhat merged 1 commit intoopenshift:mainfrom
wgabor0427:OSDOCS-14525

Conversation

@wgabor0427
Copy link
Contributor

@wgabor0427 wgabor0427 commented May 5, 2025

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 5, 2025
@wgabor0427 wgabor0427 changed the title OSDOCS-14525 added files for the installation section [WIP] OSDOCS-14525 added files for the installation section May 5, 2025
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 5, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented May 5, 2025

🤖 Sun Jun 22 16:35:20 - Prow CI generated the docs preview:
https://93011--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@wgabor0427 wgabor0427 force-pushed the OSDOCS-14525 branch 20 times, most recently from 2965682 to 737ed85 Compare May 13, 2025 21:43
@wgabor0427
Copy link
Contributor Author

/label re-test

@openshift-ci
Copy link

openshift-ci bot commented May 14, 2025

@wgabor0427: The label(s) /label re-test 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, 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, peer-review-done, peer-review-in-progress, peer-review-needed, 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?

Details

In response to this:

/label re-test

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.

@wgabor0427 wgabor0427 force-pushed the OSDOCS-14525 branch 4 times, most recently from 82467d7 to 4ccb5d3 Compare May 14, 2025 20:38
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 11, 2025
@lunarwhite
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 11, 2025
Copy link
Member

@lunarwhite lunarwhite left a comment

Choose a reason for hiding this comment

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

only minor nitpick

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 13, 2025
@lunarwhite
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 13, 2025
@bergerhoffer
Copy link
Contributor

The branch/enterprise-4.20 label has been added to this PR.

This is because your PR targets the main branch and is labeled for enterprise-4.19. And any PR going into main must also target the latest version branch (enterprise-4.20).

If the update in your PR does NOT apply to version 4.20 onward, please re-target this PR to go directly into the appropriate version branch or branches (enterprise-4.x) instead of main.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 22, 2025
@openshift-ci
Copy link

openshift-ci bot commented Jun 22, 2025

New changes are detected. LGTM label has been removed.

@openshift-ci
Copy link

openshift-ci bot commented Jun 22, 2025

@wgabor0427: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@snarayan-redhat snarayan-redhat merged commit 729c5c8 into openshift:main Jun 23, 2025
2 checks passed
@snarayan-redhat
Copy link
Contributor

/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20

@openshift-cherrypick-robot

@snarayan-redhat: #93011 failed to apply on top of branch "enterprise-4.18":

Applying: Install uninstall overview
.git/rebase-apply/patch:83: new blank line at EOF.
+
.git/rebase-apply/patch:523: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	security/zero_trust_workload_identity_manager/zero-trust-manager-overview.adoc
Falling back to patching base and 3-way merge...
Auto-merging security/zero_trust_workload_identity_manager/zero-trust-manager-overview.adoc
CONFLICT (content): Merge conflict in security/zero_trust_workload_identity_manager/zero-trust-manager-overview.adoc
CONFLICT (add/add): Merge conflict in security/zero_trust_workload_identity_manager/zero-trust-manager-install.adoc
Auto-merging security/zero_trust_workload_identity_manager/zero-trust-manager-install.adoc
CONFLICT (add/add): Merge conflict in modules/zero-trust-manager-uninstall-resources.adoc
Auto-merging modules/zero-trust-manager-uninstall-resources.adoc
CONFLICT (add/add): Merge conflict in modules/zero-trust-manager-uninstall-console.adoc
Auto-merging modules/zero-trust-manager-uninstall-console.adoc
CONFLICT (add/add): Merge conflict in modules/zero-trust-manager-install-console.adoc
Auto-merging modules/zero-trust-manager-install-console.adoc
CONFLICT (add/add): Merge conflict in modules/zero-trust-manager-install-cli.adoc
Auto-merging modules/zero-trust-manager-install-cli.adoc
CONFLICT (add/add): Merge conflict in modules/zero-trust-manager-how-it-works.adoc
Auto-merging modules/zero-trust-manager-how-it-works.adoc
CONFLICT (add/add): Merge conflict in modules/zero-trust-manager-about-spire.adoc
Auto-merging modules/zero-trust-manager-about-spire.adoc
CONFLICT (add/add): Merge conflict in modules/zero-trust-manager-about-spiffe.adoc
Auto-merging modules/zero-trust-manager-about-spiffe.adoc
CONFLICT (add/add): Merge conflict in modules/zero-trust-manager-about-attestation.adoc
Auto-merging modules/zero-trust-manager-about-attestation.adoc
CONFLICT (add/add): Merge conflict in modules/zero-trust-manager-about-agent.adoc
Auto-merging modules/zero-trust-manager-about-agent.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 Install uninstall overview

Details

In response to this:

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

@lunarwhite
Copy link
Member

/cherrypick enterprise-4.19

@openshift-cherrypick-robot

@lunarwhite: new pull request created: #95072

Details

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.

@lunarwhite
Copy link
Member

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

@lunarwhite: new pull request created: #95073

Details

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 peer-review-done Signifies that the peer review team has reviewed this PR 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.