diff --git a/_config b/_config index 07ef1a1..711b336 100644 --- a/_config +++ b/_config @@ -1,4 +1,5 @@ Prefer: -libqpid-proton10 -python311-urllib3_1 +Prefer: -cargo1.58 -cargo1.57 cargo1.88 Macros: %__python3 /usr/bin/python3.11 @@ -105,7 +106,7 @@ BuildFlags: onlybuild:release-manifest-image Patterntype: none BuildEngine: podman Prefer: sles-release - BuildFlags: dockerarg:SLE_VERSION=15.6 + BuildFlags: dockerarg:SLE_VERSION=15.7 # Publish multi-arch container images only once all archs have been built PublishFlags: archsync diff --git a/_meta b/_meta index 740b25d..62b26e1 100644 --- a/_meta +++ b/_meta @@ -45,7 +45,7 @@ {%- else %} - + {%- endif %} x86_64 @@ -56,8 +56,8 @@ {%- if release_project is defined and not for_release %} {%- endif %} - - + + x86_64 aarch64 diff --git a/baremetal-operator-image/Dockerfile b/baremetal-operator-image/Dockerfile index ea05f38..3e34e57 100644 --- a/baremetal-operator-image/Dockerfile +++ b/baremetal-operator-image/Dockerfile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 #!BuildTag: %%IMG_PREFIX%%baremetal-operator:%%baremetal-operator_version%%.1 #!BuildTag: %%IMG_PREFIX%%baremetal-operator:%%baremetal-operator_version%%.1-%RELEASE% -#!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro diff --git a/edge-image-builder-image/Dockerfile b/edge-image-builder-image/Dockerfile index fc4b2dc..5af085c 100644 --- a/edge-image-builder-image/Dockerfile +++ b/edge-image-builder-image/Dockerfile @@ -1,6 +1,5 @@ #!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.2.1 #!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.2.1-%RELEASE% -#!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-base:$SLE_VERSION MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/endpoint-copier-operator-image/Dockerfile b/endpoint-copier-operator-image/Dockerfile index 4562e9d..01a7784 100644 --- a/endpoint-copier-operator-image/Dockerfile +++ b/endpoint-copier-operator-image/Dockerfile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 #!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator:%%endpoint-copier-operator_version%% #!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator:%%endpoint-copier-operator_version%%-%RELEASE% -#!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro diff --git a/frr-image/Dockerfile b/frr-image/Dockerfile index 4255a41..0f4cb02 100644 --- a/frr-image/Dockerfile +++ b/frr-image/Dockerfile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: MIT #!BuildTag: %%IMG_PREFIX%%frr:8.5.6 #!BuildTag: %%IMG_PREFIX%%frr:8.5.6-%RELEASE% -#!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro diff --git a/frr-k8s-image/Dockerfile b/frr-k8s-image/Dockerfile index bd89308..a851ede 100644 --- a/frr-k8s-image/Dockerfile +++ b/frr-k8s-image/Dockerfile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 #!BuildTag: %%IMG_PREFIX%%frr-k8s:v%%frr-k8s_version%% #!BuildTag: %%IMG_PREFIX%%frr-k8s:v%%frr-k8s_version%%-%RELEASE% -#!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro diff --git a/ironic-image/Dockerfile b/ironic-image/Dockerfile index 00d40b1..da767d7 100644 --- a/ironic-image/Dockerfile +++ b/ironic-image/Dockerfile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.5 -#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.5-%RELEASE% -#!BuildVersion: 15.6 +#!BuildTag: %%IMG_PREFIX%%ironic:29.0.4.0 +#!BuildTag: %%IMG_PREFIX%%ironic:29.0.4.0-%RELEASE% ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro @@ -20,11 +19,11 @@ RUN sed -i -e 's%^# rpm.install.excludedocs = no.*%rpm.install.excludedocs = yes #!ArchExclusiveLine: x86_64 RUN if [ "$(uname -m)" = "x86_64" ];then \ - zypper --installroot /installroot --non-interactive install --no-recommends syslinux python311-devel python311 python311-pip python-dracclient python311-sushy-oem-idrac python311-proliantutils python311-sushy python311-pyinotify python3-ironicclient git curl sles-release tar gzip vim gawk dnsmasq dosfstools apache2 apache2-mod_wsgi ipcalc ipmitool iproute2 procps qemu-tools sqlite3 util-linux xorriso tftp ipxe-bootimgs python311-sushy-tools crudini openstack-ironic openstack-ironic-inspector-api; \ + zypper --installroot /installroot --non-interactive install --no-recommends syslinux python311-devel python311 python311-pip python311-sushy-oem-idrac python311-proliantutils python311-sushy python311-pyinotify python3-ironicclient git curl sles-release tar gzip vim gawk dnsmasq dosfstools apache2 apache2-mod_wsgi ipcalc ipmitool iproute2 procps qemu-tools sqlite3 util-linux xorriso tftp ipxe-bootimgs python311-sushy-tools crudini openstack-ironic; \ fi #!ArchExclusiveLine: aarch64 RUN if [ "$(uname -m)" = "aarch64" ];then \ - zypper --installroot /installroot --non-interactive install --no-recommends python311-devel python311 python311-pip python-dracclient python311-sushy-oem-idrac python311-proliantutils python311-sushy python311-pyinotify python3-ironicclient git curl sles-release tar gzip vim gawk dnsmasq dosfstools apache2 apache2-mod_wsgi ipcalc ipmitool iproute2 procps qemu-tools sqlite3 util-linux xorriso tftp ipxe-bootimgs python311-sushy-tools crudini openstack-ironic openstack-ironic-inspector-api; \ + zypper --installroot /installroot --non-interactive install --no-recommends python311-devel python311 python311-pip python311-sushy-oem-idrac python311-proliantutils python311-sushy python311-pyinotify python3-ironicclient git curl sles-release tar gzip vim gawk dnsmasq dosfstools apache2 apache2-mod_wsgi ipcalc ipmitool iproute2 procps qemu-tools sqlite3 util-linux xorriso tftp ipxe-bootimgs python311-sushy-tools crudini openstack-ironic; \ fi # DATABASE @@ -42,8 +41,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="26.1.2.5" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.5-%RELEASE%" +LABEL org.opencontainers.image.version="29.0.4.0" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:29.0.4.0-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.eula="SUSE Combined EULA February 2024" diff --git a/kube-rbac-proxy-image/Dockerfile b/kube-rbac-proxy-image/Dockerfile index 6ee2226..3dd7d8c 100644 --- a/kube-rbac-proxy-image/Dockerfile +++ b/kube-rbac-proxy-image/Dockerfile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 #!BuildTag: %%IMG_PREFIX%%kube-rbac-proxy:%%kube-rbac-proxy_version%% #!BuildTag: %%IMG_PREFIX%%kube-rbac-proxy:%%kube-rbac-proxy_version%%-%RELEASE% -#!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro diff --git a/kubectl-image/Dockerfile b/kubectl-image/Dockerfile index 2629b86..416928e 100644 --- a/kubectl-image/Dockerfile +++ b/kubectl-image/Dockerfile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 #!BuildTag: %%IMG_PREFIX%%kubectl:1.32.4 #!BuildTag: %%IMG_PREFIX%%kubectl:1.32.4-%RELEASE% -#!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro diff --git a/metal3-chart/Chart.yaml b/metal3-chart/Chart.yaml index 0955e45..f555558 100644 --- a/metal3-chart/Chart.yaml +++ b/metal3-chart/Chart.yaml @@ -1,7 +1,7 @@ -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.9_up0.11.7 -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.9_up0.11.7-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.10_up0.12.0 +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.10_up0.12.0-%RELEASE% apiVersion: v2 -appVersion: 0.11.7 +appVersion: 0.12.0 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.6 + version: 0.11.0 - alias: metal3-mariadb condition: global.enable_mariadb name: mariadb @@ -20,9 +20,9 @@ dependencies: condition: global.enable_metal3_media_server name: media repository: file://./charts/media - version: 0.6.3 + version: 0.6.4 description: A Helm chart that installs all of the dependencies needed for Metal3 icon: https://github.com/cncf/artwork/raw/master/projects/metal3/icon/color/metal3-icon-color.svg name: metal3 type: application -version: "%%CHART_MAJOR%%.0.9+up0.11.7" +version: "%%CHART_MAJOR%%.0.10+up0.12.0" diff --git a/metal3-chart/charts/ironic/Chart.yaml b/metal3-chart/charts/ironic/Chart.yaml index a174d38..c216ee6 100644 --- a/metal3-chart/charts/ironic/Chart.yaml +++ b/metal3-chart/charts/ironic/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: 26.1.2 +appVersion: 29.0.4 description: A Helm chart for Ironic, used by Metal3 name: ironic type: application -version: 0.10.6 +version: 0.11.0 diff --git a/metal3-chart/charts/ironic/values.yaml b/metal3-chart/charts/ironic/values.yaml index 16933c6..c0e5d62 100644 --- a/metal3-chart/charts/ironic/values.yaml +++ b/metal3-chart/charts/ironic/values.yaml @@ -56,7 +56,7 @@ images: ironic: repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic pullPolicy: IfNotPresent - tag: 26.1.2.5 + tag: 29.0.4.0 ironicIPADownloader: repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic-ipa-downloader pullPolicy: IfNotPresent diff --git a/metal3-chart/charts/media/Chart.yaml b/metal3-chart/charts/media/Chart.yaml index 6295c78..694afff 100644 --- a/metal3-chart/charts/media/Chart.yaml +++ b/metal3-chart/charts/media/Chart.yaml @@ -3,4 +3,4 @@ appVersion: 1.16.0 description: A Helm chart for Media, used by Metal3 name: media type: application -version: 0.6.3 +version: 0.6.4 diff --git a/metal3-chart/charts/media/values.yaml b/metal3-chart/charts/media/values.yaml index bb92cb7..3192ca0 100644 --- a/metal3-chart/charts/media/values.yaml +++ b/metal3-chart/charts/media/values.yaml @@ -24,7 +24,7 @@ replicaCount: 1 image: repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic pullPolicy: IfNotPresent - tag: 26.1.2.5 + tag: 29.0.4.0 imagePullSecrets: [] nameOverride: "" diff --git a/metallb-controller-image/Dockerfile b/metallb-controller-image/Dockerfile index 64c4439..11109a6 100644 --- a/metallb-controller-image/Dockerfile +++ b/metallb-controller-image/Dockerfile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 #!BuildTag: %%IMG_PREFIX%%metallb-controller:v%%metallb-controller_version%% #!BuildTag: %%IMG_PREFIX%%metallb-controller:v%%metallb-controller_version%%-%RELEASE% -#!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro diff --git a/metallb-speaker-image/Dockerfile b/metallb-speaker-image/Dockerfile index 2cde248..3602193 100644 --- a/metallb-speaker-image/Dockerfile +++ b/metallb-speaker-image/Dockerfile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 #!BuildTag: %%IMG_PREFIX%%metallb-speaker:v%%metallb-speaker_version%% #!BuildTag: %%IMG_PREFIX%%metallb-speaker:v%%metallb-speaker_version%%-%RELEASE% -#!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index 0375cd9..24a854b 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.9+up0.11.7" + version: "%%CHART_MAJOR%%.0.10+up0.12.0" - prettyName: RancherTurtles releaseName: rancher-turtles chart: "%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles" diff --git a/upgrade-controller-image/Dockerfile b/upgrade-controller-image/Dockerfile index 77febf4..4a52600 100644 --- a/upgrade-controller-image/Dockerfile +++ b/upgrade-controller-image/Dockerfile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 #!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.1 #!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.1-%RELEASE% -#!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro