Skip to content

bootstrap: Require images on command line#403

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
cgwalters:require-cvo-images
Feb 12, 2019
Merged

bootstrap: Require images on command line#403
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
cgwalters:require-cvo-images

Conversation

@cgwalters
Copy link
Copy Markdown
Member

Since having a mismatch here will result in a broken cluster,
change things so that the command line arguments are required
and drop the docker.io image references. We never want
to pull those into a real cluster.

Ref: #367

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 11, 2019
@runcom
Copy link
Copy Markdown
Member

runcom commented Feb 11, 2019

/test unit

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 11, 2019
@runcom
Copy link
Copy Markdown
Member

runcom commented Feb 11, 2019

copy pasted /lgtm wrongly while reviewing other PRs lol but looks good

/lgtm cancel

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 11, 2019
@cgwalters
Copy link
Copy Markdown
Member Author

And now if anyone wants to add a new MCO-managed image, they need to:

  • Add a CLI option here with a default
  • Change the installer to pass that arg with the image from the CVO
  • Make the option required here

Or we change this bootstrap code to just parse the CVO payload directly which IMO would be saner, but this is the current status.

Copy link
Copy Markdown
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

And now if anyone wants to add a new MCO-managed image, they need to:

  • Add a CLI option here with a default
  • Change the installer to pass that arg with the image from the CVO
  • Make the option required here

Can we write this down somewhere? Either as a comment in the code, or somewhere in HACKING.md or something.

Comment thread pkg/operator/images.go Outdated
Comment thread cmd/machine-config-operator/bootstrap.go Outdated
Comment thread pkg/operator/images.go Outdated
Since having a mismatch here will result in a broken cluster,
change things so that the command line arguments are required
and drop the `docker.io` image references.  We never want
to pull those into a real cluster.

Ref: openshift#367
@jlebon
Copy link
Copy Markdown
Member

jlebon commented Feb 11, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 11, 2019
@openshift-ci-robot
Copy link
Copy Markdown
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

Details 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

@runcom
Copy link
Copy Markdown
Member

runcom commented Feb 11, 2019

/flake

/test e2e-aws

@runcom
Copy link
Copy Markdown
Member

runcom commented Feb 11, 2019

these are really aws running out of resources, let's hold retesting for a while

@ashcrow
Copy link
Copy Markdown
Member

ashcrow commented Feb 12, 2019

these are really aws running out of resources, let's hold retesting for a while

🤦‍♂️

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 3b4a34a into openshift:master Feb 12, 2019
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