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

pkg/asset/manifests/operators: Drop worker-ignition dependency #529

Merged

Conversation

wking
Copy link
Member

@wking wking commented Oct 24, 2018

We'd added this in 4d636d3 (#286) to support the machine-API operator which had been generating worker machine-sets. But since e2dc955 (#468) we create those machine-sets ourselves. And the machine-API operator dropped their consuming code in openshift/machine-api-operator@c59151f6 (openshift/machine-api-operator#286).

Dropping this dependency fixes bootstrap Ignition config edits during a multi-step deploy. For example, with:

$ openshift-install --dir=wking create ignition-configs
$ tree wking
wking
├── bootstrap.ign
├── master-0.ign
└── worker.ign

before this pull request, any edits to bootstrap.ign were clobbered in a subsequent create cluster call, because:

  1. The bootstrap Ignition config depends on the manifests.
  2. The manifests depended on the worker Ignition config.
  3. The worker Ignition config is on disk, so it gets marked dirty.

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 24, 2018
wking added 2 commits October 24, 2018 03:00
We'd added this in 4d636d3 (asset/manifests: bootstrap manifest
generation, 2018-08-31, openshift#286) to support the machine-API operator
which had been generating worker machine-sets.  But since e2dc955
(pkg/asset: add ClusterK8sIO, machines.Worker assets, 2018-10-15, openshift#468),
we've been creating those machine-sets ourselves.  And the machine-API
operator dropped their consuming code in
openshift/machine-api-operator@c59151f6 (delete machine/cluster object
loops, 2018-10-22, openshift/machine-api-operator#286).

Dropping this dependency fixes bootstrap Ignition config edits during
a multi-step deploy.  For example, with:

  $ openshift-install --dir=wking create ignition-configs
  $ tree wking
  wking
  ├── bootstrap.ign
  ├── master-0.ign
  └── worker.ign

before this commit, any edits to bootstrap.ign were clobbered in a
subsequent 'create cluster' call, because:

1. The bootstrap Ignition config depends on the manifests.
2. The manifests depended on the worker Ignition config.
3. The worker Ignition config is on disk, so it gets marked dirty.
…removal

Generated with:

  $ openshift-install graph | dot -Tsvg >docs/design/resource_dep.svg

using:

  $ dot -V
  dot - graphviz version 2.30.1 (20170916.1124)
@wking wking force-pushed the drop-worker-ignition-from-cluster branch from 376e865 to 983eef3 Compare October 24, 2018 10:02
@openshift-ci-robot openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 24, 2018
Copy link
Contributor

@crawford crawford left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 24, 2018
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crawford, 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:

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

@openshift-merge-robot openshift-merge-robot merged commit 5467b7d into openshift:master Oct 24, 2018
@wking wking deleted the drop-worker-ignition-from-cluster branch October 24, 2018 18:50
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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants