metal3 - updates for 0.9.1 chart #69

Merged
steven.hardy merged 6 commits from steven.hardy/Factory:metal3_091 into main 2025-02-10 12:48:01 +01:00
Owner

Align with https://github.com/suse-edge/charts/pull/173 which added some fixes to enable deployment on aarch64

This also requires updates to the ironic and IPA images, which are derived from https://build.opensuse.org/project/show/isv:SUSE:Edge:Metal3:Ironic:2024.2

Align with https://github.com/suse-edge/charts/pull/173 which added some fixes to enable deployment on aarch64 This also requires updates to the ironic and IPA images, which are derived from https://build.opensuse.org/project/show/isv:SUSE:Edge:Metal3:Ironic:2024.2
steven.hardy added 4 commits 2025-02-05 17:09:21 +01:00
Align with latest 26.1.2.1 version from
https://build.opensuse.org/package/show/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-image
Update to the latest version from
https://build.opensuse.org/package/show/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-ipa-ramdisk
Update to the latest version from
https://build.opensuse.org/package/show/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-ipa-downloader-image
metal3-chart: update to 0.9.1
Some checks failed
OBS: endpoint-copier-operator-image - images/x86_64
OBS: frr-k8s-image - images/x86_64
OBS: baremetal-operator-image - images/x86_64
OBS: frr-image - images/x86_64
OBS: akri-controller-image - images/aarch64
OBS: kubectl-image - images/x86_64
OBS: kube-rbac-proxy-image - images/x86_64
OBS: edge-image-builder-image - test_manifest_images/x86_64
OBS: metallb-controller-image - images/x86_64
OBS: upgrade-controller-image - images/x86_64
OBS: metallb-speaker-image - images/x86_64
OBS: edge-image-builder-image - images/x86_64
OBS: ironic-image - images/x86_64
OBS: akri-onvif-discovery-handler-image - images/aarch64
OBS: akri-agent-image - images/aarch64
OBS: akri-webhook-configuration-image - images/aarch64
OBS: akri-udev-discovery-handler-image - images/aarch64
OBS: akri-opcua-discovery-handler-image - images/aarch64
OBS: endpoint-copier-operator-image - images/aarch64
OBS: baremetal-operator-image - images/aarch64
OBS: edge-image-builder-image - images/aarch64
OBS: frr-image - images/aarch64
OBS: kube-rbac-proxy-image - images/aarch64
OBS: frr-k8s-image - images/aarch64
OBS: kubectl-image - images/aarch64
OBS: metallb-controller-image - images/aarch64
OBS: metallb-speaker-image - images/aarch64
OBS: upgrade-controller-image - images/aarch64
OBS: nm-configurator - standard/x86_64
OBS: ironic-ipa-downloader-image - images/x86_64
b0ee84e6e1
Align with https://github.com/suse-edge/charts/pull/173 which
added some fixes to enable deployment on aarch64
steven.hardy requested review from amorgante 2025-02-05 17:09:38 +01:00
steven.hardy requested review from nbelouin 2025-02-05 17:09:38 +01:00
steven.hardy requested review from dprodanov 2025-02-05 17:09:43 +01:00
nbelouin requested changes 2025-02-06 10:42:02 +01:00
Dismissed
nbelouin left a comment
Owner

The root.tar.bz2 doesn't look like it's using git-lfs for storage.

The root.tar.bz2 doesn't look like it's using git-lfs for storage.
@ -10,2 +10,3 @@
RUN sed -i -e 's%^# rpm.install.excludedocs = no.*%rpm.install.excludedocs = yes%g' /etc/zypp/zypp.conf
RUN zypper --installroot /installroot --non-interactive install --no-recommends ironic-ipa-ramdisk-x86_64 python311-devel python311 python311-pip tar gawk git curl xz fakeroot shadow sed cpio; zypper -n clean; rm -rf /var/log/*
#!ArchExclusiveLine: x86_64
RUN zypper --installroot /installroot --non-interactive install --no-recommends ironic-ipa-ramdisk-x86_64 python311-devel python311 python311-pip tar gawk git curl xz fakeroot shadow sed cpio; zypper -n clean; rm -rf /var/log/*;
Owner

Those ArchExclusiveLine things are OBS specific to tell OBS to not try to parse the line for specific arch, it will still get executed by docker build process. You need to use a construction akin to the one in ironic-image Dockerfile here:

#!ArchExclusiveLine: x86_64
RUN if [ "$(uname -m)" = "x86_64" ];then \
...
Those `ArchExclusiveLine` things are OBS specific to tell OBS to not try to parse the line for specific arch, it will still get executed by docker build process. You need to use a construction akin to the one in `ironic-image` Dockerfile here: ```dockerfile #!ArchExclusiveLine: x86_64 RUN if [ "$(uname -m)" = "x86_64" ];then \ ... ```
Author
Owner

Thanks, fixed - I will also adjust this in the next upstream release of this image

Thanks, fixed - I will also adjust this in the next upstream release of this image
steven.hardy marked this conversation as resolved
@ -129,3 +130,3 @@
<package name="kernel-default"/>
<package name="NetworkManager"/>
<package name="nm-configurator"/>
<package name="nm-configurator-030"/>
Owner

Should not use a package suffix here

Should not use a package suffix here
steven.hardy marked this conversation as resolved
@ -88,3 +93,3 @@
BuildRequires: which
BuildRequires: NetworkManager
BuildRequires: nm-configurator
BuildRequires: nm-configurator-030
Owner

Same here

Same here
steven.hardy marked this conversation as resolved
steven.hardy force-pushed metal3_091 from b0ee84e6e1 to ac32110ac1 2025-02-06 17:39:08 +01:00 Compare
Author
Owner

The root.tar.bz2 doesn't look like it's using git-lfs for storage.

I locally configured git-lfs and did git rm --cached and re-added the tarball in a new commit - how do I check if it's now using lfs or not?

> The root.tar.bz2 doesn't look like it's using git-lfs for storage. I locally configured git-lfs and did `git rm --cached` and re-added the tarball in a new commit - how do I check if it's now using lfs or not?
nbelouin approved these changes 2025-02-07 10:30:11 +01:00
steven.hardy added 1 commit 2025-02-07 12:26:53 +01:00
ironic-ipa-downloader-image: remove unused _service entry
Some checks failed
OBS: baremetal-operator - standard/aarch64
OBS: upgrade-controller-image - images/x86_64
OBS: metallb-controller-image - images/aarch64
OBS: metallb-speaker-image - images/x86_64
OBS: edge-image-builder - standard/aarch64
OBS: hauler - standard/aarch64
OBS: edge-image-builder-image - images/aarch64
OBS: cosign - standard/aarch64
OBS: baremetal-operator-image - images/x86_64
OBS: hauler - standard/x86_64
OBS: metallb-controller-image - images/x86_64
OBS: upgrade-controller - standard/aarch64
OBS: baremetal-operator-image - images/aarch64
OBS: frr-k8s - standard/aarch64
OBS: edge-image-builder-image - test_manifest_images/x86_64
OBS: frr-image - images/aarch64
OBS: frr-k8s - standard/x86_64
OBS: kube-rbac-proxy-image - images/x86_64
OBS: akri-agent-image - images/x86_64
OBS: metallb-speaker-image - images/aarch64
OBS: akri-agent-image - images/aarch64
OBS: kube-rbac-proxy - standard/aarch64
OBS: frr-k8s-image - images/aarch64
OBS: edge-image-builder-image - images/x86_64
OBS: cosign - standard/x86_64
OBS: frr-k8s-image - images/x86_64
OBS: cri-tools - standard/aarch64
OBS: upgrade-controller-image - images/aarch64
OBS: kube-rbac-proxy-image - images/aarch64
OBS: edge-image-builder-image - test_manifest_images/aarch64
45443d5b5f
This is hard-coded to x86_64 so won't work for ARM, aligns with:
https://build.opensuse.org/package/rdiff/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-ipa-downloader-image?linkrev=base&rev=6
steven.hardy merged commit 45443d5b5f into main 2025-02-10 12:48:01 +01:00
steven.hardy deleted branch metal3_091 2025-02-10 12:48:01 +01:00
Sign in to join this conversation.
No Label
No Milestone
No project
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: suse-edge/Factory#69
No description provided.