Skip to content

Conversation

codyhoag
Copy link
Contributor

@codyhoag codyhoag commented Oct 6, 2021

https://bugzilla.redhat.com/show_bug.cgi?id=1948730

Added the Configuring the cluster-wide proxy during installation module into various (mostly IPI) assemblies, since it's now supported using the installer. Also removed an incorrect note in Configuring the cluster-wide proxy, which stated that UPI was the only supported install type for cluster-wide proxy.

@codyhoag codyhoag added this to the Next Release milestone Oct 6, 2021
@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 6, 2021
@netlify
Copy link

netlify bot commented Oct 6, 2021

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: cb730f0

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/615dc5e65d3b4a000739f75d

😎 Browse the preview: https://deploy-preview-37150--osdocs.netlify.app

@codyhoag
Copy link
Contributor Author

codyhoag commented Oct 6, 2021

@jianli-wei can you verify? Thanks!

@jianli-wei
Copy link

@codyhoag It looks good, but there's a documentation bug on the existing statements of proxy settings, i.e. https://bugzilla.redhat.com/show_bug.cgi?id=1986701, so if possible, I suggest to remove the statement "If this field is not specified, then httpProxy is used for both HTTP and HTTPS connections. ". Thanks!

@codyhoag
Copy link
Contributor Author

codyhoag commented Oct 8, 2021

@jianli-wei thanks for confirming! Because that additional doc bug is associated with another BZ, I have removed that text in a separate PR for tracking purposes: #37245

@codyhoag codyhoag added the peer-review-needed Signifies that the peer review team needs to review this PR label Oct 8, 2021
Copy link

@mikemckiernan mikemckiernan left a comment

Choose a reason for hiding this comment

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

/lgtm

@mikemckiernan mikemckiernan added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Oct 8, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 8, 2021
@codyhoag codyhoag merged commit 610732b into openshift:main Oct 8, 2021
@codyhoag
Copy link
Contributor Author

codyhoag commented Oct 8, 2021

/cherrypick enterprise-4.9

@codyhoag
Copy link
Contributor Author

codyhoag commented Oct 8, 2021

/cherrypick enterprise-4.8

@codyhoag
Copy link
Contributor Author

codyhoag commented Oct 8, 2021

/cherrypick enterprise-4.7

@codyhoag
Copy link
Contributor Author

codyhoag commented Oct 8, 2021

/cherrypick enterprise-4.6

@openshift-cherrypick-robot

@codyhoag: #37150 failed to apply on top of branch "enterprise-4.8":

Applying: Add cluster-wide proxy module since now supported for IPI
Using index info to reconstruct a base tree...
M	installing/installing_openstack/installing-openstack-installer-restricted.adoc
M	modules/installation-configure-proxy.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-configure-proxy.adoc
CONFLICT (content): Merge conflict in modules/installation-configure-proxy.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-restricted.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 Add cluster-wide proxy module since now supported for IPI
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.

@openshift-cherrypick-robot

@codyhoag: new pull request created: #37249

In response to this:

/cherrypick 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

@codyhoag: #37150 failed to apply on top of branch "enterprise-4.7":

Applying: Add cluster-wide proxy module since now supported for IPI
Using index info to reconstruct a base tree...
M	installing/installing_aws/installing-aws-customizations.adoc
M	installing/installing_aws/installing-aws-network-customizations.adoc
M	installing/installing_azure/installing-azure-customizations.adoc
M	installing/installing_azure/installing-azure-network-customizations.adoc
M	installing/installing_gcp/installing-gcp-customizations.adoc
M	installing/installing_gcp/installing-gcp-network-customizations.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp.adoc
M	installing/installing_openstack/installing-openstack-installer-restricted.adoc
M	installing/installing_vmc/installing-vmc-customizations.adoc
M	installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc
M	installing/installing_vmc/installing-vmc-network-customizations.adoc
M	installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
M	installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
M	installing/installing_vsphere/installing-vsphere-network-customizations.adoc
M	modules/installation-configure-proxy.adoc
M	networking/enable-cluster-wide-proxy.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/enable-cluster-wide-proxy.adoc
Auto-merging modules/installation-configure-proxy.adoc
CONFLICT (content): Merge conflict in modules/installation-configure-proxy.adoc
Auto-merging installing/installing_vsphere/installing-vsphere-network-customizations.adoc
Auto-merging installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
Auto-merging installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
Auto-merging installing/installing_vmc/installing-vmc-network-customizations.adoc
Auto-merging installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc
Auto-merging installing/installing_vmc/installing-vmc-customizations.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-restricted.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp.adoc
Auto-merging installing/installing_gcp/installing-gcp-network-customizations.adoc
Auto-merging installing/installing_gcp/installing-gcp-customizations.adoc
Auto-merging installing/installing_azure/installing-azure-network-customizations.adoc
Auto-merging installing/installing_azure/installing-azure-customizations.adoc
Auto-merging installing/installing_aws/installing-aws-network-customizations.adoc
Auto-merging installing/installing_aws/installing-aws-customizations.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 Add cluster-wide proxy module since now supported for IPI
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.

@openshift-cherrypick-robot

@codyhoag: #37150 failed to apply on top of branch "enterprise-4.6":

Applying: Add cluster-wide proxy module since now supported for IPI
Using index info to reconstruct a base tree...
M	installing/installing_aws/installing-aws-customizations.adoc
M	installing/installing_aws/installing-aws-network-customizations.adoc
M	installing/installing_azure/installing-azure-customizations.adoc
M	installing/installing_azure/installing-azure-network-customizations.adoc
M	installing/installing_gcp/installing-gcp-customizations.adoc
M	installing/installing_gcp/installing-gcp-network-customizations.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp.adoc
M	installing/installing_openstack/installing-openstack-installer-restricted.adoc
M	installing/installing_vmc/installing-vmc-customizations.adoc
M	installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc
M	installing/installing_vmc/installing-vmc-network-customizations.adoc
M	installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
M	installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
M	installing/installing_vsphere/installing-vsphere-network-customizations.adoc
M	modules/installation-configure-proxy.adoc
M	networking/enable-cluster-wide-proxy.adoc
Falling back to patching base and 3-way merge...
Auto-merging networking/enable-cluster-wide-proxy.adoc
CONFLICT (content): Merge conflict in networking/enable-cluster-wide-proxy.adoc
Auto-merging modules/installation-configure-proxy.adoc
CONFLICT (content): Merge conflict in modules/installation-configure-proxy.adoc
Auto-merging installing/installing_vsphere/installing-vsphere-network-customizations.adoc
Auto-merging installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
Auto-merging installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc
Auto-merging installing/installing_vmc/installing-vmc-network-customizations.adoc
Auto-merging installing/installing_vmc/installing-vmc-network-customizations-user-infra.adoc
Auto-merging installing/installing_vmc/installing-vmc-customizations.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-restricted.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp.adoc
Auto-merging installing/installing_gcp/installing-gcp-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-network-customizations.adoc
Auto-merging installing/installing_gcp/installing-gcp-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/installing-gcp-customizations.adoc
Auto-merging installing/installing_azure/installing-azure-network-customizations.adoc
Auto-merging installing/installing_azure/installing-azure-customizations.adoc
Auto-merging installing/installing_aws/installing-aws-network-customizations.adoc
Auto-merging installing/installing_aws/installing-aws-customizations.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 Add cluster-wide proxy module since now supported for IPI
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.

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

Labels

branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 branch/enterprise-4.9 lgtm Indicates that a PR is ready to be merged. 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.

4 participants