Skip to content

operator: Add bootstrap arg --machine-config-oscontent-image #355

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-merge-robot merged 1 commit into from
Feb 1, 2019
Merged

operator: Add bootstrap arg --machine-config-oscontent-image #355

openshift-merge-robot merged 1 commit into from
Feb 1, 2019

Conversation

@cgwalters
Copy link
Member

@cgwalters cgwalters commented Jan 29, 2019

This will allow the installer to render the payload's osImageURL
ConfigMap in the initial MachineConfig as well.

Closes: #334

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 29, 2019
This was referenced Jan 29, 2019
Closed
Merged
@cgwalters
Copy link
Member Author

cgwalters commented Jan 29, 2019

Installer PR using this: openshift/installer#1149

@cgwalters
Copy link
Member Author

cgwalters commented Jan 29, 2019

Only compile tested as of yet...but this is quite simple and should work.

@jlebon
Copy link
Member

jlebon commented Jan 30, 2019

Code itself is clearly correct. General approach looks sane to me (this is similar to #343) though will let installer folks comment as well.

/approve

@cgwalters cgwalters mentioned this pull request Jan 31, 2019
Merged
@cgwalters cgwalters force-pushed the bootstrap-osimgurl-2 branch from 588ed7c to edecd96 Compare January 31, 2019 14:25
@ashcrow
Copy link
Member

ashcrow commented Jan 31, 2019 

test "release-latest" failed: pod release-latest was already deleted

/retest

Agreed, the change looks good and is pretty simple.

@ashcrow
Copy link
Member

ashcrow commented Jan 31, 2019

/retest

@cgwalters
Copy link
Member Author

cgwalters commented Jan 31, 2019

OK, it's turning out to be a bit annoying to get a release payload with this PR so I can test changes to the installer. Since IMO this PR is:

  • fairly obviously correct (or close to it)
  • Harmless if the option isn't provided

I vote we land this and then actually test it in the installer PR. If we need further changes here we circle back and do it.

@ashcrow
Copy link
Member

ashcrow commented Jan 31, 2019

Once rebased 👍 to merging

@cgwalters cgwalters force-pushed the bootstrap-osimgurl-2 branch from edecd96 to 07cc142 Compare January 31, 2019 19:47
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 31, 2019
@cgwalters
Copy link
Member Author

cgwalters commented Jan 31, 2019

OK rebased 🏄‍♂️ - did a bit more changes to blend in with using the Images structure.

cgwalters
cgwalters commented Jan 31, 2019
View reviewed changes
cmd/machine-config-operator/bootstrap.go Outdated
Copy link
Member Author

@cgwalters cgwalters Jan 31, 2019

Choose a reason for hiding this comment

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

Hmm, that looks wrong. One sec.

@cgwalters
operator: Add bootstrap arg --machine-config-oscontent-image
77ed063 
This will allow the installer to render the payload's osImageURL
ConfigMap in the initial MachineConfig as well.

Closes: openshift#334
@cgwalters cgwalters force-pushed the bootstrap-osimgurl-2 branch from 07cc142 to 77ed063 Compare January 31, 2019 20:20
@yuqi-zhang
Copy link
Contributor

yuqi-zhang commented Jan 31, 2019

/lgtm

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

openshift-ci-robot commented Jan 31, 2019

[APPROVALNOTIFIER] This PR is APPROVED

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

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [ashcrow,cgwalters,jlebon]

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

@yuqi-zhang
Copy link
Contributor

yuqi-zhang commented Feb 1, 2019

/retest

@openshift-merge-robot openshift-merge-robot merged commit 153a6e9 into openshift:master Feb 1, 2019
@wking wking mentioned this pull request Feb 5, 2019
Closed
osherdp pushed a commit to osherdp/machine-config-operator that referenced this pull request Apr 13, 2021
@openshift-merge-robot
Merge pull request openshift#355 from openshift-bot/art-consistency-o…
6b77136 
…penshift-4.8-ose-cluster-samples-operator

Updating ose-cluster-samples-operator builder & base images to be consistent with ART
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ashcrow ashcrow ashcrow approved these changes

@jlebon jlebon Awaiting requested review from jlebon

Assignees

@yuqi-zhang yuqi-zhang

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/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@cgwalters @jlebon @ashcrow @yuqi-zhang @openshift-ci-robot @openshift-merge-robot