diff --git a/baremetal-operator-image/Dockerfile b/baremetal-operator-image/Dockerfile index fdad9f2..ea05f38 100644 --- a/baremetal-operator-image/Dockerfile +++ b/baremetal-operator-image/Dockerfile @@ -1,13 +1,13 @@ # SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%baremetal-operator:%%baremetal-operator_version%% -#!BuildTag: %%IMG_PREFIX%%baremetal-operator:%%baremetal-operator_version%%-%RELEASE% +#!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 FROM registry.suse.com/bci/bci-base:$SLE_VERSION AS base COPY --from=micro / /installroot/ -RUN zypper --installroot /installroot --non-interactive install --no-recommends baremetal-operator iproute2 bind-utils vim shadow; zypper -n clean; rm -rf /var/log/* +RUN zypper --installroot /installroot --non-interactive install --no-recommends baremetal-operator inotify-tools procps iproute2 bind-utils vim shadow; zypper -n clean; rm -rf /var/log/* FROM micro AS final # Define labels according to https://en.opensuse.org/Building_derived_containers @@ -19,7 +19,7 @@ LABEL org.opencontainers.image.version="%%baremetal-operator_version%%" 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.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%baremetal-operator:%%baremetal-operator_version%%-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%baremetal-operator:%%baremetal-operator_version%%.1-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.eula="SUSE Combined EULA February 2024" @@ -29,6 +29,8 @@ LABEL com.suse.release-stage="released" # endlabelprefix COPY --from=base /installroot / +COPY bmo-run /usr/bin/bmo-run +RUN chmod +x /usr/bin/bmo-run RUN groupadd -r -g 11000 bmo RUN useradd -u 11000 -g 11000 bmo -ENTRYPOINT [ "/usr/bin/baremetal-operator" ] +ENTRYPOINT [ "/usr/bin/bmo-run" ] diff --git a/baremetal-operator-image/bmo-run b/baremetal-operator-image/bmo-run new file mode 100644 index 0000000..38e6c14 --- /dev/null +++ b/baremetal-operator-image/bmo-run @@ -0,0 +1,12 @@ +#!/bin/bash +export RESTART_CONTAINER_CERTIFICATE_UPDATED=${RESTART_CONTAINER_CERTIFICATE_UPDATED:-"false"} +export IRONIC_CACERT_FILE=${IRONIC_CACERT_FILE:-"/opt/metal3/certs/ca/tls.crt"} + +if [[ "${RESTART_CONTAINER_CERTIFICATE_UPDATED}" == "true" ]]; then + # shellcheck disable=SC2034 + inotifywait -m -e delete_self "${IRONIC_CACERT_FILE}" | while read -r file event; do + kill $(pgrep baremetal-opera) + done & +fi + +exec /usr/bin/baremetal-operator $@ \ No newline at end of file diff --git a/edge-image-builder-image/Dockerfile b/edge-image-builder-image/Dockerfile index 1e3ab9d..3bc492b 100644 --- a/edge-image-builder-image/Dockerfile +++ b/edge-image-builder-image/Dockerfile @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.2.0 -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.2.0-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.2.0.1 +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.2.0.1-%RELEASE% #!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-base:$SLE_VERSION @@ -19,7 +19,7 @@ LABEL org.opencontainers.image.version="1.2.0" 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.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.2.0-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.2.0.1-%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-downloader-image/Dockerfile b/ironic-ipa-downloader-image/Dockerfile index a9112ae..9fb2dc7 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.6 -#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.6-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.7 +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.7-%RELEASE% ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro @@ -22,7 +22,7 @@ LABEL org.opencontainers.image.version="3.0.6" 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.6-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.7-%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-downloader-image/Dockerfile.aarch64 b/ironic-ipa-downloader-image/Dockerfile.aarch64 index be21df9..99c6fef 100644 --- a/ironic-ipa-downloader-image/Dockerfile.aarch64 +++ b/ironic-ipa-downloader-image/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.6 -#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.6-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.7 +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-aarch64:3.0.7-%RELEASE% ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro @@ -22,7 +22,7 @@ LABEL org.opencontainers.image.version="3.0.6" 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.6-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.7-%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-downloader-image/Dockerfile.x86_64 b/ironic-ipa-downloader-image/Dockerfile.x86_64 index 27b0b35..fb1acbe 100644 --- a/ironic-ipa-downloader-image/Dockerfile.x86_64 +++ b/ironic-ipa-downloader-image/Dockerfile.x86_64 @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.6 -#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.6-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.7 +#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader-x86_64:3.0.7-%RELEASE% ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro @@ -22,7 +22,7 @@ LABEL org.opencontainers.image.version="3.0.6" 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.6-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.7-%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 365aced..d244cd7 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.6 +Version: 3.0.7 Release: 0 Summary: Kernel and ramdisk image for OpenStack Ironic License: SUSE-EULA diff --git a/metal3-chart/Chart.yaml b/metal3-chart/Chart.yaml index db19e70..971832d 100644 --- a/metal3-chart/Chart.yaml +++ b/metal3-chart/Chart.yaml @@ -1,16 +1,16 @@ -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.5_up0.11.3 -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.5_up0.11.3-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.7_up0.11.5 +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.7_up0.11.5-%RELEASE% apiVersion: v2 -appVersion: 0.11.3 +appVersion: 0.11.5 dependencies: - alias: metal3-baremetal-operator name: baremetal-operator repository: file://./charts/baremetal-operator - version: 0.9.1 + version: 0.9.2 - alias: metal3-ironic name: ironic repository: file://./charts/ironic - version: 0.10.3 + version: 0.10.5 - 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.1 + version: 0.6.2 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.5+up0.11.3" +version: "%%CHART_MAJOR%%.0.7+up0.11.5" diff --git a/metal3-chart/charts/baremetal-operator/Chart.yaml b/metal3-chart/charts/baremetal-operator/Chart.yaml index d9b1527..4a5fbd6 100644 --- a/metal3-chart/charts/baremetal-operator/Chart.yaml +++ b/metal3-chart/charts/baremetal-operator/Chart.yaml @@ -3,4 +3,4 @@ appVersion: 0.9.1 description: A Helm chart for baremetal-operator, used by Metal3 name: baremetal-operator type: application -version: 0.9.1 +version: 0.9.2 diff --git a/metal3-chart/charts/baremetal-operator/templates/configmap-ironic.yaml b/metal3-chart/charts/baremetal-operator/templates/configmap-ironic.yaml index 550e610..0e44f23 100644 --- a/metal3-chart/charts/baremetal-operator/templates/configmap-ironic.yaml +++ b/metal3-chart/charts/baremetal-operator/templates/configmap-ironic.yaml @@ -10,14 +10,15 @@ apiVersion: v1 data: IRONIC_ENDPOINT: "{{ $protocol }}://{{ $ironicApiHost }}/v1/" - RESTART_CONTAINER_CERTIFICATE_UPDATED: "false" # Switch VMedia to HTTP if enable_vmedia_tls is false {{- if and $enableTLS $enableVMediaTLS }} {{- $ironicBootHost = print $ironicIP ":" .Values.global.vmediaTLSPort }} {{- $ironicCacheHost = print $ironicIP ":" .Values.global.vmediaTLSPort }} {{- $protocol = "https" }} + RESTART_CONTAINER_CERTIFICATE_UPDATED: "true" {{- else }} {{- $protocol = "http" }} + RESTART_CONTAINER_CERTIFICATE_UPDATED: "false" {{- end }} CACHEURL: "{{ $protocol }}://{{ $ironicCacheHost }}/images" DEPLOY_KERNEL_URL: "{{ $protocol }}://{{ $ironicBootHost }}/images/ironic-python-agent-{{ $deployArch }}.kernel" diff --git a/metal3-chart/charts/baremetal-operator/templates/configmap.yaml b/metal3-chart/charts/baremetal-operator/templates/configmap.yaml deleted file mode 100644 index b22579a..0000000 --- a/metal3-chart/charts/baremetal-operator/templates/configmap.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -data: - controller_manager_config.yaml: | - apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 - kind: ControllerManagerConfig - health: - healthProbeBindAddress: :9440 - metrics: - bindAddress: 127.0.0.1:8085 - webhook: - port: 9443 - leaderElection: - leaderElect: true - resourceName: a9498140.metal3.io -kind: ConfigMap -metadata: - name: baremetal-operator-manager-config - labels: - {{- include "baremetal-operator.labels" . | nindent 4 }} diff --git a/metal3-chart/charts/baremetal-operator/templates/deployment.yaml b/metal3-chart/charts/baremetal-operator/templates/deployment.yaml index 53fbe05..f08610c 100644 --- a/metal3-chart/charts/baremetal-operator/templates/deployment.yaml +++ b/metal3-chart/charts/baremetal-operator/templates/deployment.yaml @@ -17,6 +17,8 @@ spec: control-plane: controller-manager template: metadata: + annotations: + checksum/config-env: {{ include (print $.Template.BasePath "/configmap-ironic.yaml") . | sha256sum }} labels: {{- include "baremetal-operator.selectorLabels" . | nindent 8 }} control-plane: controller-manager diff --git a/metal3-chart/charts/baremetal-operator/values.yaml b/metal3-chart/charts/baremetal-operator/values.yaml index 07bd439..5c2d75d 100644 --- a/metal3-chart/charts/baremetal-operator/values.yaml +++ b/metal3-chart/charts/baremetal-operator/values.yaml @@ -28,7 +28,7 @@ images: baremetalOperator: repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/baremetal-operator pullPolicy: IfNotPresent - tag: "0.9.1" + tag: "0.9.1.1" imagePullSecrets: [] nameOverride: "manger" diff --git a/metal3-chart/charts/ironic/Chart.yaml b/metal3-chart/charts/ironic/Chart.yaml index ac4f78c..87ba610 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.10.3 +version: 0.10.5 diff --git a/metal3-chart/charts/ironic/templates/deployment.yaml b/metal3-chart/charts/ironic/templates/deployment.yaml index ba07905..3e6e2cd 100644 --- a/metal3-chart/charts/ironic/templates/deployment.yaml +++ b/metal3-chart/charts/ironic/templates/deployment.yaml @@ -14,10 +14,11 @@ spec: type: Recreate template: metadata: - {{- with .Values.podAnnotations }} annotations: - {{- toYaml . | nindent 8 }} - {{- end }} + checksum/config-env: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} labels: {{- include "ironic.selectorLabels" . | nindent 8 }} spec: diff --git a/metal3-chart/charts/ironic/values.yaml b/metal3-chart/charts/ironic/values.yaml index a32ce1f..8ebb4d6 100644 --- a/metal3-chart/charts/ironic/values.yaml +++ b/metal3-chart/charts/ironic/values.yaml @@ -60,7 +60,7 @@ images: ironicIPADownloader: repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic-ipa-downloader pullPolicy: IfNotPresent - tag: 3.0.6 + tag: 3.0.7 nameOverride: "" fullnameOverride: "" diff --git a/metal3-chart/charts/media/Chart.yaml b/metal3-chart/charts/media/Chart.yaml index 0d50533..0d88854 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.1 +version: 0.6.2 diff --git a/metal3-chart/charts/media/values.yaml b/metal3-chart/charts/media/values.yaml index bf93c3d..7afd1f3 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.2 + tag: 26.1.2.4 imagePullSecrets: [] nameOverride: "" diff --git a/nm-configurator/_service b/nm-configurator/_service index ec4e84e..f87e014 100644 --- a/nm-configurator/_service +++ b/nm-configurator/_service @@ -3,7 +3,7 @@ https://github.com/suse-edge/nm-configurator.git @PARENT_TAG@ git - v0.3.2 + v0.3.3 * v(\d+\.\d+\.\d+) \1 diff --git a/nm-configurator/_servicedata b/nm-configurator/_servicedata index df910cc..4974987 100644 --- a/nm-configurator/_servicedata +++ b/nm-configurator/_servicedata @@ -1,4 +1,4 @@ https://github.com/suse-edge/nm-configurator.git - 747301ba15a28e758d1f06070dc7ff29a5e80242 \ No newline at end of file + 4563857d761c6d83e4013721f68ec4ac5828a1a7 \ No newline at end of file diff --git a/nm-configurator/nm-configurator-0.3.2.obscpio b/nm-configurator/nm-configurator-0.3.2.obscpio deleted file mode 100644 index 89e3de6..0000000 --- a/nm-configurator/nm-configurator-0.3.2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:528dcffbd9ef4a62eef094abca8a41d998f001a607305476be7b45b589b5e9c1 -size 122379 diff --git a/nm-configurator/nm-configurator-0.3.3.obscpio b/nm-configurator/nm-configurator-0.3.3.obscpio new file mode 100644 index 0000000..b3b0a21 --- /dev/null +++ b/nm-configurator/nm-configurator-0.3.3.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02286dfbe05a5d046bf1aa17c6f1d139c4bcbb09571ffa0342f604a56ab9e4da +size 124939 diff --git a/nm-configurator/nm-configurator.obsinfo b/nm-configurator/nm-configurator.obsinfo index d738174..2535329 100644 --- a/nm-configurator/nm-configurator.obsinfo +++ b/nm-configurator/nm-configurator.obsinfo @@ -1,4 +1,4 @@ name: nm-configurator -version: 0.3.2 -mtime: 1744218621 -commit: 747301ba15a28e758d1f06070dc7ff29a5e80242 +version: 0.3.3 +mtime: 1748341626 +commit: 4563857d761c6d83e4013721f68ec4ac5828a1a7 diff --git a/nm-configurator/vendor.tar.xz b/nm-configurator/vendor.tar.xz index 0f028e3..324a1b6 100644 --- a/nm-configurator/vendor.tar.xz +++ b/nm-configurator/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:478cbb9accdc614ede623dda16cbebcf0268a585e85082da025cdcfa9bcd3222 -size 19059276 +oid sha256:b07c5aeb9e8fd216761658c774b5e1bcc33f83e2dbdb8fdb6a3570cd8c70b311 +size 19073196 diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index 72eaba0..1288049 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.5+up0.11.3" + version: "%%CHART_MAJOR%%.0.7+up0.11.5" - prettyName: RancherTurtles releaseName: rancher-turtles chart: "%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles"