Skip to content
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

BZ-1862278: Added changes as requested in the bug #31942

Merged
merged 1 commit into from
May 3, 2021

Conversation

sagidlow
Copy link
Contributor

@sagidlow sagidlow commented Apr 26, 2021

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 26, 2021
@netlify
Copy link

netlify bot commented Apr 26, 2021

Deploy preview for osdocs ready!

Built with commit 8ff2668

https://deploy-preview-31942--osdocs.netlify.app

@tsze-redhat
Copy link

Hi,
Thanks for working on this.
A couple of feedback:

#1
For the last link
https://deploy-preview-31942--osdocs.netlify.app/openshift-enterprise/latest/installing/installing_gcp/installing-gcp-user-infra-vpc.html#installation-gcp-user-infra-vpc-adding-firewall-rules [Example Output]

There probably should be a line break after
./oc get events -n openshift-ingress --field-selector="reason=LoadBalancerManualChange" Firewall change required by security admin:

As the rest is the output in separate lines like this:
./oc get events -n openshift-ingress --field-selector="reason=LoadBalancerManualChange"
LAST SEEN TYPE REASON OBJECT MESSAGE
47m Normal LoadBalancerManualChange service/router-default Firewall change required by security admin: gcloud compute firewall-rules create k8s-fw-a80c4d5e9e19a489fa304725480638dd --network aos-qe-network --description "{\"kubernetes.io/service-name\":\"openshift-ingress/router-default\", \"kubernetes.io/service-ip\":\"34.67.52.58\"}" --allow tcp:443,tcp:80 --source-ranges 0.0.0.0/0 --target-tags tszegcp042821b-4tqfv-master,tszegcp042821b-4tqfv-worker --project openshift-qe-shared-vpc

Please also remove the './" before the command to be consistent with rest of the oc commands on the page.
(I overlooked this when I wrote the BZ - my apology).

#2 Currently, we have
export CONTROL_SUBNET=(gcloud compute networks subnets describe ${HOST_PROJECT_CONTROL_SUBNET} --region=${REGION} --project ${HOST_PROJECT} --account ${HOST_PROJECT_ACCOUNT} --format json | jq -r .selfLink)

export COMPUTE_SUBNET=gcloud compute networks subnets describe ${HOST_PROJECT_COMPUTE_SUBNET} --region=${REGION} --project ${HOST_PROJECT} --account ${HOST_PROJECT_ACCOUNT} --format json | jq -r .selfLink

Both will work but not consistent.
It would be great if we can keep them consistent ( =` will be consistent with rest of the commands on page).
(Again, I overlooked, my apology again).

Please let me know what you think.

@@ -129,7 +129,7 @@ If you choose to create each rule based on events, you must create firewall rule
.Example output
[source,terminal]
----
Firewall change required by security admin: `gcloud compute firewall-rules create k8s-fw-a26e631036a3f46cba28f8df67266d55 --network example-network --description "{\"kubernetes.io/service-name\":\"openshift-ingress/router-default\", \"kubernetes.io/service-ip\":\"35.237.236.234\"}\" --allow tcp:443,tcp:80 --source-ranges 0.0.0.0/0 --target-tags exampl-fqzq7-master,exampl-fqzq7-worker --project example-project`
./oc get events -n openshift-ingress --field-selector="reason=LoadBalancerManualChange" Firewall change required by security admin: `gcloud compute firewall-rules create k8s-fw-a26e631036a3f46cba28f8df67266d55 --network example-network --description "{\"kubernetes.io/service-name\":\"openshift-ingress/router-default\", \"kubernetes.io/service-ip\":\"35.237.236.234\"}\" --allow tcp:443,tcp:80 --source-ranges 0.0.0.0/0 --target-tags exampl-fqzq7-master,exampl-fqzq7-worker --project example-project`
Copy link
Contributor

@adellape adellape Apr 28, 2021

Choose a reason for hiding this comment

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

+1 to @tsze-redhat's other related comment about a line break and dropping the ./. But further, if this addition is intending to illustrate what command you could run to view this example output, it seems like the command should also be in its own code block (with a $ prompt), prior to the example output block, to conform to our normal guidelines on showing commands with output. For example:

[source,terminal]
----
$ oc get events -n openshift-ingress --field-selector="reason=LoadBalancerManualChange"
---

.Example output
[source,terminal]
----
Firewall change required by security admin: `gcloud compute firewall-rules create k8s-fw-a26e631036a3f46cba28f8df67266d55 --network example-network --description "{\"kubernetes.io/service-name\":\"openshift-ingress/router-default\", \"kubernetes.io/service-ip\":\"35.237.236.234\"}\" --allow tcp:443,tcp:80 --source-ranges 0.0.0.0/0 --target-tags exampl-fqzq7-master,exampl-fqzq7-worker --project example-project`
----

Maybe also with a lead-in sentence before the oc get events command to provide some context for what's being shown. But if I'm misunderstanding and the literal example output includes the oc get events, then disregard.

@@ -15,3 +15,5 @@ You can use the following Deployment Manager template to deploy the internal loa
include::https://raw.githubusercontent.com/openshift/installer/release-4.8/upi/gcp/02_lb_int.py[]
----
====

You will need this in addition to the `02_lb_ext.py` when you create external cluster.
Copy link
Contributor

Choose a reason for hiding this comment

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

Possibly sprinkle "template" in a few places? Also seems to be missing the word "an" (or maybe "the") before "external cluster". E.g.:

You will need this template in addition to the `02_lb_ext.py` template when you create an external cluster.

the ingress load balancer. You can create either a wildcard
`*.apps.{baseDomain}.` or specific records. You can use A, CNAME, and other
records per your requirements.
DNS Zone configuration is removed when Kubernetes manifests and generates Ignition configs. You must manually create DNS records that point at the ingress load balancer. You can create either a wildcard
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like in the rest of the assembly, it's mostly lowercase "zone" in "DNS zone". I do see the one uppercase instance in the Prerequisites list below here though, FWIW. Not sure which is accurate, but I would assume lowercase.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think the word "creating" might also be missing in the first sentence:

"DNS zone configuration is removed when creating Kubernetes manifests and generating Ignition configs."

ifdef::shared-vpc[]
[NOTE]
====
This sections covers an optional step in other types of installation but it is mandatory for shared vpn install. Therefore, this change should NOT be propagated to other installation types.
Copy link
Contributor

Choose a reason for hiding this comment

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

Singular: s/sections/section/

s/installation but/installations, but/

Copy link
Contributor

Choose a reason for hiding this comment

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

Is "vpn" in the BZ maybe a typo of "VPC"? So possibly:

s/vpn install/VPC installations/

Copy link
Contributor

Choose a reason for hiding this comment

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

Re: "NOT", IBM SG states to avoid using uppercase for emphasis and allows italics. Our repo guidelines also allow italics, though suggests using sparingly.

Copy link
Contributor

@adellape adellape Apr 28, 2021

Choose a reason for hiding this comment

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

Re-reading the BZ now, actually, I'm wondering if this note was intended to be included verbatim in the doc, or was just describing the suggested paragraph change? @tsze-redhat Can you help confirm?

Choose a reason for hiding this comment

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

Yes, 'vpn' should be 'vpc' - sorry. I edited the BZ.

And yes, that sentence beginning with 'Note:' is just a reminder that changes for the BZ are not supposed to go to other pages like Restricted Network or regular UPI install pages.

Hope this helps. Thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I removed this note from the documentation. I thought it was meant for the doc and not for us :-)

@tsze-redhat
Copy link

LGTM.

Thank you!

@adellape adellape merged commit 3d3c61b into openshift:master May 3, 2021
@adellape
Copy link
Contributor

adellape commented May 3, 2021

/cherrypick enterprise-4.8

@adellape
Copy link
Contributor

adellape commented May 3, 2021

/cherrypick enterprise-4.7

@adellape
Copy link
Contributor

adellape commented May 3, 2021

/cherrypick enterprise-4.6

@adellape
Copy link
Contributor

adellape commented May 3, 2021

/cherrypick enterprise-4.5

@openshift-cherrypick-robot

@adellape: new pull request created: #32125

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

@adellape: new pull request created: #32126

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

@adellape: new pull request created: #32127

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.

@openshift-cherrypick-robot

@adellape: new pull request created: #32128

In response to this:

/cherrypick enterprise-4.5

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.5 branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants