Skip to content

[enterprise-4.20] OSDOCS-16997-installation-config-parameters-gcp# CQA - #119206

Merged
sslocket merged 1 commit into
openshift:enterprise-4.20from
sslocket:cherry-pick-114139-to-enterprise-4.20
Sep 3, 2026
Merged

[enterprise-4.20] OSDOCS-16997-installation-config-parameters-gcp# CQA#119206
sslocket merged 1 commit into
openshift:enterprise-4.20from
sslocket:cherry-pick-114139-to-enterprise-4.20

Conversation

@sslocket

@sslocket sslocket commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

This is a manual cherry-pick of #114139 to enterprise-4.20.

The automated cherry-pick failed because of a merge conflict in modules/installation-configuration-parameters.adoc. I resolved it manually to apply only the change from #114139 (the networking.machineNetwork NOTE phrasing). The AWS dual-stack networking content in that NOTE block exists on main but not on this branch, so it was correctly excluded from the resolution.

/assign sslocket

@sslocket

sslocket commented Sep 2, 2026

Copy link
Copy Markdown
Contributor Author

Cherry Picked from b8c15f5 xref: #114139

@openshift-ci openshift-ci Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 2, 2026
@sslocket

sslocket commented Sep 2, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@ocpdocs-previewbot

Copy link
Copy Markdown

🤖 Wed Sep 02 14:29:37 - Prow CI generated the docs preview:
https://119206--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-ci

openshift-ci Bot commented Sep 2, 2026

Copy link
Copy Markdown

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

@sslocket
sslocket merged commit a2f5611 into openshift:enterprise-4.20 Sep 3, 2026
2 checks passed
@sslocket sslocket added this to the Continuous Release milestone Sep 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.20 size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants