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

Text edits for the CloudFormation templates #1794

Merged

openshift-merge-robot merged 1 commit into openshift:master from kalexand-rh:cloudformation_edits

Jun 1, 2019

Contributor

kalexand-rh commented May 28, 2019

Because we can no longer use "UPI" in customer-facing documentation and the CloudFormation templates in /installer are published in /openshift-docs, I want to change the source templates instead of having to always reproduce the fix in the docs repo.

I'm making a few other style and changes to the parameter descriptions.

openshift-ci-robot added the size/L label

openshift-ci-robot requested review from jcpowermac and jstuever

May 28, 2019 16:26

Contributor Author

kalexand-rh commented May 28, 2019

@wking, @cuppett PTAL?

Contributor Author

kalexand-rh commented May 28, 2019

/retest

Member

cuppett commented May 28, 2019

Good edits. Thanks!

Contributor Author

kalexand-rh commented May 28, 2019

Thank you, Stephen!

Contributor Author

kalexand-rh commented May 29, 2019

/retest

Contributor Author

kalexand-rh commented May 29, 2019

@jcpowermac, @jstuever, since Stephen's agreed with the change, will you +1 it and help me get it into the right locations?

abhinavdahiya reviewed

View reviewed changes

upi/aws/cloudformation/04_cluster_bootstrap.yaml Show resolved Hide resolved

Contributor

abhinavdahiya commented May 29, 2019

/approve

openshift-ci-robot added the approved label

Contributor Author

kalexand-rh commented May 29, 2019

/retest

wking reviewed

View reviewed changes

upi/aws/cloudformation/02_cluster_infra.yaml Outdated Show resolved Hide resolved

wking reviewed

View reviewed changes

upi/aws/cloudformation/02_cluster_infra.yaml Outdated Show resolved Hide resolved

wking reviewed

View reviewed changes

upi/aws/cloudformation/02_cluster_infra.yaml Outdated Show resolved Hide resolved

wking reviewed

View reviewed changes

upi/aws/cloudformation/04_cluster_bootstrap.yaml Outdated Show resolved Hide resolved

wking reviewed

View reviewed changes

upi/aws/cloudformation/06_cluster_worker_node.yaml Outdated Show resolved Hide resolved

Contributor Author

kalexand-rh commented May 30, 2019

@wking, I've made some updates based on your comments. Thanks! Will you PTAL?

mazzystr approved these changes

View reviewed changes

This was referenced May 30, 2019

more CF updates openshift/openshift-docs#15086

Merged

osdocs432 removing upi/ipi openshift/openshift-docs#15087

Merged

Contributor

abhinavdahiya commented May 30, 2019

a17914c needs to have a better commit title and message.
51c26b3 needs to be squashed before merge.

kalexand-rh force-pushed the cloudformation_edits branch from a17914c to 95e525f Compare

May 30, 2019 22:27

Contributor Author

kalexand-rh commented May 30, 2019

@abhinavdahiya, is this acceptable?

Contributor

abhinavdahiya commented May 30, 2019

@abhinavdahiya, is this acceptable?

+1

Contributor Author

kalexand-rh commented May 30, 2019

@abhinavdahiya, do you have any suggestions for getting this merged?

Contributor

abhinavdahiya commented May 30, 2019

@abhinavdahiya, do you have any suggestions for getting this merged?

@wking had comments on the PR. i'll give him some time to come back and give it a second round of review.

wking reviewed

View reviewed changes

upi/aws/cloudformation/06_cluster_worker_node.yaml Outdated Show resolved Hide resolved


          Text edits for the CloudFormation templates

e45521e

Because we can no longer use "UPI" in customer-facing documentation and the CloudFormation templates in /installer are published in /openshift-docs, I want to change the source templates instead of having to always reproduce the fix in the docs repo.

I'm making a few other style and changes to the parameter descriptions.

Per a comment on a docs PR (openshift/openshift-docs#15059), the subnet type for the worker CloudFormation template  needs to change to PrivateSubnet from WorkerSubnet. Trevor clarified that the subnet in the worker does not need to be private. s/PrivateSubnet/Subnet in just that CloudFormation Template.

openshift-ci-robot added the lgtm label

Contributor

openshift-ci-robot commented May 31, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, kalexand-rh, mazzystr, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [abhinavdahiya,wking]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

19 similar comments

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented May 31, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jun 1, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jun 1, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Jun 1, 2019

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-merge-robot merged commit 273cece into openshift:master

Contributor

openshift-ci-robot commented Jun 1, 2019

@kalexand-rh: The following test failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-scaleup-rhel7	`e45521e`	link	`/test e2e-aws-scaleup-rhel7`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

kalexand-rh deleted the cloudformation_edits branch

June 3, 2019 12:49

kalexand-rh mentioned this pull request

version: Output RHEL CoreOS bootimage version #1815

Closed

wking added a commit to wking/openshift-release that referenced this pull request


          ci-operator/templates/openshift/installer/cluster-launch-installer-up…

456f258

…i-e2e: WorkerSubnet -> Subnet

Catching up with openshift/installer@e45521e9 (Text edits for the
CloudFormation templates, 2019-05-28, openshift/installer#1794).

wking mentioned this pull request

ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e: WorkerSubnet -> Subnet openshift/release#4013

Merged

wking mentioned this pull request

ci-operator/templates/openshift/installer/cluster-launch-installer-upi*: Switch on BRANCH for RHCOS AMI openshift/release#6248

Closed

wking pushed a commit to wking/openshift-installer that referenced this pull request


          a few bootstrap spelling issues

357cd7e

This had some trivial conflicts in the CloudFormation templates
because e45521e (Text edits for the CloudFormation templates,
2019-05-28, openshift#1794) wasn't backported to 4.1.

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

Reviewers

wking wking left review comments

abhinavdahiya abhinavdahiya left review comments

mazzystr mazzystr approved these changes

jcpowermac Awaiting requested review from jcpowermac

jstuever Awaiting requested review from jstuever

Labels

approved lgtm size/L