-
Notifications
You must be signed in to change notification settings - Fork 1.5k
docs/user: Standardize install-config property documentation #2162
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
docs/user: Standardize install-config property documentation #2162
Conversation
patrickdillon
left a comment
There was a problem hiding this 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.
96b16e9 to
211796a
Compare
|
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? |
docs/user/customization.md
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gcp, none, baremetal ?
There was a problem hiding this comment.
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.
docs/user/vsphere/customization.md
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good!
211796a to
91c8e95
Compare
91c8e95 to
1d3e2ea
Compare
docs/user/openstack/customization.md
Outdated
There was a problem hiding this comment.
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.
1d3e2ea to
ea6f75e
Compare
ea6f75e to
715a847
Compare
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)
715a847 to
a947609
Compare
|
/lgtm |
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
| 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 |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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. |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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. |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
@wking: The following tests failed, say
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. DetailsInstructions 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. |
Typo is from a947609 (docs/user: Standardize install-config property documentation, 2019-08-05, openshift#2162).
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)
Typo is from a947609 (docs/user: Standardize install-config property documentation, 2019-08-05, openshift#2162).
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).
@abhinavdahiya, does this look like a reasonable path?
Fixes #2285.