COS-3013: overlay node image before bootstrapping if necessary #899
Conversation
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
openshift-ci
bot
added
the
size/M
jlebon
force-pushed
the
pr/no-more-oc
branch
from
23f9c3f to
48c6cc1
Compare
|
Issues go stale after 90d of inactivity. Mark the issue as fresh by commenting If this issue is safe to close now please do so with /lifecycle stale |
openshift-ci
bot
added
the
lifecycle/stale
|
/remove-lifecycle stale Now that openshift/enhancements#1637 has merged, we will need this. I'll leave it in draft for now until I can rebase and retest it, but feel free to start reviewing. |
openshift-ci
bot
removed
the
lifecycle/stale
jlebon
force-pushed
the
pr/no-more-oc
branch
from
48c6cc1 to
33d9f10
Compare
jlebon
changed the title
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
|
Rebased and verified this still works! Requires openshift/installer#8742. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #899 +/- ##
==========================================
+ Coverage 55.20% 55.39% +0.19%
==========================================
Files 15 15
Lines 3286 3318 +32
==========================================
+ Hits 1814 1838 +24
- Misses 1292 1297 +5
- Partials 180 183 +3
|
src/installer/installer.go
Outdated
| // If we're in a pure RHEL/CentOS environment, we need to overlay the node image | ||
| // first to have access to e.g. oc, kubelet, cri-o, etc... | ||
| // https://github.com/openshift/enhancements/pull/1637 | ||
| if !i.ops.FileExists("/usr/bin/oc") { |
There was a problem hiding this comment.
Shouldn't we pull overlay the node image as a first thing? I mean we already applied bootstrap ignition at this point and this can be a little bit late for us to pull another image layer, we probably should do it before
There was a problem hiding this comment.
The code to pull the node image is part of the bootstrap Ignition so we can't use it before that.
|
/test e2e-agent-compact-ipv4 |
jlebon
changed the title
openshift-ci-robot
added
the
jira/valid-reference
|
@jlebon: This pull request references COS-3013 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.19.0" version, but no target version was set. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
Updated this now!
and then the host logs have more information about the failure. |
|
/retest |
Prep for next patch. Also use that in one spot where we were manually calling `stat`.
As per openshift/enhancements#1637, we're trying to get rid of all OpenShift-versioned components from the bootimages. This means that there will no longer be oc, kubelet, or crio binaries for example, which bootstrapping obviously relies on. To adapt to this, the OpenShift installer now ships a new `node-image-overlay.service` in its bootstrap Ignition config. This service takes care of pulling down the node image and overlaying it, effectively updating the system to the node image version. Here, we accordingly also adapt assisted-installer so that we run `node-image-overlay.service` before starting e.g. `kubelet.service` and `bootkube.service`. See also: openshift/installer#8742
openshift-ci
bot
added
size/L
|
OK, fixed a lint, a unit test, and added two unit tests (one positive and one negative) that checks the new path! |
|
Looks good to me, thanks for taking this on @jlebon! |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: carbonin, 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 |
openshift-ci
bot
added
the
approved
|
Hmm, Which I don't think is related to this change. OK yeah, I see a similar looking failure in e.g. #1003. |
|
@jlebon: The following tests failed, say
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-sigs/prow repository. I understand the commands that are listed here. |
openshift-merge-bot
bot
merged commit e9ae12d
into
openshift:master
|
[ART PR BUILD NOTIFIER] Distgit: ose-agent-installer-orchestrator |
|
[ART PR BUILD NOTIFIER] Distgit: ose-agent-installer-csr-approver |
As per openshift/enhancements#1637, we're trying
to get rid of all OpenShift-versioned components from the bootimages.
This means that there will no longer be oc, kubelet, or crio
binaries for example, which bootstrapping obviously relies on.
To adapt to this, the OpenShift installer now ships a new
node-image-overlay.servicein its bootstrap Ignition config. Thisservice takes care of pulling down the node image and overlaying it,
effectively updating the system to the node image version.
Here, we accordingly also adapt assisted-installer so that we run
node-image-overlay.servicebefore starting e.g.kubelet.serviceandbootkube.service.See also: openshift/installer#8742