Skip to content

OSDOCS-3247: Updated cluster-wide proxy prereqs #41726

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Feb 16, 2022
Merged

OSDOCS-3247: Updated cluster-wide proxy prereqs #41726

merged 2 commits into from
Feb 16, 2022

Conversation

EricPonvelle
Copy link
Contributor

@EricPonvelle EricPonvelle commented Feb 10, 2022 •
edited
Loading

@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 10, 2022
@netlify
Copy link

netlify bot commented Feb 10, 2022 •
edited
Loading

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 81fffee

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/620d7fe99f66a5000782c190

😎 Browse the preview: https://deploy-preview-41726--osdocs.netlify.app/openshift-dedicated/latest/networking/configuring-cluster-wide-proxy

mrbarge
mrbarge reviewed Feb 13, 2022
View reviewed changes
networking/configuring-cluster-wide-proxy.adoc Outdated
* You have an existing `install-config.yaml` file.
* You reviewed the sites that your cluster requires access to and determined whether any of them need to bypass the proxy. By default, all cluster egress traffic is proxied, including calls to hosting cloud provider APIs. You added sites to the `Proxy` object's `spec.noProxy` field to bypass the proxy if necessary.
+
Copy link
Contributor

Choose a reason for hiding this comment

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

These lines can all be removed - they're not relevant for the managed service offering.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mrbarge I removed lines 18 and 19. Are we good to merge this?

Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you! This looks fine to me.

@EricPonvelle EricPonvelle force-pushed the OSDOCS-3247_ProxyPreReq branch from 0dc03a2 to cdbc22b Compare February 14, 2022 21:08
@EricPonvelle EricPonvelle added this to the Next Release milestone Feb 14, 2022
adellape
adellape reviewed Feb 16, 2022
View reviewed changes
Copy link
Contributor

@adellape adellape left a comment

Choose a reason for hiding this comment

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

Looks good tho I couldn't confirm the appearance of the aws and aws-china ifevals.

@adellape adellape added the peer-review-done Signifies that the peer review team has reviewed this PR label Feb 16, 2022
@EricPonvelle EricPonvelle force-pushed the OSDOCS-3247_ProxyPreReq branch from cdbc22b to e47eb33 Compare February 16, 2022 22:13
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 16, 2022
@EricPonvelle EricPonvelle force-pushed the OSDOCS-3247_ProxyPreReq branch 3 times, most recently from 0c37ffd to 8170c90 Compare February 16, 2022 22:21
@openshift-ci openshift-ci bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 16, 2022
@EricPonvelle EricPonvelle force-pushed the OSDOCS-3247_ProxyPreReq branch from 4048a2b to 4b90c89 Compare February 16, 2022 22:28
@openshift-ci openshift-ci bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 16, 2022
@EricPonvelle EricPonvelle force-pushed the OSDOCS-3247_ProxyPreReq branch 2 times, most recently from 4efe2c8 to f586550 Compare February 16, 2022 22:31
@openshift-ci openshift-ci bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 16, 2022
@EricPonvelle EricPonvelle force-pushed the OSDOCS-3247_ProxyPreReq branch from 8f6cfe7 to 8877758 Compare February 16, 2022 22:33
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 16, 2022
@EricPonvelle EricPonvelle force-pushed the OSDOCS-3247_ProxyPreReq branch from 8877758 to 8e6b300 Compare February 16, 2022 22:47
@openshift-ci openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 16, 2022
@openshift-ci openshift-ci bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 16, 2022
@EricPonvelle EricPonvelle merged commit fa0ee61 into openshift:main Feb 16, 2022
@EricPonvelle
Copy link
Contributor Author

/cherry-pick enterprise-4.9

@EricPonvelle
Copy link
Contributor Author

/cherry-pick enterprise-4.10

@openshift-cherrypick-robot
Copy link

@EricPonvelle: #41726 failed to apply on top of branch "enterprise-4.9":

Applying: OSDOCS-3247: Updated cluster-wide proxy prereqs
Using index info to reconstruct a base tree...
M	networking/configuring-cluster-wide-proxy.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/configuring-cluster-wide-proxy.adoc
CONFLICT (content): Merge conflict in networking/configuring-cluster-wide-proxy.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 OSDOCS-3247: Updated cluster-wide proxy prereqs
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:

/cherry-pick enterprise-4.9

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
Copy link

@EricPonvelle: #41726 failed to apply on top of branch "enterprise-4.10":

Applying: OSDOCS-3247: Updated cluster-wide proxy prereqs
Using index info to reconstruct a base tree...
M	networking/configuring-cluster-wide-proxy.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/configuring-cluster-wide-proxy.adoc
CONFLICT (content): Merge conflict in networking/configuring-cluster-wide-proxy.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 OSDOCS-3247: Updated cluster-wide proxy prereqs
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:

/cherry-pick enterprise-4.10

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.

adellape added a commit to adellape/openshift-docs that referenced this pull request Feb 17, 2022
@adellape
Revert "Merge pull request openshift#41726 from EricPonvelle/OSDOCS-3…
a15f301 
…247_ProxyPreReq"

This reverts commit fa0ee61, reversing
changes made to ecdff68.
@EricPonvelle EricPonvelle deleted the OSDOCS-3247_ProxyPreReq branch February 23, 2022 13:56
@EricPonvelle EricPonvelle mentioned this pull request Feb 23, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
2 more reviewers

@mrbarge mrbarge mrbarge left review comments

@adellape adellape adellape left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
branch/enterprise-4.9 branch/enterprise-4.10 peer-review-done Signifies that the peer review team has reviewed this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
Next Release
Development

Successfully merging this pull request may close these issues.
4 participants
@EricPonvelle @openshift-cherrypick-robot @mrbarge @adellape