From 16512f56098ee5a7a45c9da429d421e5b3225b1bc9e25f9adfb88cf19bed85ba Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Fri, 23 Jan 2026 13:12:27 +0000 Subject: [PATCH] ironic-ipa-ramdisk: Disable MACAddressPolicy for bonds Related to https://gitlab.com/sylva-projects/sylva-core/-/issues/3376 --- ironic-ipa-downloader-image/Dockerfile | 8 ++++---- ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec | 2 +- .../root/etc/systemd/network/98-default.link | 5 +++++ metal3-chart/Chart.yaml | 8 ++++---- metal3-chart/charts/ironic/Chart.yaml | 2 +- metal3-chart/charts/ironic/values.yaml | 2 +- release-manifest-image/release_images.yaml | 2 +- release-manifest-image/release_manifest.yaml | 2 +- 8 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 ironic-ipa-ramdisk/root/etc/systemd/network/98-default.link diff --git a/ironic-ipa-downloader-image/Dockerfile b/ironic-ipa-downloader-image/Dockerfile index a75c12c..097edc9 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.10 -#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.10-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.11 +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.11-%RELEASE% ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro @@ -16,11 +16,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.10" +LABEL org.opencontainers.image.version="3.0.11" 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.10-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.11-%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-ramdisk/ironic-ipa-ramdisk.spec b/ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec index 6c725fc..35bb767 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.8 +Version: 3.0.9 Release: 0 Summary: Kernel and ramdisk image for OpenStack Ironic License: SUSE-EULA diff --git a/ironic-ipa-ramdisk/root/etc/systemd/network/98-default.link b/ironic-ipa-ramdisk/root/etc/systemd/network/98-default.link new file mode 100644 index 0000000..39a4f44 --- /dev/null +++ b/ironic-ipa-ramdisk/root/etc/systemd/network/98-default.link @@ -0,0 +1,5 @@ +[Match] +Driver=bonding bridge + +[Link] +MACAddressPolicy=none diff --git a/metal3-chart/Chart.yaml b/metal3-chart/Chart.yaml index c4e0ffb..c8a4c73 100644 --- a/metal3-chart/Chart.yaml +++ b/metal3-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.21_up0.13.0 -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.21_up0.13.0-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.22_up0.13.1 +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.22_up0.13.1-%RELEASE% apiVersion: v2 appVersion: 0.13.0 dependencies: @@ -10,7 +10,7 @@ dependencies: - alias: metal3-ironic name: ironic repository: file://./charts/ironic - version: 0.12.1 + version: 0.12.2 - 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.21+up0.13.0" +version: "%%CHART_MAJOR%%.0.22+up0.13.1" diff --git a/metal3-chart/charts/ironic/Chart.yaml b/metal3-chart/charts/ironic/Chart.yaml index 9097f9c..7ece84b 100644 --- a/metal3-chart/charts/ironic/Chart.yaml +++ b/metal3-chart/charts/ironic/Chart.yaml @@ -3,4 +3,4 @@ appVersion: 32.0.0 description: A Helm chart for Ironic, used by Metal3 name: ironic type: application -version: 0.12.1 +version: 0.12.2 diff --git a/metal3-chart/charts/ironic/values.yaml b/metal3-chart/charts/ironic/values.yaml index fea59ec..883b8ce 100644 --- a/metal3-chart/charts/ironic/values.yaml +++ b/metal3-chart/charts/ironic/values.yaml @@ -68,7 +68,7 @@ images: ironicIPADownloader: repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic-ipa-downloader pullPolicy: IfNotPresent - tag: 3.0.10 + tag: 3.0.11 nameOverride: "" fullnameOverride: "" diff --git a/release-manifest-image/release_images.yaml b/release-manifest-image/release_images.yaml index ad73873..1e7672e 100644 --- a/release-manifest-image/release_images.yaml +++ b/release-manifest-image/release_images.yaml @@ -5,7 +5,7 @@ images: - name: %%IMG_REPO%%/%%IMG_PREFIX%%baremetal-operator:0.11.2.0 - name: %%IMG_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator:0.3.0 - name: %%IMG_REPO%%/%%IMG_PREFIX%%ib-sriov-cni:v1.3.0 - - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.10 + - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.11 - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic:32.0.0.1 - name: %%IMG_REPO%%/%%IMG_PREFIX%%metallb-controller:v0.15.2 - name: %%IMG_REPO%%/%%IMG_PREFIX%%metallb-speaker:v0.15.2 diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index 78f9860..f10c77f 100644 --- a/release-manifest-image/release_manifest.yaml +++ b/release-manifest-image/release_manifest.yaml @@ -162,7 +162,7 @@ spec: - prettyName: Metal3 releaseName: metal3 chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metal3' - version: '%%CHART_MAJOR%%.0.21+up0.13.0' + version: '%%CHART_MAJOR%%.0.22+up0.13.1' - prettyName: RancherTurtlesProviders releaseName: rancher-turtles-providers chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles-providers' -- 2.51.1