-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
create: separate bootstrap and node ignition config assets into separate targets #1119
Conversation
The openshift-install ignition-configs sub-command has been renamed to pre-cluster. See openshift/installer#1119
The openshift-install ignition-configs sub-command has been renamed to pre-cluster. See openshift/installer#1119
Can you also re-generate the dependency graph? That will be the ultimate test of whether or not this teases apart the multi-generational relationship. |
It's already been re-generated. |
Oh, GitHub collapsed the diff and I only saw the one commit. Can you split the SVG generation into separate commit as we've done historically? |
/approve |
Sure. I didn't realize that the preference was to separate the SVG generation into a separate commit: I've never separated it in any of my past commits. |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: crawford, staebler 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:
Approvers can indicate their approval by writing |
docs/user/versioning.md
Outdated
@@ -4,7 +4,8 @@ The installer uses [Semantic Versioning][semver] for its user-facing API. | |||
Covered by the versioning are: | |||
|
|||
* `openshift-install [options] create install-config`, which will always create `install-config.yaml` in the asset directory, although the version of the generated install-config may change. | |||
* `openshift-install [options] create ignition-configs`, which will always create `bootstrap.ign`, `master.ign`, and `worker.ign` in the asset directory, although the content of the generated files may change. | |||
* `openshift-install [options] create node-config`, which will always create `master.ign` and `worker.ign` in the asset directory, although the content of the generated files may change. | |||
* `openshift-install [options] create pre-cluster`, which will always create `bootstrap.ign` in the asset directory, although the content of the generated files may change. |
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.
Call out metadata.json
here too? auth/kubeconfig
? Hive/BYOI will rely on their presence (CC @dgoodwin, @vrutkovs), but they'll be able to adapt to changes. Do we want to make compat commitments for external tooling that consumes them as well? CC @abhinavdahiya, @crawford.
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 made the change, but I can take it back out if we decide we do not want to make the compatibility commitment.
cmd/openshift-install/create.go
Outdated
Use: "node-config", | ||
Short: "Generates the ignition configs for the master and worker nodes", | ||
}, | ||
assets: []asset.WritableAsset{&machine.Master{}, &machine.Worker{}}, |
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.
Actually, who cares about these pointer Ignition configs? Do we even need a target for them? I expect the default pointers will be fine and folks will tweak the machine Ignition configuration by configuring the machine-config server. pre-cluster
may be sufficient with it's reduced target set.
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 don't know. I thought that @crawford had a use case for modifying the master and worker ignition configs.
/retest |
/retest |
/retest |
/retest |
Three times in a row now with this failure. I'll evaluate whether it is a real failure. |
/retest |
/retest |
/retest |
…ate targets The Bootstrap Ignition asset is dependent upon the Master and Worker Ignition assets. It is problematic to have them all targeted by the same sub-command because it makes it difficult for a user to modify all of the ignition configs. These changes create a new sub-command that targets just the Master and Worker Ignition assets. The ignition-configs sub-command has been renamed to pre-cluster. This reflects that the sub-command targets more than just the Bootstrap Ignition asset, as it targets the kubeconfig and the metadata.json as well. The new sub-command has been named node-config. The ignitions-configs sub-command has been deprecated and will be rmeoved once it is no longer used. Fixes https://jira.coreos.com/browse/CORS-948
The ignition-config was split into node-config and pre-cluster targets so the dependency graph needed to be updated. Generated with: $ openshift-install graph | dot -Tsvg >docs/design/resource_dep.svg using: $ dot -V dot - graphviz version 2.40.1 (20161225.0304)
@staebler: The following test failed for commit 69b980d, 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. 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. |
/hold Hold for 4.1. |
@staebler: PR needs rebase. 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. |
/close Superseded by #1532. |
@staebler: Closed this PR. In response to this:
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. |
The Bootstrap Ignition asset is dependent upon the Master and Worker Ignition assets.
It is problematic to have them all targeted by the same sub-command because it makes
it difficult for a user to modify all of the ignition configs. These changes create
a new sub-command that targets just the Master and Worker Ignition assets.
The ignition-configs sub-command has been renamed to pre-cluster. This reflects that
the sub-command targets more than just the Bootstrap Ignition asset, as it targets
the kubeconfig and the metadata.json as well.
The new sub-command has been named node-config.
Fixes https://jira.coreos.com/browse/CORS-948
For discussion on alternative solutions, see https://docs.google.com/document/d/1Wr82knlY5iY5K10GOBk3Q39HabtuoJcU9pFInSKZclA/edit?usp=sharing.