suse-edge/Factory
SHA256
14
0
Fork 15
Code Issues Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Update the metal3-chart to fix the IPA ramdisk with multiple config-2 drives #145

Merged
nbelouin merged 2 commits from mchiappero/Factory:metal3_0.11.1 into main 2025-05-09 15:58:43 +02:00
Conversation 9 Commits 2 Files Changed 10 +23 -27
10 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ironic-ipa-downloader-image/Dockerfile
View File

@@ -1,6 +1,6 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.3 #!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.4
#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.3-%RELEASE% #!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.4-%RELEASE%
ARG SLE_VERSION ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro 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.authors="SUSE LLC (https://www.suse.com/)"
LABEL org.opencontainers.image.title="SLE Based Ironic IPA Downloader Container Image" 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.description="ironic-ipa-downloader based on the SLE Base Container Image."
LABEL org.opencontainers.image.version="3.0.3" LABEL org.opencontainers.image.version="3.0.4"
LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/" LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC" LABEL org.opencontainers.image.vendor="SUSE LLC"
LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.3-%RELEASE%" LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.4-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
LABEL com.suse.eula="SUSE Combined EULA February 2024" LABEL com.suse.eula="SUSE Combined EULA February 2024"

8
ironic-ipa-downloader-image/Dockerfile.aarch64
View File

@@ -1,6 +1,6 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.3 #!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.4
#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.3-%RELEASE% #!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.4-%RELEASE%
ARG SLE_VERSION ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro 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.authors="SUSE LLC (https://www.suse.com/)"
LABEL org.opencontainers.image.title="SLE Based Ironic IPA Downloader Container Image" 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.description="ironic-ipa-downloader based on the SLE Base Container Image."
LABEL org.opencontainers.image.version="3.0.3" LABEL org.opencontainers.image.version="3.0.4"
LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/" LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC" LABEL org.opencontainers.image.vendor="SUSE LLC"
LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.3-%RELEASE%" LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.4-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
LABEL com.suse.eula="SUSE Combined EULA February 2024" LABEL com.suse.eula="SUSE Combined EULA February 2024"

8
ironic-ipa-downloader-image/Dockerfile.x86_64
View File

@@ -1,6 +1,6 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.3 #!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.4
#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.3-%RELEASE% #!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.4-%RELEASE%
ARG SLE_VERSION ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro 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.authors="SUSE LLC (https://www.suse.com/)"
LABEL org.opencontainers.image.title="SLE Based Ironic IPA Downloader Container Image" 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.description="ironic-ipa-downloader based on the SLE Base Container Image."
LABEL org.opencontainers.image.version="3.0.3" LABEL org.opencontainers.image.version="3.0.4"
LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/" LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC" LABEL org.opencontainers.image.vendor="SUSE LLC"
LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.3-%RELEASE%" LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.4-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
LABEL com.suse.eula="SUSE Combined EULA February 2024" LABEL com.suse.eula="SUSE Combined EULA February 2024"

2
ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec
View File

@@ -19,7 +19,7 @@
Name: ironic-ipa-ramdisk Name: ironic-ipa-ramdisk
Version: 3.0.3 Version: 3.0.4
Release: 0 Release: 0
Summary: Kernel and ramdisk image for OpenStack Ironic Summary: Kernel and ramdisk image for OpenStack Ironic
License: SUSE-EULA License: SUSE-EULA

BIN
ironic-ipa-ramdisk/root.tar.bz2 (Stored with Git LFS)
View File

Binary file not shown.

10
metal3-chart/Chart.yaml
View File

@@ -1,7 +1,7 @@
#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.2_up0.11.0 #!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.3_up0.11.1
#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.2_up0.11.0-%RELEASE% #!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.3_up0.11.1-%RELEASE%
steven.hardy commented 2025-05-09 11:42:23 +02:00
Outdated
Review
Copy Link

@nbelouin since this will be the first chart release for 3.3 do we expec this to be %%CHART_MAJOR%%.0.0 until the release happens?

@nbelouin since this will be the first chart release for 3.3 do we expec this to be `%%CHART_MAJOR%%.0.0` until the release happens?
nbelouin commented 2025-05-09 11:48:42 +02:00
Outdated
Review
Copy Link

no, we should always bump the last elements here (and not reset them), put simply if we consider Factory (with chart major 999) as a rolling upgrade like it should work as upgrades when we do changes to charts.

no, we should always bump the last elements here (and not reset them), put simply if we consider Factory (with chart major `999`) as a rolling upgrade like it should work as upgrades when we do changes to charts.
steven.hardy commented 2025-05-09 12:02:37 +02:00
Outdated
Review
Copy Link

Ok thanks for clarifying - it may be worth discussing this with the team to ensure everyone is aware, as this is a different strategy to rancher/charts which resets the version for each rancher release

Ok thanks for clarifying - it may be worth discussing this with the team to ensure everyone is aware, as this is a different strategy to rancher/charts which resets the version for each rancher release
apiVersion: v2 apiVersion: v2
appVersion: 0.11.0 appVersion: 0.11.1
dependencies: dependencies:
- alias: metal3-baremetal-operator - alias: metal3-baremetal-operator
name: baremetal-operator name: baremetal-operator
@@ -10,7 +10,7 @@ dependencies:
- alias: metal3-ironic - alias: metal3-ironic
name: ironic name: ironic
repository: file://./charts/ironic repository: file://./charts/ironic
version: 0.10.0 version: 0.10.1
- alias: metal3-mariadb - alias: metal3-mariadb
condition: global.enable_mariadb condition: global.enable_mariadb
name: 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 icon: https://github.com/cncf/artwork/raw/master/projects/metal3/icon/color/metal3-icon-color.svg
name: metal3 name: metal3
type: application type: application
version: "%%CHART_MAJOR%%.0.2+up0.11.0" version: "%%CHART_MAJOR%%.0.3+up0.11.1"
nbelouin marked this conversation as resolved Outdated
nbelouin commented 2025-05-09 09:07:23 +02:00
Outdated
Review
Copy Link

Please also bump the chart version itself (the +up suffix isn't used for version ordering)

Please also bump the chart version itself (the `+up` suffix isn't used for version ordering)
👍 1

2
metal3-chart/charts/baremetal-operator/values.yaml
View File

@@ -22,8 +22,6 @@ global:
# Comment this out when pinning the baremetal-operator container to a specfic host. # Comment this out when pinning the baremetal-operator container to a specfic host.
nodeSelector: {} nodeSelector: {}
enable_tls: false
steven.hardy commented 2025-05-08 18:05:28 +02:00
Outdated
Review
Copy Link

Note for other reviewers - I think this reverts a mistake introduced via 1048591769 - @nbelouin I guess that was from some debugging?

Note for other reviewers - I think this reverts a mistake introduced via https://src.opensuse.org/suse-edge/Factory/commit/104859176984ee1268395e036ffe2a6b299fd6174d9e46286b4e90fff6f164cf - @nbelouin I guess that was from some debugging?
nbelouin commented 2025-05-09 09:06:09 +02:00
Outdated
Review
Copy Link

Was to solve some issues related to linting, no longer necessary and didn't remove those, so no problem in removing them.

Was to solve some issues related to linting, no longer necessary and didn't remove those, so no problem in removing them.
mchiappero commented 2025-05-09 10:57:29 +02:00
Outdated
Review
Copy Link

Do we prefer to have a separate PR?

Do we prefer to have a separate PR?
replicaCount: 1 replicaCount: 1
images: images:

2
metal3-chart/charts/ironic/Chart.yaml
View File

@@ -3,4 +3,4 @@ appVersion: 26.1.2
description: A Helm chart for Ironic, used by Metal3 description: A Helm chart for Ironic, used by Metal3
name: ironic name: ironic
type: application type: application
version: 0.10.0 version: 0.10.1

4
metal3-chart/charts/ironic/values.yaml
View File

@@ -50,8 +50,6 @@ global:
# Comment this out when pinning the pdns containers to a specfic host. # Comment this out when pinning the pdns containers to a specfic host.
nodeSelector: {} nodeSelector: {}
enable_tls: false
replicaCount: 1 replicaCount: 1
images: images:
@@ -62,7 +60,7 @@ images:
ironicIPADownloader: ironicIPADownloader:
repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic-ipa-downloader repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic-ipa-downloader
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
tag: 3.0.3 tag: 3.0.4
nameOverride: "" nameOverride: ""
fullnameOverride: "" fullnameOverride: ""

2
release-manifest-image/release_manifest.yaml
View File

@@ -171,7 +171,7 @@ spec:
- prettyName: Metal3 - prettyName: Metal3
releaseName: metal3 releaseName: metal3
chart: %%CHART_REPO%%/%%CHART_PREFIX%%metal3 chart: %%CHART_REPO%%/%%CHART_PREFIX%%metal3
version: %%CHART_MAJOR%%.0.2+up0.11.0 version: %%CHART_MAJOR%%.0.3+up0.11.1
- prettyName: RancherTurtles - prettyName: RancherTurtles
releaseName: rancher-turtles releaseName: rancher-turtles
chart: %%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles chart: %%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles