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

Add osimageurl to release payload and controllerconfig #305

Merged

Conversation

cgwalters
Copy link
Member

[ And also the SSH test patch ]

Split out of #273

This is the first part of closing the gap in getting the RHCOS oscontainer
into the update payload.

Introduce a new ConfigMap machine-config-osimageurl that points to
the oscontainer and is owned by the CVO. Then, the operator propagates
that into the controllerconfig CRD.

Further patches will have the controller react to the update, but having
this first step in will help us validate the model without actually
having clusters update.

@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 15, 2019
Copy link
Member

@ashcrow ashcrow left a comment

Choose a reason for hiding this comment

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

Looks good! Will defer to a second review for merging.

@abhinavdahiya
Copy link
Contributor

Mounting the configmap vs syncing?
Operator reading the OS image url and passing to controller using config vs passing pointed to config in controller config.

@cgwalters
Copy link
Member Author

cgwalters commented Jan 15, 2019

Mounting the configmap vs syncing?

I did that originally, but how do you suggest monitoring for changes?

Operator reading the OS image url and passing to controller using config vs passing pointed to config in controller config.

Can you flesh this out a bit?

EDIT: I guess you're saying to pass the name of the CM and have the controller reread it? I don't quite understand the advantage; it would seem to require rewriting the renderer's queuing to know how to monitor the CM too, and that looked invasive (but I could be wrong).

@kikisdeliveryservice
Copy link
Contributor

As a suggestion I think that we should refrain from making unrelated commits (like changing the SSH tests in osimageurl work) in PRs like this going forward bc they are hard to see/review and get lost in the shuffle.

@cgwalters
Copy link
Member Author

I think that we should refrain from making unrelated commits

I generally agree, however I'm trying to batch at least some PRs to increase the chances they make it through the e2e-aws roulette.

It is a clearly separate commit, and this is already a prep PR split from the bigger one. But if you still prefer we can separate it out.

@cgwalters cgwalters force-pushed the cvo-integration-prep-0 branch from 74ac9e5 to 9ce87a9 Compare January 15, 2019 18:59
@ashcrow
Copy link
Member

ashcrow commented Jan 15, 2019

I agree with @kikisdeliveryservice's sentiment. For the time being to help move through CI I think it's OK to have PRs with unrelated commits but, when we do that, let's have the PR name reference all the changes so it's searchable.

@ashcrow
Copy link
Member

ashcrow commented Jan 15, 2019

/retest

@cgwalters
Copy link
Member Author

OK so we don't have a whole lot of time left to implement OS updates. We can redesign it...review is good, but at the moment it's just me actively hacking on it, and right now to work on it one needs to redeploy the whole stack (operator, controller, server, daemon). It'd make it significantly more convenient for others to hack on if we landed these operator pieces now.

@kikisdeliveryservice
Copy link
Contributor

These changes LGTM in light of the work I had to do on SSH. I'll let someone more familiar with the OS updates @jlebon @abhinavdahiya do the final approval.

Split out of openshift#273

This is the first part of closing the gap in getting the RHCOS oscontainer
into the update payload.

Introduce a new ConfigMap machine-config-osimageurl that points to
the oscontainer and is owned by the CVO.  Then, the operator propagates
that into the `controllerconfig` CRD.

Further patches will have the controller react to the update, but having
this first step in will help us validate the model without actually
having clusters update.
@cgwalters cgwalters force-pushed the cvo-integration-prep-0 branch from 9ce87a9 to b5ec446 Compare January 15, 2019 21:40
@jlebon
Copy link
Member

jlebon commented Jan 15, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 15, 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-merge-robot openshift-merge-robot merged commit 5d43d89 into openshift:master Jan 16, 2019
osherdp pushed a commit to osherdp/machine-config-operator that referenced this pull request Apr 13, 2021
simplify imagestream/template directory structure; more sensible dir name
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