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

controller: Take first non-empty osImageURL #279

Merged

Conversation

cgwalters
Copy link
Member

Today each MC will contain both an Ignition fragment and an
osImageURL. Define "merging" as using the first
non-empty osImageURL so we don't have to be very picky about
ordering.

This is a smaller version of
#228

Prep for: #273

Today each MC will contain both an Ignition fragment and an
`osImageURL`.  Define "merging" as using the first
non-empty `osImageURL` so we don't have to be very picky about
ordering.

This is a smaller version of
openshift#228

Prep for: openshift#273
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 9, 2019
@jlebon
Copy link
Member

jlebon commented Jan 9, 2019

/lgtm

Looking at #228 (comment), I'm wondering if it'd make sense to extend it like so: take first non-empty osImageURL, but then also allow overrides from later non-empty osImageURLs and emitting a warning? OTOH, if we go the configmap route in #273, then we'd be able to override there.

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, jlebon

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-bot
Copy link
Contributor

/retest

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

@cgwalters
Copy link
Member Author

/test e2e-aws
/test images

@ashcrow
Copy link
Member

ashcrow commented Jan 9, 2019

/test e2e-aws

2 similar comments
@ashcrow
Copy link
Member

ashcrow commented Jan 9, 2019

/test e2e-aws

@ashcrow
Copy link
Member

ashcrow commented Jan 9, 2019

/test e2e-aws

@crawford
Copy link
Contributor

crawford commented Jan 9, 2019

I said it back in #228, but I'll say it again:

We're going to need to allow the OS to be overridden, but we should make a stink when it happens. Users will inevitably find this and blow their foot off six months down the road when their cluster updates but the OS doesn't. What is the best way to surface that information? Can we propagate it up via the ClusterOperator CR?

@cgwalters
Copy link
Member Author

Part of the issue is we can't speak sanely about users "overriding" anything until we have the canonical CVO-driven bits from #273

@cgwalters
Copy link
Member Author

The way I see it is is this is a short term aid just to have slightly less awkward semantics, though in the end it's really optional.

Following on from #273 we could easily change things so that the rendered MC always has the osImageURL from the CVO driven configmap, i.e. ordering of the MC's doesn't matter, and further
we can then easily implement your requested warning if the rendered MC doesn't match our expected osImageURL in the operator.

@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants