Skip to content

Add overriding proxy for OLM #20591

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.

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

Merged
merged 1 commit into from
Apr 9, 2020
Merged

Conversation

@openshift-docs-preview-bot

The preview will be available shortly at:

@adellape adellape force-pushed the olm_proxy_override branch 3 times, most recently from 63a8784 to c734ef0 Compare March 19, 2020 18:30
@adellape adellape added peer-review-needed Signifies that the peer review team needs to review this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Mar 19, 2020
@adellape adellape force-pushed the olm_proxy_override branch from c734ef0 to 13bf53c Compare March 19, 2020 18:59
@adellape
Copy link
Contributor Author

@ecordell PTAL

@adellape adellape added the peer-review-needed Signifies that the peer review team needs to review this PR label Mar 19, 2020
Copy link
Contributor

@jboxman jboxman left a comment

Choose a reason for hiding this comment

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

@adellape, a few minor items. LGTM.


- Access to an {product-title} cluster using an account with
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
`cluster-admin` permissions.
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it permission or permissions?

I've always written permissions, but I do wonder.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Can't find guidance on this, though I see way more "permissions" in our source versus "permission" (particularly if you omit modules/apis.adoc 🙂).

@@ -15,4 +15,9 @@ include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+2]
.Additional resources

* xref:../operators/understanding_olm/olm-understanding-operatorgroups.adoc#olm-operatorgroups-about_olm-understanding-operatorgroups[About OperatorGroups]

include::modules/olm-overriding-proxy-settings.adoc[leveloffset=+1]
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this need a space after the include?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The only spacing like this I've found that's required is a blank line before the include, otherwise you get a verbatim leveloffset in the text. Works fine with no space after it, and I like to see the "Additional resources" list clearly adjacent to the module it's related to.

@jboxman jboxman 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 Mar 19, 2020
@adellape adellape force-pushed the olm_proxy_override branch from 13bf53c to bda5db6 Compare March 19, 2020 23:08
@adellape adellape requested a review from jboxman March 19, 2020 23:08
[NOTE]
====
These environment variables can also be unset using an empty value to remove any
previously set cluster-wide or custom proxy settings.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This note will go into master and 4.4, but will be swapped in 4.2 and 4.3 for info on the Known Issue https://bugzilla.redhat.com/show_bug.cgi?id=1751903, with a link to the relevant release note.

@bandrade
Copy link

bandrade commented Apr 8, 2020

LGTM considering https://bugzilla.redhat.com/show_bug.cgi?id=1751903#c24 comment, thanks.

@adellape adellape merged commit 5f363fd into openshift:master Apr 9, 2020
@adellape
Copy link
Contributor Author

adellape commented Apr 9, 2020

/cherry-pick enterprise-4.4

@openshift-cherrypick-robot

@adellape: new pull request created: #21079

In response to this:

/cherry-pick enterprise-4.4

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

adellape commented Apr 9, 2020

Manually cherry-picked to enterprise-4.2 w/ tweaks via #21081.

@adellape
Copy link
Contributor Author

adellape commented Apr 9, 2020

Manually cherry-picked to enterprise-4.3 w/ tweaks via #20591.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants