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

operator/bootstrap: Accept new --image-references argument #3017

Closed

Conversation

cgwalters
Copy link
Member

operator/bootstrap: Accept new --image-references argument

The MCO orchestrates the management/setup of a big pile of different
containers today, from machine-os-content to haproxy and
configuring cri-o to use the correct pause/pod container.

These images get set up at both "bootstrap" time and cluster time.
In bootstrap today we manually scrape each image out of the CVO in
shell script, and then pass them as CLI arguments inside bootkube.sh.

This means adding new images requires a tedious "ratcheting" process
where the CLI argument is added to the MCO, then we patch the installer
to pass it in.

Instead, add a new CLI argument which accepts a serialized imagestream
object, which is exactly what the CVO carries.

Prep for adding a new rhel-coreos image into the payload, so I can
avoid that ratcheting process.


@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 14, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 14, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 14, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 14, 2022
@cgwalters
Copy link
Member Author

Depends: openshift/library-go#1331

/test unit
/test verify

@cgwalters cgwalters changed the title Read imagestream directliy operator/bootstrap: Accept new --image-references argument Mar 14, 2022
The MCO orchestrates the management/setup of a big pile of different
containers today, from `machine-os-content` to `haproxy` and
configuring cri-o to use the correct `pause`/`pod` container.

These images get set up at both "bootstrap" time and cluster time.
In bootstrap today we manually scrape each image out of the CVO in
shell script, and then pass them as CLI arguments inside `bootkube.sh`.

This means adding new images requires a tedious "ratcheting" process
where the CLI argument is added to the MCO, then we patch the installer
to pass it in.

Instead, add a new CLI argument which accepts a serialized imagestream
object, which is exactly what the CVO carries.

Prep for adding a new `rhel-coreos` image into the payload, so I can
avoid that ratcheting process.
@cgwalters
Copy link
Member Author

/test unit
/test verify
/test e2e-aws

cgwalters added a commit to cgwalters/installer that referenced this pull request Mar 14, 2022
Depends: openshift/machine-config-operator#3017

I want to add a new image (e.g. `rhel-coreos` as part of layering)
and this will avoid a tedious "ratching" process to plumb that
through the installer.  Now the MCO can just directly read the image
references.
@cgwalters
Copy link
Member Author

xref openshift/installer#5703

@cgwalters
Copy link
Member Author

/test unit
/test e2e-aws

@cgwalters
Copy link
Member Author

I'm going to retarget this one for layering, but we need #3018

@cgwalters cgwalters changed the base branch from master to layering March 16, 2022 11:12
@cgwalters cgwalters marked this pull request as ready for review March 16, 2022 11:12
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 16, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 16, 2022

@cgwalters: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-op-single-node 014e895 link false /test e2e-gcp-op-single-node
ci/prow/e2e-aws-upgrade 014e895 link false /test e2e-aws-upgrade
ci/prow/e2e-aws 014e895 link true /test e2e-aws
ci/prow/e2e-gcp-op 014e895 link true /test e2e-gcp-op
ci/prow/e2e-gcp-single-node 014e895 link false /test e2e-gcp-single-node

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@cgwalters
Copy link
Member Author

So...if we end up not adding a new rhel-coreos image and just replace the existing machine-os-content, then this PR is less in the hot path. But, it's still a useful potential cleanup I think either way.

@kikisdeliveryservice
Copy link
Contributor

Depends: openshift/library-go#1331

/test unit /test verify

is this still relevant ^^^

@cgwalters
Copy link
Member Author

I would like to do this yes, because it will make it much less painful in the future to add (or change/remove) images.

@kikisdeliveryservice
Copy link
Contributor

I would like to do this yes, because it will make it much less painful in the future to add (or change/remove) images.

I meant the ref to the library go PR being a prereq for merging 😄

@openshift-bot
Copy link
Contributor

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jun 27, 2022
@cgwalters
Copy link
Member Author

/remove-lifecycle stale
We want this for 4.12/layering

@cgwalters
Copy link
Member Author

OK openshift/library-go#1331 merged, so I think this just needs a lgtm!

@cgwalters
Copy link
Member Author

/hold
no this needs a separate PR to bump library-go since that chains into a bunch of other stuff

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 14, 2022
@cgwalters
Copy link
Member Author

So...yeah. The bumping of library-go as expected snowballed a bit. I started on this in #3252

I personally vote to get this in so we don't block on that.
/hold cancel
But, someone else has to lgtm (i.e. agree with me). It's OK if no one else does though...

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 14, 2022
@openshift-bot
Copy link
Contributor

Stale issues rot after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle rotten
/remove-lifecycle stale

@openshift-ci openshift-ci bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Aug 14, 2022
@openshift-bot
Copy link
Contributor

Rotten issues close after 30d of inactivity.

Reopen the issue by commenting /reopen.
Mark the issue as fresh by commenting /remove-lifecycle rotten.
Exclude this issue from closing again by commenting /lifecycle frozen.

/close

@openshift-ci openshift-ci bot closed this Sep 13, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 13, 2022

@openshift-bot: Closed this PR.

In response to this:

Rotten issues close after 30d of inactivity.

Reopen the issue by commenting /reopen.
Mark the issue as fresh by commenting /remove-lifecycle rotten.
Exclude this issue from closing again by commenting /lifecycle frozen.

/close

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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. layering lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants