Add ostreecontainer support #5277

kwozyman · 2023-10-24T13:48:03Z

Backport of ostreecontainer command

Depends on:

Resolves: https://issues.redhat.com/browse/RHEL-2250

Based on my discussion and recommendation on the bug, the 'registry' transport should be the only one which needs network to work. Other ways of transport should be used for local management. Related: rhbz#2125655

Our intention is to move dependencies specific for Anaconda execution from Lorax into Anaconda. Let's do that for rpm-ostree because we need to also add `skopeo` project to be able to download container images. Require rpm-ostree version which contains: - ostreedev/ostree-rs-ext#464 (simplified syntax) - ostreedev/ostree-rs-ext#462 (stateroot is not mandatory) Related: rhbz#2125655

pep8speaks · 2023-10-24T13:48:18Z

Hello @kwozyman! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

In the file pyanaconda/modules/payloads/payload/rpm_ostree/installation.py:

Line 501:9: E265 block comment should start with '# '

In the file pyanaconda/modules/payloads/source/factory.py:

Line 74:100: E501 line too long (102 > 99 characters)

In the file pyanaconda/modules/payloads/source/rpm_ostree_container/rpm_ostree_container.py:

Line 26:100: E501 line too long (100 > 99 characters)
Line 76:100: E501 line too long (103 > 99 characters)
Line 86:100: E501 line too long (108 > 99 characters)

In the file pyanaconda/payload/rpmostreepayload.py:

Line 23:100: E501 line too long (119 > 99 characters)

In the file tests/unit_tests/pyanaconda_tests/modules/payloads/payload/test_rpm_ostree.py:

Line 100:100: E501 line too long (159 > 99 characters)
Line 104:100: E501 line too long (159 > 99 characters)
Line 124:100: E501 line too long (106 > 99 characters)
Line 128:100: E501 line too long (106 > 99 characters)

Comment last updated at 2024-01-15 11:45:18 UTC

VladimirSlavik

Thanks! There's a lot of code, so lots of comments :)

Apart from the points below, there is an empty commit "Add new OSTree container source test (#2125655)" - what's the plan there?

VladimirSlavik · 2023-11-13T17:10:33Z

docs/release-notes/ostree-native-containers-support.rst

+:Type: Kickstart
+:Summary: Add support for OSTree native containers (#2125655)


Please do not add this release note file, on RHEL we track release notes in the mandatory bugs/bzs/jira items.

I've removed this from the current PR

VladimirSlavik · 2023-11-13T17:15:37Z

pyanaconda/core/kickstart/commands.py

+from pykickstart.commands.ostreecontainer import F38_OSTreeContainer as OSTreeContainer
+from pykickstart.commands.ostreesetup import F38_OSTreeSetup as OSTreeSetup
+from pykickstart.commands.ostreecontainer import F38_OSTreeContainer as OSTreeContainer
+from pykickstart.commands.ostreesetup import F21_OSTreeSetup as OSTreeSetup
+from pykickstart.commands.partition import F34_Partition as Partition
+from pykickstart.commands.raid import F29_Raid as Raid


Keep this in sync with the pykickstart PR - I vaguely recall Brian asked for versioning something new as RHEL9_*, I think?

Correct, I've updated this area to only reference RHEL9_* to match PyKickstart

VladimirSlavik · 2023-11-13T17:28:59Z

pyanaconda/core/constants.py

@@ -429,11 +429,15 @@ class DisplayModes(Enum):
 # Types of the payload source.
 SOURCE_TYPE_LIVE_OS_IMAGE = "LIVE_OS_IMAGE"
 SOURCE_TYPE_LIVE_IMAGE = "LIVE_IMAGE"
+SOURCE_TYPE_LIVE_TAR = "LIVE_TAR"


I'm not sure, but this does not seem like a related change?

I think you're right, I've removed all the references to SOURCE_TYPE_LIVE_TAR

VladimirSlavik · 2023-11-13T17:30:13Z

anaconda.spec.in

@@ -42,6 +42,7 @@ Source0: %{name}-%{version}.tar.bz2
 %define simplelinever 1.8.3-1
 %define subscriptionmanagerver 1.29.31
 %define utillinuxver 2.15.1
+%define rpmostreever 2023.2


Is this correct for RHEL?

VladimirSlavik · 2023-11-13T17:45:43Z

Makefile.am

-CONTAINER_BUILD_ARGS ?= --no-cache
+CONTAINER_BUILD_ARGS ?= --no-cache --network=host


This is an unrelated change, ideally I'd see it as a separate PR from this.

I've removed this from the current PR

VladimirSlavik · 2023-11-13T17:56:45Z

pyanaconda/modules/payloads/payload/rpm_ostree/installation.py

-        safe_exec_with_redirect(
-            "ostree",
-            ["admin",
-             "--sysroot=" + self._sysroot,
-             "os-init",
-             stateroot]
-        )


The commit says "Remove duplicate call to ostree". But I can't see any other place where os-init would be called?

VladimirSlavik · 2023-11-13T17:57:36Z

pyanaconda/modules/payloads/payload/rpm_ostree/installation.py

+            args = ["admin", "os-init",
+                    "--sysroot=" + self._physroot]
+            if self._data.stateroot:
+                args.append(self._data.stateroot)
+            safe_exec_with_redirect("ostree", args)


Now here you add os-init again, a few commits later, but it's only for the container code path, so for the regular ostree it is still removed?

We have a new RPMOStreeContainer source now which enables us to use containers as installation source. In this commit we adapt the current rpm_ostree to be able to consume this new container source. Add a lot of rpm ostree tasks tests for the container source. Resolves: rhbz#2125655

RPM OSTree is getting new functionality to use containers as the base image. Thanks to that it's possible to use standard container repositories. This source enables to use these repositories. Related: rhbz#2125655

Use sysroot and physroot in the installation tasks.

PullRemoteAndDeleteTask should not be called for OSTree Container deployment

Syncronize with PyKickstart

rvykydal · 2024-01-17T10:54:16Z

I should have mentioned it here explicitly (I noted it only in the RHEL jira issue) I am working on alternative PR #5399.

jkonecny12 · 2024-01-23T10:37:44Z

Closing this PR on behalf of #5399 which is based on this PR. Thanks a lot for your work @kwozyman.
The #5399 is ready for next RHEL-9 release.

jkonecny12 added 2 commits September 26, 2023 11:16

Implement needs_network for rpm_ostree_container (#2125655)

e119dc5

Based on my discussion and recommendation on the bug, the 'registry' transport should be the only one which needs network to work. Other ways of transport should be used for local management. Related: rhbz#2125655

VladimirSlavik added the rhel-9 label Nov 13, 2023

VladimirSlavik reviewed Nov 13, 2023

View reviewed changes

rvykydal self-assigned this Jan 10, 2024

rvykydal mentioned this pull request Jan 12, 2024

Ostreecontainer rhel 9 #5399

Merged

2 tasks

jkonecny12 added 2 commits January 15, 2024 12:24

Add RPM OSTree source from container (#2125655)

00f8f66

RPM OSTree is getting new functionality to use containers as the base image. Thanks to that it's possible to use standard container repositories. This source enables to use these repositories. Related: rhbz#2125655

kwozyman force-pushed the rhel-9 branch from c6aa754 to f628d74 Compare January 15, 2024 11:30

kwozyman and others added 10 commits January 15, 2024 12:43

Add needed constants for ostreecontainer

030cedc

Return configuration data for ostreecontainer

94979a9

Change the arguments of ChangeOSTreeRemoteTask

3656227

Use sysroot and physroot in the installation tasks.

Use sysroot and physroot in ChangeOSTreeRemoteTask

8aa3466

Do not call PullRemoteAndDeleteTask task

846366a

PullRemoteAndDeleteTask should not be called for OSTree Container deployment

Remove duplicate call to ostree

ce0c58e

Do not include flatpak, live_tar and repo_path

d3f5ec4

Add ostree os-init command for initialization

5e6cd6f

Add required attributes to ChangeOSTreeRemoteTask and RPMOSTreePayload

253f34c

Use RHEL9 specific versions of commands

13b8710

Syncronize with PyKickstart

kwozyman force-pushed the rhel-9 branch from f628d74 to 13b8710 Compare January 15, 2024 11:45

jkonecny12 closed this Jan 23, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ostreecontainer support #5277

Add ostreecontainer support #5277

kwozyman commented Oct 24, 2023

pep8speaks commented Oct 24, 2023 •

edited

Loading

VladimirSlavik left a comment

VladimirSlavik Nov 13, 2023

kwozyman Jan 15, 2024

VladimirSlavik Nov 13, 2023

kwozyman Jan 15, 2024

VladimirSlavik Nov 13, 2023 •

edited

Loading

kwozyman Jan 15, 2024

VladimirSlavik Nov 13, 2023

VladimirSlavik Nov 13, 2023

kwozyman Jan 15, 2024 •

edited

Loading

VladimirSlavik Nov 13, 2023

VladimirSlavik Nov 13, 2023 •

edited

Loading

rvykydal commented Jan 17, 2024

jkonecny12 commented Jan 23, 2024

		:Type: Kickstart
		:Summary: Add support for OSTree native containers (#2125655)

		CONTAINER_BUILD_ARGS ?= --no-cache
		CONTAINER_BUILD_ARGS ?= --no-cache --network=host

Add ostreecontainer support #5277

Add ostreecontainer support #5277

Conversation

kwozyman commented Oct 24, 2023

pep8speaks commented Oct 24, 2023 • edited Loading

Comment last updated at 2024-01-15 11:45:18 UTC

VladimirSlavik left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VladimirSlavik Nov 13, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kwozyman Jan 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VladimirSlavik Nov 13, 2023 • edited Loading

Choose a reason for hiding this comment

rvykydal commented Jan 17, 2024

jkonecny12 commented Jan 23, 2024

pep8speaks commented Oct 24, 2023 •

edited

Loading

VladimirSlavik Nov 13, 2023 •

edited

Loading

kwozyman Jan 15, 2024 •

edited

Loading

VladimirSlavik Nov 13, 2023 •

edited

Loading