Skip to content

Conversation

@wking
Copy link
Member

@wking wking commented Aug 5, 2019

@abhinavdahiya, does this look like a reasonable path?

Fixes #2285.

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 5, 2019
Copy link
Contributor

@patrickdillon patrickdillon left a comment

Choose a reason for hiding this comment

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

I do think an example install config would be helpful.

I also provided some minor nitpicky copy edit suggestions. The changes probably need to also be copied to the originating comments.

@wking wking force-pushed the install-config-markdown-docs branch 2 times, most recently from 96b16e9 to 211796a Compare September 1, 2019 21:42
@wking wking changed the title WIP: docs/user: Standardize install-config property documentation docs/user: Standardize install-config property documentation Sep 1, 2019
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 1, 2019
@wking
Copy link
Member Author

wking commented Sep 1, 2019

Ok, I've pushed 96b16e9d4 -> 211796a93 filling in most of the rest of this (enough to remove the WIP tag from the PR subject). I'm not clear on a bunch of the vSphere and OpenStack stuff though; can I get some help there, @abhinavdahiya, @tomassedovic, @Fedosin?

Copy link
Contributor

Choose a reason for hiding this comment

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

gcp, none, baremetal ?

Copy link
Member Author

Choose a reason for hiding this comment

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

gcp, none, baremetal ?

Can we grow those in follow-up work? We weren't linking to them before this PR, and I'm not all that familiar with whether parameters are required or not. Seems like it would be easier to review if they had platform-specific PRs.

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks good!

@wking wking force-pushed the install-config-markdown-docs branch from 211796a to 91c8e95 Compare September 4, 2019 22:17
@wking wking force-pushed the install-config-markdown-docs branch from 91c8e95 to 1d3e2ea Compare September 9, 2019 18:53
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 9, 2019
Copy link
Member Author

Choose a reason for hiding this comment

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

It's also strange that we use compute in a parameter that is configuring the control plane machines.

@wking wking force-pushed the install-config-markdown-docs branch from 1d3e2ea to ea6f75e Compare September 9, 2019 18:57
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 9, 2019
@wking wking force-pushed the install-config-markdown-docs branch from ea6f75e to 715a847 Compare September 9, 2019 19:36
This is a bit more accessible than pointing folks at Godocs, since it
allows us to focus on the YAML property names (while Godocs
understandably focus on Go property names) and YAML renderings.  Also
break up our old "one big example" install-config.yaml into a minimal
per-platform example and a series of small extentions excercising
groups of properties.

The vSphere docs are based heavily on [1].

Also drop proxy.md.  It was added in e7edbf7 (Add proxy
configuration to bootstrap node, 2019-06-24, openshift#1832), but:

* Proxy testing and Squid configuration information belongs in
  openshift/release, not in the installer repository.
* docs/user/customization.md now contains a more complete proxy-config
  fragment.

OpenStack computeFlavor precedence is based on [2].

[1]: https://github.com/openshift/openshift-docs/blob/enterprise-4.2/modules/installation-vsphere-config-yaml.adoc
     Last touched by commit openshift/openshift-docs@25afc76 , 2019-08-19
[2]: openshift#2162 (comment)
@wking wking force-pushed the install-config-markdown-docs branch from 715a847 to a947609 Compare September 9, 2019 19:37
@Fedosin
Copy link
Contributor

Fedosin commented Sep 9, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 9, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Fedosin, wking

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

Resources created by the cluster itself may not include these tags.
* `defaultMachinePlatform` (optional object): Default [AWS-specific machine pool properties](#machine-pools) which applies to [machine pools](../customization.md#machine-pools) that do not define their own AWS-specific properties.

## Machine pools
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: match with something similar to Cluster-scoped properties

Copy link
Member Author

Choose a reason for hiding this comment

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

nit: match with something similar to Cluster-scoped properties

Do you mean "Machine pools" -> "Machine-pool properties"? Or something else?

- `platform.aws.userTags` - a map of keys and values that the installer will add as tags to all resources it creates
## Cluster-scoped properties

* `amiID` (optional string): The AMI that should be used to boot machines for the cluster.
Copy link
Contributor

Choose a reason for hiding this comment

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

should string be surrounded with back ticks?

Copy link
Member Author

Choose a reason for hiding this comment

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

should string be surrounded with back ticks?

Like:

* `amiID` (optional `string`): ...

? I think it's fine without that; if we wanted to be formal we could link to the JSON RFC for string or the YAML string spec. But the YAML spec is pretty dense; I'm fine just leaving it as an informal "string" and expecting folks to figure it out. I'm also fine linking to the specs if you want me to file that as follow-up work.

* `amiID` (optional string): The AMI that should be used to boot machines for the cluster.
If set, the AMI should belong to the same region as the cluster.
* `region` (required string): The AWS region where the cluster will be created.
* `userTags` (optional object): Additional keys and values that the installer will add as tags to all resources that it creates.
Copy link
Contributor

Choose a reason for hiding this comment

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

hmm, object is probably not accurate here because it is map string->string, where objects are more like rootVolume ie has known fields and values.

Copy link
Member Author

@wking wking Sep 9, 2019

Choose a reason for hiding this comment

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

hmm, object is probably not accurate here because it is map string->string...

That's still a JSON object (YAML mapping), we just leave the set of valid keys more open-ended than for JSON objects backed by Go structs.

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit edbfd3e into openshift:master Sep 9, 2019
@openshift-ci-robot
Copy link
Contributor

@wking: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-openstack a947609 link /test e2e-openstack
ci/prow/e2e-libvirt a947609 link /test e2e-libvirt

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.

Details

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.

@wking wking deleted the install-config-markdown-docs branch September 10, 2019 04:10
wking added a commit to wking/openshift-installer that referenced this pull request Sep 26, 2019
Typo is from a947609 (docs/user: Standardize install-config
property documentation, 2019-08-05, openshift#2162).
jhixson74 pushed a commit to jhixson74/installer that referenced this pull request Dec 6, 2019
This is a bit more accessible than pointing folks at Godocs, since it
allows us to focus on the YAML property names (while Godocs
understandably focus on Go property names) and YAML renderings.  Also
break up our old "one big example" install-config.yaml into a minimal
per-platform example and a series of small extentions excercising
groups of properties.

The vSphere docs are based heavily on [1].

Also drop proxy.md.  It was added in e7edbf7 (Add proxy
configuration to bootstrap node, 2019-06-24, openshift#1832), but:

* Proxy testing and Squid configuration information belongs in
  openshift/release, not in the installer repository.
* docs/user/customization.md now contains a more complete proxy-config
  fragment.

OpenStack computeFlavor precedence is based on [2].

[1]: https://github.com/openshift/openshift-docs/blob/enterprise-4.2/modules/installation-vsphere-config-yaml.adoc
     Last touched by commit openshift/openshift-docs@25afc76 , 2019-08-19
[2]: openshift#2162 (comment)
jhixson74 pushed a commit to jhixson74/installer that referenced this pull request Dec 6, 2019
Typo is from a947609 (docs/user: Standardize install-config
property documentation, 2019-08-05, openshift#2162).
wking added a commit to wking/openshift-installer that referenced this pull request Jan 10, 2020
It's been vCenter since the property landed in 3e73413
(types/vsphere: simplify vsphere platform, 2019-04-10, openshift#1591).  This
commit fixes "vcenter" typos from 0ec07d0 (docs: vSphere
installation docs, 2019-04-07, openshift#1545) and a947609 (docs/user:
Standardize install-config property documentation, 2019-08-05, openshift#2162).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. 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.

Documentation is not friendly