diff --git a/ironic-image/Dockerfile b/ironic-image/Dockerfile index 285f3f1..d8b5ee8 100644 --- a/ironic-image/Dockerfile +++ b/ironic-image/Dockerfile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%ironic:32.0.0.0 -#!BuildTag: %%IMG_PREFIX%%ironic:32.0.0.0-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%ironic:32.0.0.1 +#!BuildTag: %%IMG_PREFIX%%ironic:32.0.0.1-%RELEASE% ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro @@ -47,8 +47,8 @@ LABEL org.opencontainers.image.description="Openstack Ironic based on the SLE Ba LABEL org.opencontainers.image.url="https://www.suse.com/products/server/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opencontainers.image.version="29.0.4.4" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:29.0.4.4-%RELEASE%" +LABEL org.opencontainers.image.version="32.0.0.1" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:32.0.0.1-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.eula="SUSE Combined EULA February 2024" @@ -87,13 +87,13 @@ COPY ironic-config/inspector.ipxe.j2 ironic-config/httpd-ironic-api.conf.j2 \ RUN cp /usr/share/ipxe/undionly.kpxe /tftpboot/undionly.kpxe #!ArchExclusiveLine: x86_64 RUN if [ "$(uname -m)" = "x86_64" ];then \ - cp /usr/share/ipxe/ipxe-x86_64.efi /tftpboot/ipxe.efi ;\ + cp /usr/share/ipxe/snp-x86_64.efi /tftpboot/snponly.efi ;\ fi -#!ArchExclusiveLine: aarch64 -RUN if [ "$(uname -m)" = "aarch64" ]; then\ - cp /usr/share/ipxe/snp-arm64.efi /tftpboot/ipxe.efi; cp /usr/share/ipxe/snp-arm64.efi /tftpboot/snp-arm64.efi; cp /usr/share/ipxe/snp-arm64.efi /tftpboot/snp.efi ;\ +#!ArchExclusiveLine: aarch64 +RUN if [ "$(uname -m)" = "aarch64" ]; then\ + cp /usr/share/ipxe/snp-arm64.efi /tftpboot/snponly.efi;\ fi - + COPY --from=base /tmp/uefi_esp_*.img /templates/ COPY ironic-config/ironic.conf.j2 ironic-config/network-data-schema-empty.json /etc/ironic/ diff --git a/metal3-chart/Chart.yaml b/metal3-chart/Chart.yaml index 743aebf..c4e0ffb 100644 --- a/metal3-chart/Chart.yaml +++ b/metal3-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.20_up0.13.0 -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.20_up0.13.0-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.21_up0.13.0 +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.21_up0.13.0-%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.0 + version: 0.12.1 - 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.20+up0.13.0" +version: "%%CHART_MAJOR%%.0.21+up0.13.0" diff --git a/metal3-chart/charts/ironic/Chart.yaml b/metal3-chart/charts/ironic/Chart.yaml index aad87ad..9097f9c 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.0 +version: 0.12.1 diff --git a/metal3-chart/charts/ironic/values.yaml b/metal3-chart/charts/ironic/values.yaml index 8b1b430..fea59ec 100644 --- a/metal3-chart/charts/ironic/values.yaml +++ b/metal3-chart/charts/ironic/values.yaml @@ -64,7 +64,7 @@ images: ironic: repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic pullPolicy: IfNotPresent - tag: 32.0.0.0 + tag: 32.0.0.1 ironicIPADownloader: repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic-ipa-downloader pullPolicy: IfNotPresent diff --git a/release-manifest-image/release_images.yaml b/release-manifest-image/release_images.yaml index 75909f1..a9a6f1d 100644 --- a/release-manifest-image/release_images.yaml +++ b/release-manifest-image/release_images.yaml @@ -4,10 +4,10 @@ images: - name: quay.io/jetstack/cert-manager-controller:v1.18.2 - name: quay.io/jetstack/cert-manager-webhook:v1.18.2 - name: registry.k8s.io/e2e-test-images/agnhost:2.39 - - name: %%IMG_REPO%%/%%IMG_PREFIX%%baremetal-operator:0.10.2.1 + - 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%%ironic-ipa-downloader:3.0.9 - - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic:29.0.4.3 + - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.10 + - 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 - name: %%IMG_REPO%%/%%IMG_PREFIX%%upgrade-controller:0.1.1 diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index bf79cc7..6dd0cf2 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.20+up0.13.0' + version: '%%CHART_MAJOR%%.0.21+up0.13.0' - prettyName: RancherTurtles releaseName: rancher-turtles chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles'