From b912f9d68a12e40435aae66864c7bc5b39e144207a94581d36b1980eacea368c Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 12 Feb 2025 09:06:45 +0000 Subject: [PATCH 1/2] ironic-image: update to 26.1.2.2 Align with: https://build.opensuse.org/package/rdiff/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-image?linkrev=base&rev=10 https://github.com/suse-edge/charts/pull/182 Fixes a pod restart caused by the runlogwatch.sh script --- ironic-image/Dockerfile | 8 ++++---- ironic-image/runlogwatch.sh | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ironic-image/Dockerfile b/ironic-image/Dockerfile index 7d3d78b..dc4995a 100644 --- a/ironic-image/Dockerfile +++ b/ironic-image/Dockerfile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.1 -#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.1-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.2 +#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.2-%RELEASE% #!BuildVersion: 15.6 ARG SLE_VERSION @@ -46,8 +46,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.1" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.1-%RELEASE%" +LABEL org.opencontainers.image.version="26.1.2.2" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.2-%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-image/runlogwatch.sh b/ironic-image/runlogwatch.sh index 525cd7d..b5bcabb 100644 --- a/ironic-image/runlogwatch.sh +++ b/ironic-image/runlogwatch.sh @@ -3,6 +3,14 @@ # Ramdisk logs path LOG_DIR="/shared/log/ironic/deploy" +# The ironic container creates the directory, wait for +# it to exist before running inotifywait or it can fail causing +# a spurious restart +while [ ! -d "${LOG_DIR}" ]; do + echo "Waiting for ${LOG_DIR}" + sleep 5 +done + inotifywait -m "${LOG_DIR}" -e close_write | while read -r path _action file; do echo "************ Contents of ${path}/${file} ramdisk log file bundle **************" -- 2.45.2 From 9d97e8a56d5ec8a86dc6b5822fd183bf1edaa6f431b58a239701003e890516a9 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 12 Feb 2025 09:12:49 +0000 Subject: [PATCH 2/2] metal3-chart: Update to 0.9.2 Align with https://github.com/suse-edge/charts/pull/182 --- metal3-chart/Chart.yaml | 14 +++++++------- metal3-chart/charts/baremetal-operator/Chart.yaml | 2 +- .../templates/tests/test-connection.yaml | 15 --------------- metal3-chart/charts/ironic/Chart.yaml | 2 +- metal3-chart/charts/ironic/values.yaml | 2 +- metal3-chart/charts/media/Chart.yaml | 2 +- .../media/templates/tests/test-connection.yaml | 15 --------------- metal3-chart/charts/media/values.yaml | 2 +- 8 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 metal3-chart/charts/baremetal-operator/templates/tests/test-connection.yaml delete mode 100644 metal3-chart/charts/media/templates/tests/test-connection.yaml diff --git a/metal3-chart/Chart.yaml b/metal3-chart/Chart.yaml index 5e193ab..7bce2cf 100644 --- a/metal3-chart/Chart.yaml +++ b/metal3-chart/Chart.yaml @@ -1,16 +1,16 @@ -#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.1 -#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.1-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.2 +#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.2-%RELEASE% apiVersion: v2 -appVersion: 0.9.1 +appVersion: 0.9.2 dependencies: - alias: metal3-baremetal-operator name: baremetal-operator repository: file://./charts/baremetal-operator - version: 0.6.0 + version: 0.6.1 - alias: metal3-ironic name: ironic repository: file://./charts/ironic - version: 0.9.0 + version: 0.9.1 - 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.0 + version: 0.6.1 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.0+up0.9.1" +version: "%%CHART_MAJOR%%.0.0+up0.9.2" diff --git a/metal3-chart/charts/baremetal-operator/Chart.yaml b/metal3-chart/charts/baremetal-operator/Chart.yaml index 808b950..9fa5be0 100644 --- a/metal3-chart/charts/baremetal-operator/Chart.yaml +++ b/metal3-chart/charts/baremetal-operator/Chart.yaml @@ -3,4 +3,4 @@ appVersion: 0.8.0 description: A Helm chart for baremetal-operator, used by Metal3 name: baremetal-operator type: application -version: 0.6.0 +version: 0.6.1 diff --git a/metal3-chart/charts/baremetal-operator/templates/tests/test-connection.yaml b/metal3-chart/charts/baremetal-operator/templates/tests/test-connection.yaml deleted file mode 100644 index 28715fe..0000000 --- a/metal3-chart/charts/baremetal-operator/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "baremetal-operator.fullname" . }}-test-connection" - labels: - {{- include "baremetal-operator.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "baremetal-operator.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/metal3-chart/charts/ironic/Chart.yaml b/metal3-chart/charts/ironic/Chart.yaml index 7befcf1..37712fb 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.9.0 +version: 0.9.1 diff --git a/metal3-chart/charts/ironic/values.yaml b/metal3-chart/charts/ironic/values.yaml index 1837e17..0e153cc 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.1 + tag: 26.1.2.2 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 0028050..0d50533 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.0 +version: 0.6.1 diff --git a/metal3-chart/charts/media/templates/tests/test-connection.yaml b/metal3-chart/charts/media/templates/tests/test-connection.yaml deleted file mode 100644 index f96c62c..0000000 --- a/metal3-chart/charts/media/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "media.fullname" . }}-test-connection" - labels: - {{- include "media.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "media.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/metal3-chart/charts/media/values.yaml b/metal3-chart/charts/media/values.yaml index 0a52c8f..bf93c3d 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.0 + tag: 26.1.2.2 imagePullSecrets: [] nameOverride: "" -- 2.45.2