MGMT-19100: Install to the current boot device when CoreosImage is set #1003

carbonin · 2025-01-09T21:24:31Z

This indicates the container image that should be installed and booted for the installed host. It also indicates that we should install to the currently booted disk, in a new stateroot, rather than expecting a device path.

https://issues.redhat.com/browse/MGMT-19100

cc @tsorya @rccrdpccl @eranco74

openshift-ci-robot · 2025-01-09T21:24:35Z

@carbonin: This pull request references MGMT-19100 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.

Details

In response to this:

This indicates the container image that should be installed and booted for the installed host. It also indicates that we should install to the currently booted disk, in a new stateroot, rather than expecting a device path.

https://issues.redhat.com/browse/MGMT-19100

cc @tsorya @rccrdpccl @eranco74

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.

openshift-ci · 2025-01-09T21:25:52Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: carbonin

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~~ [carbonin]

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

codecov · 2025-01-09T21:57:43Z

Codecov Report

Attention: Patch coverage is 33.92857% with 37 lines in your changes missing coverage. Please review.

Project coverage is 55.00%. Comparing base (e9ae12d) to head (2bde274).
Report is 1 commits behind head on master.

Files with missing lines	Patch %	Lines
src/ops/ops.go	24.39%	31 Missing ⚠️
src/installer/installer.go	57.14%	5 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1003      +/-   ##
==========================================
- Coverage   55.39%   55.00%   -0.39%     
==========================================
  Files          15       15              
  Lines        3318     3365      +47     
==========================================
+ Hits         1838     1851      +13     
- Misses       1297     1331      +34     
  Partials      183      183

Files with missing lines	Coverage Δ
src/config/config.go	`70.58% <100.00%> (+0.43%)`	⬆️
src/installer/installer.go	`68.58% <57.14%> (-0.18%)`	⬇️
src/ops/ops.go	`41.92% <24.39%> (-1.33%)`	⬇️

src/ops/ops.go

rccrdpccl · 2025-01-16T11:09:28Z

src/ops/ops.go

+
+func (o *ops) importOSTreeCommit(liveLogger io.Writer) (string, error) {
+	ostreeReleasePullSpec := fmt.Sprintf("ostree-unverified-registry:%s", o.installerConfig.CoreosImage)
+	out, err := o.ExecPrivilegeCommand(liveLogger, "ostree", "container", "unencapsulate", "--authfile", "/root/.docker/config.json", "--quiet", "--repo", "/ostree/repo", ostreeReleasePullSpec)


nit: this is probably not gonna change often (or possibly never), however wouldn't the docker config file path be better in a constant? (there's already one in installer package, should we share such constant - in a different package of course - as we are relying that this file has been extracted there?)

rccrdpccl · 2025-01-21T15:31:03Z

/retest
/lgtm

openshift-ci-robot · 2025-01-21T19:10:52Z

/retest-required

Remaining retests: 0 against base HEAD e9ae12d and 2 for PR HEAD cc87535 in total

This indicates the container image that should be installed and booted for the installed host. It also indicates that we should install to the existing root filesystem, in a new stateroot, rather than expecting a device path. https://issues.redhat.com/browse/MGMT-19100

openshift-ci-robot · 2025-01-21T21:39:42Z

/retest-required

Remaining retests: 0 against base HEAD e9ae12d and 2 for PR HEAD cc87535 in total

openshift-ci · 2025-01-22T00:37:55Z

@carbonin: 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/okd-scos-e2e-aws-ovn	`2bde274`	link	false	`/test okd-scos-e2e-aws-ovn`
ci/prow/edge-e2e-oci-assisted-4-18	`2bde274`	link	false	`/test edge-e2e-oci-assisted-4-18`

Full PR test history. Your PR dashboard.

Details

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.

rccrdpccl · 2025-01-22T15:30:06Z

/lgtm

eranco74

/lgtm

eranco74 · 2025-01-22T10:41:45Z

src/config/config.go

 	flagSet.BoolVar(&c.SkipInstallationDiskCleanup, "skip-installation-disk-cleanup", false, "Skip installation disk cleanup gives disk management to coreos-installer in case needed")
 	flagSet.BoolVar(&c.EnableSkipMcoReboot, "enable-skip-mco-reboot", false, "indicate assisted installer to generate settings to match MCO requirements for skipping reboot after firstboot")
 	flagSet.BoolVar(&c.NotifyNumReboots, "notify-num-reboots", false, "indicate number of reboots should be notified as event")
+	flagSet.StringVar(&c.CoreosImage, "coreos-image", "", "CoreOS image to install to the existing root")


Consider renaming CoreosImage to OciImage

eranco74 · 2025-01-22T11:40:41Z

src/installer/installer.go

+		if i.Config.CoreosImage == "" {
+			return i.ops.WriteImageToDisk(liveLogger, ignitionPath, i.Device, i.Config.InstallerArgs)
+		} else {
+			return i.ops.WriteImageToExistingRoot(liveLogger, ignitionPath)


It should get the i.Config.CoreosImage, no?

eranco74 · 2025-01-22T15:46:32Z

@javipolo PTAL

openshift-bot · 2025-01-22T18:40:20Z

[ART PR BUILD NOTIFIER]

Distgit: ose-agent-installer-orchestrator
This PR has been included in build ose-agent-installer-orchestrator-container-v4.19.0-202501221808.p0.ge27ef9e.assembly.stream.el9.
All builds following this will include this PR.

openshift-bot · 2025-01-22T18:43:18Z

[ART PR BUILD NOTIFIER]

Distgit: ose-agent-installer-csr-approver
This PR has been included in build ose-agent-installer-csr-approver-container-v4.19.0-202501221808.p0.ge27ef9e.assembly.stream.el9.
All builds following this will include this PR.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 9, 2025

openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 9, 2025

openshift-ci bot requested review from danmanor and eliorerz January 9, 2025 21:25

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 9, 2025

carbonin force-pushed the image-install branch from 64dd407 to 5199af9 Compare January 10, 2025 13:22

paul-maidment suggested changes Jan 10, 2025

View reviewed changes

src/ops/ops.go Outdated Show resolved Hide resolved

openshift-ci bot assigned paul-maidment Jan 10, 2025

paul-maidment reviewed Jan 10, 2025

View reviewed changes

src/ops/ops.go Outdated Show resolved Hide resolved

carbonin commented Jan 10, 2025

View reviewed changes

src/ops/ops.go Outdated Show resolved Hide resolved

carbonin force-pushed the image-install branch 2 times, most recently from eb0683a to 928a493 Compare January 10, 2025 18:29

carbonin commented Jan 13, 2025

View reviewed changes

src/ops/ops.go Show resolved Hide resolved

carbonin force-pushed the image-install branch from 928a493 to 8996860 Compare January 13, 2025 21:13

rccrdpccl reviewed Jan 16, 2025

View reviewed changes

src/ops/ops.go Show resolved Hide resolved

rccrdpccl reviewed Jan 16, 2025

View reviewed changes

This was referenced Jan 16, 2025

MGMT-19100: Allow install to the existing root filesystem openshift/assisted-service#7197

Merged

MGMT-19100: Allow install to the existing root filesystem openshift/assisted-installer-agent#897

Merged

jlebon mentioned this pull request Jan 20, 2025

COS-3013: overlay node image before bootstrapping if necessary #899

Merged

openshift-ci bot assigned rccrdpccl Jan 21, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 21, 2025

carbonin added 2 commits January 21, 2025 16:39

Add a constant for docker auth file

2bde274

carbonin force-pushed the image-install branch from cc87535 to 2bde274 Compare January 21, 2025 21:39

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 21, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 22, 2025

openshift-merge-bot bot merged commit e27ef9e into openshift:master Jan 22, 2025
19 of 21 checks passed

eranco74 reviewed Jan 22, 2025

View reviewed changes

carbonin deleted the image-install branch January 22, 2025 16:02

MGMT-19100: Install to the current boot device when CoreosImage is set #1003

MGMT-19100: Install to the current boot device when CoreosImage is set #1003

Uh oh!

Conversation

carbonin commented Jan 9, 2025

Uh oh!

openshift-ci-robot commented Jan 9, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Jan 9, 2025

Uh oh!

codecov bot commented Jan 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rccrdpccl Jan 16, 2025

Choose a reason for hiding this comment

Uh oh!

rccrdpccl commented Jan 21, 2025

Uh oh!

openshift-ci-robot commented Jan 21, 2025

Uh oh!

openshift-ci-robot commented Jan 21, 2025

Uh oh!

openshift-ci bot commented Jan 22, 2025

Uh oh!

rccrdpccl commented Jan 22, 2025

Uh oh!

Uh oh!

eranco74 left a comment

Choose a reason for hiding this comment

Uh oh!

eranco74 Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

eranco74 Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

eranco74 commented Jan 22, 2025

Uh oh!

openshift-bot commented Jan 22, 2025

Uh oh!

openshift-bot commented Jan 22, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

openshift-ci-robot commented Jan 9, 2025 •

edited by openshift-ci bot

Loading

codecov bot commented Jan 9, 2025 •

edited

Loading