From 70a42948aa1a4713ab8026febe5b608d0339781bc18c22081003b74561ef013a Mon Sep 17 00:00:00 2001 From: Marco Chiappero Date: Thu, 15 May 2025 16:27:42 +0000 Subject: [PATCH 1/3] ironic-ipa-ramdisk: make sure the udev rule is also matched on changes Signed-off-by: Marco Chiappero --- ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec | 2 +- ironic-ipa-ramdisk/root/etc/systemd/system/mnt-ipa.mount | 2 +- .../etc/systemd/system/systemd-udevd.service.d/ordering.conf | 3 +++ ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2-ipa.rules | 1 - ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2.rules | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 ironic-ipa-ramdisk/root/etc/systemd/system/systemd-udevd.service.d/ordering.conf delete mode 100644 ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2-ipa.rules create mode 100644 ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2.rules diff --git a/ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec b/ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec index 7a485c6..365aced 100644 --- a/ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec +++ b/ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec @@ -19,7 +19,7 @@ Name: ironic-ipa-ramdisk -Version: 3.0.5 +Version: 3.0.6 Release: 0 Summary: Kernel and ramdisk image for OpenStack Ironic License: SUSE-EULA diff --git a/ironic-ipa-ramdisk/root/etc/systemd/system/mnt-ipa.mount b/ironic-ipa-ramdisk/root/etc/systemd/system/mnt-ipa.mount index b718b8b..22ecadd 100644 --- a/ironic-ipa-ramdisk/root/etc/systemd/system/mnt-ipa.mount +++ b/ironic-ipa-ramdisk/root/etc/systemd/system/mnt-ipa.mount @@ -4,4 +4,4 @@ Description=config-2 rom consumed by IPA for networking configuration [Mount] What=/dev/ipa Where=/mnt/ipa -TimeoutSec=60 +TimeoutSec=30 diff --git a/ironic-ipa-ramdisk/root/etc/systemd/system/systemd-udevd.service.d/ordering.conf b/ironic-ipa-ramdisk/root/etc/systemd/system/systemd-udevd.service.d/ordering.conf new file mode 100644 index 0000000..641d5e9 --- /dev/null +++ b/ironic-ipa-ramdisk/root/etc/systemd/system/systemd-udevd.service.d/ordering.conf @@ -0,0 +1,3 @@ +[Unit] +Before=local-fs.target +WantedBy=local-fs.target diff --git a/ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2-ipa.rules b/ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2-ipa.rules deleted file mode 100644 index 045eee2..0000000 --- a/ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2-ipa.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="config-2", ENV{ID_FS_PUBLISHER_ID}=="?*", PROGRAM="/usr/local/bin/suse-test-config-2.sh", SYMLINK+="ipa ipa-config-2" diff --git a/ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2.rules b/ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2.rules new file mode 100644 index 0000000..446fec7 --- /dev/null +++ b/ironic-ipa-ramdisk/root/etc/udev/rules.d/61-config2.rules @@ -0,0 +1 @@ +ACTION=="add|change", SUBSYSTEM=="block", ENV{ID_FS_LABEL}=="config-2", ENV{ID_FS_PUBLISHER_ID}=="?*", PROGRAM="/usr/local/bin/suse-test-config-2.sh", SYMLINK+="ipa" -- 2.49.0 From be0d25d8f754c734351e15da75250f841bf31deb75616a265d1a36f531957f5e Mon Sep 17 00:00:00 2001 From: Marco Chiappero Date: Thu, 15 May 2025 16:35:30 +0000 Subject: [PATCH 2/3] ironic-ipa-downloader-image: update to the latest 3.0.6 image Signed-off-by: Marco Chiappero --- ironic-ipa-downloader-image/Dockerfile | 8 ++++---- ironic-ipa-downloader-image/Dockerfile.aarch64 | 8 ++++---- ironic-ipa-downloader-image/Dockerfile.x86_64 | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ironic-ipa-downloader-image/Dockerfile b/ironic-ipa-downloader-image/Dockerfile index c95e198..a9112ae 100644 --- a/ironic-ipa-downloader-image/Dockerfile +++ b/ironic-ipa-downloader-image/Dockerfile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.5 -#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.5-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.6 +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.6-%RELEASE% ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro @@ -18,11 +18,11 @@ FROM micro AS final LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SLE Based Ironic IPA Downloader Container Image" LABEL org.opencontainers.image.description="ironic-ipa-downloader based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="3.0.5" +LABEL org.opencontainers.image.version="3.0.6" LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.5-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.6-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.eula="SUSE Combined EULA February 2024" diff --git a/ironic-ipa-downloader-image/Dockerfile.aarch64 b/ironic-ipa-downloader-image/Dockerfile.aarch64 index 2bd1efa..be21df9 100644 --- a/ironic-ipa-downloader-image/Dockerfile.aarch64 +++ b/ironic-ipa-downloader-image/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.5 -#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.5-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.6 +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.6-%RELEASE% ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro @@ -18,11 +18,11 @@ FROM micro AS final LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SLE Based Ironic IPA Downloader Container Image" LABEL org.opencontainers.image.description="ironic-ipa-downloader based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="3.0.5" +LABEL org.opencontainers.image.version="3.0.6" LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.5-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.6-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.eula="SUSE Combined EULA February 2024" diff --git a/ironic-ipa-downloader-image/Dockerfile.x86_64 b/ironic-ipa-downloader-image/Dockerfile.x86_64 index fb79d0b..27b0b35 100644 --- a/ironic-ipa-downloader-image/Dockerfile.x86_64 +++ b/ironic-ipa-downloader-image/Dockerfile.x86_64 @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.5 -#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.5-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.6 +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.6-%RELEASE% ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro @@ -18,11 +18,11 @@ FROM micro AS final LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SLE Based Ironic IPA Downloader Container Image" LABEL org.opencontainers.image.description="ironic-ipa-downloader based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="3.0.5" +LABEL org.opencontainers.image.version="3.0.6" LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.5-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.6-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.eula="SUSE Combined EULA February 2024" -- 2.49.0 From 477a4e15eb2fb1db67840fa68a857e9e8ab947f171322c984bcccc36e4739adb Mon Sep 17 00:00:00 2001 From: Marco Chiappero Date: Thu, 15 May 2025 16:42:17 +0000 Subject: [PATCH 3/3] metal3-chart: bump version to include IPA image 3.0.6 Signed-off-by: Marco Chiappero --- metal3-chart/Chart.yaml | 10 +++++----- metal3-chart/charts/ironic/Chart.yaml | 2 +- metal3-chart/charts/ironic/values.yaml | 2 +- release-manifest-image/release_manifest.yaml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/metal3-chart/Chart.yaml b/metal3-chart/Chart.yaml index 1d7deac..db19e70 100644 --- a/metal3-chart/Chart.yaml +++ b/metal3-chart/Chart.yaml @@ -1,7 +1,7 @@ -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.4_up0.11.2 -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.4_up0.11.2-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.5_up0.11.3 +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.5_up0.11.3-%RELEASE% apiVersion: v2 -appVersion: 0.11.2 +appVersion: 0.11.3 dependencies: - alias: metal3-baremetal-operator name: baremetal-operator @@ -10,7 +10,7 @@ dependencies: - alias: metal3-ironic name: ironic repository: file://./charts/ironic - version: 0.10.2 + version: 0.10.3 - alias: metal3-mariadb condition: global.enable_mariadb name: mariadb @@ -25,4 +25,4 @@ description: A Helm chart that installs all of the dependencies needed for Metal icon: https://github.com/cncf/artwork/raw/master/projects/metal3/icon/color/metal3-icon-color.svg name: metal3 type: application -version: "%%CHART_MAJOR%%.0.4+up0.11.2" +version: "%%CHART_MAJOR%%.0.5+up0.11.3" diff --git a/metal3-chart/charts/ironic/Chart.yaml b/metal3-chart/charts/ironic/Chart.yaml index ff7bc60..ac4f78c 100644 --- a/metal3-chart/charts/ironic/Chart.yaml +++ b/metal3-chart/charts/ironic/Chart.yaml @@ -3,4 +3,4 @@ appVersion: 26.1.2 description: A Helm chart for Ironic, used by Metal3 name: ironic type: application -version: 0.10.2 +version: 0.10.3 diff --git a/metal3-chart/charts/ironic/values.yaml b/metal3-chart/charts/ironic/values.yaml index 70c8005..a32ce1f 100644 --- a/metal3-chart/charts/ironic/values.yaml +++ b/metal3-chart/charts/ironic/values.yaml @@ -60,7 +60,7 @@ images: ironicIPADownloader: repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic-ipa-downloader pullPolicy: IfNotPresent - tag: 3.0.5 + tag: 3.0.6 nameOverride: "" fullnameOverride: "" diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index 798257d..79b34ef 100644 --- a/release-manifest-image/release_manifest.yaml +++ b/release-manifest-image/release_manifest.yaml @@ -171,7 +171,7 @@ spec: - prettyName: Metal3 releaseName: metal3 chart: "%%CHART_REPO%%/%%CHART_PREFIX%%metal3" - version: "%%CHART_MAJOR%%.0.4+up0.11.2" + version: "%%CHART_MAJOR%%.0.5+up0.11.3" - prettyName: RancherTurtles releaseName: rancher-turtles chart: "%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles" -- 2.49.0