rancher-turtles: image/version fixes

After further testing I discovered that the cluster-api-controller is
not correctly pinned or using the downstream image, and a similar
problem exists for CAPM3 (but only after upgrade from an older chart)
due to a mistake in the templating.

.gitea/workflows/sync_config.yaml

@@ -1,33 +0,0 @@
-name: Synchronize Project Config
-on:
-  push:
-    branches:
-      - "main"
-      - "3.*"
-    paths:
-      - "_config"
-      - ".gitea/workflows/sync_config.yaml"
-
-jobs:
-  sync-prjconf:
-    runs-on: tumbleweed
-    steps:
-      - run: |
-          mkdir -p ~/.config/osc
-          cat >~/.config/osc/oscrc <<EOF
-          [general]
-          apiurl = https://api.opensuse.org
-
-          [https://api.opensuse.org]
-          user=${{ vars.OBS_USERNAME }}
-          pass=${{ secrets.OBS_PASSWORD }}
-          EOF
-    # Waiting on PR to get merged for support in upstream action/checkout action
-      - uses: 'https://github.com/yangskyboxlabs/action-checkout@sha256'
-        with:
-          object-format: 'sha256'
-      - run: |
-          PROJECT="$(grep PROJECT .obs/common.py | sed 's/PROJECT = "\(.*\)"/\1/')"
-          if [ "$(osc meta prjconf "${PROJECT}" | sha256sum)" = "$(cat _config | sha256sum)" ] ; then
-            osc meta prjconf "${PROJECT}" -F _config
-          fi

.obs/workflows.yml

@@ -94,14 +94,26 @@ staging_build:
       source_package: hauler
       source_project: isv:SUSE:Edge:Factory
       target_project: isv:SUSE:Edge:Factory:Staging
+  - branch_package:
+      source_package: ip-address-manager
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
   - branch_package:
       source_package: baremetal-operator
       source_project: isv:SUSE:Edge:Factory
       target_project: isv:SUSE:Edge:Factory:Staging
+  - branch_package:
+      source_package: cluster-api-provider-metal3
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
   - branch_package:
       source_package: cdi-chart
       source_project: isv:SUSE:Edge:Factory
       target_project: isv:SUSE:Edge:Factory:Staging
+  - branch_package:
+      source_package: cluster-api-provider-metal3-image
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
   - branch_package:
       source_package: metallb-chart
       source_project: isv:SUSE:Edge:Factory
@@ -142,6 +154,10 @@ staging_build:
       source_package: metallb-controller-image
       source_project: isv:SUSE:Edge:Factory
       target_project: isv:SUSE:Edge:Factory:Staging
+  - branch_package:
+      source_package: ip-address-manager-image
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
   - branch_package:
       source_package: metallb-speaker-image
       source_project: isv:SUSE:Edge:Factory
@@ -206,11 +222,3 @@ staging_build:
       source_package: frr-image
       source_project: isv:SUSE:Edge:Factory
       target_project: isv:SUSE:Edge:Factory:Staging
-  - branch_package:
-      source_package: kubectl-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
-  - branch_package:
-      source_package: frr-k8s-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging

_config

@@ -1,121 +0,0 @@
-Prefer: -libqpid-proton10 -python311-urllib3_1
-
-Macros:
-%__python3 /usr/bin/python3.11
-%registry_url %(echo %{vendor} | cut -d '/' -f 3 | sed 's/build/registry/')
-:Macros
-
-%if "%{sub %{lower %_project} 1 14}" != "isv:suse:edge:" || "%{sub %_project 15 21}" == "Factory"
-    # Here we are in Factory like project so set chart major version to 999
-Macros:
-%chart_major 999
-:Macros
-%else
-    # Here we are in version branch, so set the image prefix and chart major accordingly
-Macros:
-%project_branch %(echo %{_project} | cut -d ':' -f 4)
-%img_prefix %{project_branch}/
-%chart_major %(echo %{project_branch} | awk '{split($1,a,"."); print a[1]*100 + a[2]}')
-:Macros
-%endif
-
-%if %{sub %_project 1 3} == ISV
-Macros:
-%img_repo registry.suse.com/edge
-%chart_repo oci://registry.suse.com/edge
-%manifest_repo registry.suse.com/edge
-%support_level l3
-:Macros
-%else
-Macros:
-%img_repo registry.opensuse.org/isv/suse/edge/containers/images
-%manifest_repo registry.opensuse.org/isv/suse/edge/containers/images
-%chart_repo oci://registry.opensuse.org/isv/suse/edge/containers/charts
-%support_level techpreview
-:Macros
-%endif
-
-%if "%_repository" == "charts" || "%_repository" == "test_manifest_images"
-Macros:
-%img_repo %(echo %{registry_url}:%{_project}:images | tr ":" "/" | tr '[:upper:]' '[:lower:]')
-%manifest_repo %(echo %{registry_url}:%{_project}:test_manifest_images | tr ":" "/" | tr '[:upper:]' '[:lower:]')
-%chart_repo oci://%(echo %{registry_url}:%{_project}:charts | tr ":" "/" | tr '[:upper:]' '[:lower:]')
-:Macros
-%endif
-
-# Missing deps for testsuite
-BuildFlags: excludebuild:autoconf:el
-BuildFlags: excludebuild:autoconf:testsuite
-
-# Only build manifest embedding images here
-%if "%_repository" == "test_manifest_images"
-BuildFlags: onlybuild:edge-image-builder-image
-BuildFlags: onlybuild:release-manifest-image
-  # Exclude the images selected by the following section
-  # as the standard repository is a dependency
-  %ifarch aarch64
-    BuildFlags: excludebuild:endpoint-copier-operator-image
-    BuildFlags: excludebuild:metallb-controller-image
-    BuildFlags: excludebuild:metallb-speaker-image
-    BuildFlags: excludebuild:baremetal-operator-image
-    BuildFlags: excludebuild:ironic-ipa-downloader-image
-    BuildFlags: excludebuild:ironic-image
-    BuildFlags: excludebuild:kube-rbac-proxy-image
-  %endif
-%else
-# Only a subset of stack is arm64 ready
-  %ifarch aarch64
-    BuildFlags: onlybuild:ca-certificates-suse
-    BuildFlags: onlybuild:cosign
-    BuildFlags: onlybuild:edge-image-builder
-    BuildFlags: onlybuild:edge-image-builder-image
-    BuildFlags: onlybuild:endpoint-copier-operator
-    BuildFlags: onlybuild:endpoint-copier-operator-image
-    BuildFlags: onlybuild:hauler
-    BuildFlags: onlybuild:metallb
-    BuildFlags: onlybuild:metallb-controller-image
-    BuildFlags: onlybuild:metallb-speaker-image
-    BuildFlags: onlybuild:nm-configurator
-    BuildFlags: onlybuild:baremetal-operator
-    BuildFlags: onlybuild:baremetal-operator-image
-    BuildFlags: onlybuild:ironic-ipa-ramdisk
-    BuildFlags: onlybuild:ironic-ipa-downloader-image
-    BuildFlags: onlybuild:ironic-image
-    BuildFlags: onlybuild:kube-rbac-proxy
-    BuildFlags: onlybuild:kube-rbac-proxy-image
-  %endif
-%endif
-
-%if "%_repository" == "images" || "%_repository" == "test_manifest_images"
-    Prefer: container:sles15-image
-    Type: docker
-    Repotype: none
-    Patterntype: none
-    BuildEngine: podman
-    Prefer: sles-release
-    BuildFlags: dockerarg:SLE_VERSION=15.6
-
-    # Publish multi-arch container images only once all archs have been built
-    PublishFlags: archsync
-%endif
-
-%if "%_repository" == "charts" || "%_repository" == "phantomcharts" || "%_repository" == "releasecharts"
-    Type: helm
-    Repotype: helm
-    Patterntype: none
-    Required: perl-YAML-LibYAML
-%endif
-
-%if "%_repository" == "standard"
-    # for build openstack-ironic-image
-    BuildFlags: allowrootforbuild
-%endif
-
-# Enable reproducible builds
-# https://en.opensuse.org/openSUSE:Reproducible_Builds\#With_OBS
-Macros:
-%source_date_epoch_from_changelog Y
-%clamp_mtime_to_source_date_epoch Y
-%use_source_date_epoch_as_buildtime Y
-%_buildhost reproducible
-:Macros

akri-dashboard-extension-chart/Chart.yaml

@@ -1,6 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0
+#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.0
-#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.1
+#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.0-%RELEASE%
-#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.1-%RELEASE%
 annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: Akri
@@ -11,11 +10,11 @@ annotations:
   catalog.cattle.io/rancher-version: ">= 2.10.0-0"
   catalog.cattle.io/scope: management
   catalog.cattle.io/ui-component: plugins
-  catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
+  catalog.cattle.io/ui-extensions-version: ">= 3.0.0"
 apiVersion: v2
-appVersion: 1.2.1
+appVersion: 1.2.0
 description: "SUSE Edge: Akri extension for Rancher Dashboard"
 icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/akri/icon/color/akri-icon-color.svg
 name: akri-dashboard-extension
 type: application
-version: "%%CHART_MAJOR%%.0.0+up1.2.1"
+version: "%%CHART_MAJOR%%.0.0+up1.2.0"

akri-dashboard-extension-chart/templates/cr.yaml

@@ -8,7 +8,7 @@ spec:
   plugin:
     name: {{ include "extension-server.fullname" . }}
     version: {{ (semver (default .Chart.AppVersion .Values.plugin.versionOverride)).Original }}
-    endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/akri-dashboard-extension/1.2.1
+    endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/akri-dashboard-extension/1.2.0
     noCache: {{ .Values.plugin.noCache }}
     noAuth: {{ .Values.plugin.noAuth }}
     metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}

akri-dashboard-extension-chart/values.yaml

@@ -8,5 +8,5 @@ plugin:
   metadata:
     catalog.cattle.io/display-name: Akri
     catalog.cattle.io/rancher-version: ">= 2.10.0-0"
-    catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
+    catalog.cattle.io/ui-extensions-version: ">= 3.0.0"
     catalog.cattle.io/kube-version: ">= v1.26.0-0"

cluster-api-provider-metal3-image/Dockerfile

@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: Apache-2.0
+#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-metal3:v%%cluster-api-provider-metal3_version%%
+#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-metal3:%%cluster-api-provider-metal3_version%%
+#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-metal3:%%cluster-api-provider-metal3_version%%-%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 cluster-api-provider-metal3 shadow; zypper -n clean; rm -rf /var/log/*
+
+FROM micro AS final
+# Define labels according to https://en.opensuse.org/Building_derived_containers
+# labelprefix=com.suse.application.cluster-api-provider-metal3
+LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
+LABEL org.opencontainers.image.title="SLE cluster-api-provider-metal3 Container Image"
+LABEL org.opencontainers.image.description="cluster-api-provider-metal3 based on the SLE Base Container Image."
+LABEL org.opencontainers.image.version="%%cluster-api-provider-metal3_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%%cluster-api-provider-metal3:%%cluster-api-provider-metal3_version%%-%RELEASE%"
+LABEL org.openbuildservice.disturl="%DISTURL%"
+LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
+LABEL com.suse.eula="SUSE Combined EULA February 2024"
+LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
+LABEL com.suse.image-type="application"
+LABEL com.suse.release-stage="released"
+# endlabelprefix
+
+COPY --from=base /installroot /
+RUN mv /usr/bin/cluster-api-provider-metal3 /manager
+# Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies
+USER 65532
+ENTRYPOINT [ "/manager" ]

cluster-api-provider-metal3-image/_service

@@ -1,5 +1,12 @@
 <services>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service mode="buildtime" name="docker_label_helper"/>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%cluster-api-provider-metal3_version%%</param>
+    <param name="package">cluster-api-provider-metal3</param>
+    <param name="parse-version">patch</param>
+  </service>
   <service name="replace_using_env" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>

cluster-api-provider-metal3/_service

@@ -0,0 +1,23 @@
+<services>
+ <service name="obs_scm">
+    <param name="url">https://github.com/metal3-io/cluster-api-provider-metal3</param>
+    <param name="scm">git</param>
+    <param name="revision">v1.7.2</param>
+    <param name="version">_auto_</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="changesgenerate">enable</param>
+    <param name="changesauthor">steven.hardy@suse.com</param>
+    <param name="match-tag">v*</param>
+    <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
+    <param name="without-version">yes</param>
+    <param name="versionrewrite-replacement">\1</param>
+  </service>
+  <service mode="buildtime" name="tar" />
+  <service mode="buildtime" name="recompress">
+    <param name="file">*.tar</param>
+    <param name="compression">gz</param>
+  </service>
+   <service name="go_modules">
+  </service>
+  <service mode="buildtime" name="set_version" />
+</services>

cluster-api-provider-metal3/cluster-api-provider-metal3.spec

@@ -0,0 +1,54 @@
+#
+# spec file for package cluster-api-provider-metal3
+#
+# Copyright (c) 2023 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+Name:           cluster-api-provider-metal3
+Version:        1.7.2
+Release:        0
+Summary:        Cluster API Infrastructure Provider for Metal3
+License:        Apache-2.0
+URL:            https://github.com/metal3-io/cluster-api-provider-metal3
+Source:         cluster-api-provider-metal3-%{version}.tar.gz
+Source1:        vendor.tar.gz
+BuildRequires:  golang(API) = 1.22
+ExcludeArch:    s390
+ExcludeArch:    %{ix86}
+
+%description
+
+Cluster API Provider Metal3 is one of the providers for Cluster API and enables
+users to deploy a Cluster API based cluster on top of bare metal infrastructure
+using Metal3.
+
+%prep
+%autosetup -a1 -n cluster-api-provider-metal3-%{version}
+
+%build
+go build \
+   -mod=vendor \
+   -buildmode=pie \
+   -a -ldflags '-extldflags "-static"'
+
+%install
+install -D -m0755 cluster-api-provider-metal3 %{buildroot}%{_bindir}/cluster-api-provider-metal3
+
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/cluster-api-provider-metal3
+
+%changelog

edge-image-builder-image/_service

@@ -7,14 +7,10 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
     <param name="file">artifacts.yaml</param>
-    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
-    <param name="var">IMG_PREFIX</param>
     <param name="eval">CHART_REPO=$(rpm --macros=/root/.rpmmacros -E %chart_repo)</param>
     <param name="var">CHART_REPO</param>
     <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
     <param name="var">SUPPORT_LEVEL</param>
-    <param name="eval">CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
-    <param name="var">CHART_MAJOR</param>
   </service>
 </services>
 

edge-image-builder-image/artifacts.yaml

@@ -1,11 +1,11 @@
 metallb:
   chart: metallb-chart
-  repository: "%%CHART_REPO%%/%%IMG_PREFIX%%"
+  repository: %%CHART_REPO%%/3.1
-  version: "%%CHART_MAJOR%%.0.0+up0.14.9"
+  version: 0.14.9
 endpoint-copier-operator:
   chart: endpoint-copier-operator-chart
-  repository: "%%CHART_REPO%%/%%IMG_PREFIX%%"
+  repository: %%CHART_REPO%%/3.1
-  version: "%%CHART_MAJOR%%.0.0+up0.2.1"
+  version: 0.2.1
 kubernetes:
   k3s:
     selinuxPackage: k3s-selinux-1.6-1.slemicro.noarch
@@ -13,3 +13,4 @@ kubernetes:
   rke2:
     selinuxPackage: rke2-selinux
     selinuxRepository: https://rpm.rancher.io/rke2/stable/common/slemicro/noarch
+

ip-address-manager-image/Dockerfile

@@ -1,25 +1,26 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%frr-k8s:v%%frr-k8s_version%%
+#!BuildTag: %%IMG_PREFIX%%ip-address-manager:v%%ip-address-manager_version%%
-#!BuildTag: %%IMG_PREFIX%%frr-k8s:v%%frr-k8s_version%%-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%ip-address-manager:%%ip-address-manager_version%%
+#!BuildTag: %%IMG_PREFIX%%ip-address-manager:%%ip-address-manager_version%%-%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 frr-k8s; zypper -n clean; rm -rf /var/log/*
+RUN zypper --installroot /installroot --non-interactive install --no-recommends ip-address-manager shadow; zypper -n clean; rm -rf /var/log/*
 
 FROM micro AS final
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=com.suse.application.endpoint-copier-operator
+# labelprefix=com.suse.application.ip-address-manager
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
-LABEL org.opencontainers.image.title="SLE frr-k8s Container Image"
+LABEL org.opencontainers.image.title="SLE ip-address-manager Container Image"
-LABEL org.opencontainers.image.description="frr-k8s based on the SLE Base Container Image."
+LABEL org.opencontainers.image.description="ip-address-manager based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="%%frr-k8s_version%%"
+LABEL org.opencontainers.image.version="%%ip-address-manager_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%%frr-k8s:v%%frr-k8s_version%%-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ip-address-manager:%%ip-address-manager_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
@@ -28,6 +29,8 @@ LABEL com.suse.image-type="application"
 LABEL com.suse.release-stage="released"
 # endlabelprefix
 
-#Install frr-k8s
 COPY --from=base /installroot /
-ENTRYPOINT ["/frr-k8s"]
+RUN mv /usr/bin/ip-address-manager /manager
+# Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies
+USER 65532
+ENTRYPOINT [ "/manager" ]

ip-address-manager-image/_service

@@ -3,8 +3,8 @@
   <service mode="buildtime" name="docker_label_helper"/>
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
-    <param name="regex">%%frr-k8s_version%%</param>
+    <param name="regex">%%ip-address-manager_version%%</param>
-    <param name="package">frr-k8s</param>
+    <param name="package">ip-address-manager</param>
     <param name="parse-version">patch</param>
   </service>
   <service name="replace_using_env" mode="buildtime">

ip-address-manager/_service

@@ -0,0 +1,23 @@
+<services>
+ <service name="obs_scm">
+    <param name="url">https://github.com/metal3-io/ip-address-manager</param>
+    <param name="scm">git</param>
+    <param name="revision">v1.7.2</param>
+    <param name="version">_auto_</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="changesgenerate">enable</param>
+    <param name="changesauthor">steven.hardy@suse.com</param>
+    <param name="match-tag">v*</param>
+    <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
+    <param name="without-version">yes</param>
+    <param name="versionrewrite-replacement">\1</param>
+  </service>
+  <service mode="buildtime" name="tar" />
+  <service mode="buildtime" name="recompress">
+    <param name="file">*.tar</param>
+    <param name="compression">gz</param>
+  </service>
+   <service name="go_modules">
+  </service>
+  <service mode="buildtime" name="set_version" />
+</services>

ip-address-manager/ip-address-manager.spec

@@ -0,0 +1,51 @@
+#
+# spec file for package ip-address-manager
+#
+# Copyright (c) 2023 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+Name:           ip-address-manager
+Version:        1.7.2
+Release:        0
+Summary:        Metal3 IPAM controller
+License:        Apache-2.0
+URL:            https://github.com/metal3-io/ip-address-manager
+Source:         ip-address-manager-%{version}.tar.gz
+Source1:        vendor.tar.gz
+BuildRequires:  golang(API) = 1.22
+ExcludeArch:    s390
+ExcludeArch:    %{ix86}
+
+%description
+
+Metal3 IPAM controller
+
+%prep
+%autosetup -a1 -n ip-address-manager-%{version}
+
+%build
+go build \
+   -mod=vendor \
+   -buildmode=pie \
+
+%install
+install -D -m0755 ip-address-manager %{buildroot}%{_bindir}/ip-address-manager
+
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/ip-address-manager
+
+%changelog

ironic-image/Dockerfile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.2
+#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.0
-#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.2-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.0-%RELEASE%
 #!BuildVersion: 15.6
 
 ARG SLE_VERSION
@@ -8,14 +8,7 @@ FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
 
 FROM registry.suse.com/bci/bci-base:$SLE_VERSION AS base
 
-#!ArchExclusiveLine: x86_64
+RUN set -euo pipefail; zypper -n  in --no-recommends gcc git make xz-devel shim dosfstools mtools glibc-extra grub2-x86_64-efi grub2; zypper -n clean; rm -rf /var/log/*
-RUN if [ "$(uname -m)" = "x86_64" ];then \
-      zypper -n  in --no-recommends gcc git make xz-devel shim dosfstools mtools glibc-extra grub2-x86_64-efi grub2; zypper -n clean; rm -rf /var/log/*; \
-    fi
-#!ArchExclusiveLine: aarch64
-RUN if [ "$(uname -m)" = "aarch64" ];then \
-      zypper -n rm kubic-locale-archive-2.31-10.36.noarch openssl-1_1-1.1.1l-150500.17.37.1.aarch64; zypper -n in --no-recommends gcc git make xz-devel openssl-3 mokutil shim dosfstools mtools glibc glibc-extra grub2 grub2-arm64-efi; zypper -n clean; rm -rf /var/log/* ;\
-    fi
 WORKDIR /tmp
 COPY prepare-efi.sh /bin/
 RUN set -euo pipefail; chmod +x /bin/prepare-efi.sh
@@ -23,16 +16,8 @@ RUN /bin/prepare-efi.sh
 
 COPY --from=micro / /installroot/
 RUN sed -i -e 's%^# rpm.install.excludedocs = no.*%rpm.install.excludedocs = yes%g' /etc/zypp/zypp.conf
+RUN zypper --installroot /installroot --non-interactive install --no-recommends python311-devel python311 python311-pip python-dracclient python311-sushy-oem-idrac python311-proliantutils python311-sushy python3-ironicclient git curl sles-release tar gzip vim gawk dnsmasq dosfstools apache2 inotify-tools ipcalc ipmitool iproute2 procps qemu-tools sqlite3 util-linux xorriso tftp syslinux ipxe-bootimgs crudini openstack-ironic
 
-#!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 python3-ironicclient git curl sles-release tar gzip vim gawk dnsmasq dosfstools apache2 apache2-mod_wsgi inotify-tools ipcalc ipmitool iproute2 procps qemu-tools sqlite3 util-linux xorriso tftp ipxe-bootimgs python311-sushy-tools crudini openstack-ironic openstack-ironic-inspector-api; \
-    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 python3-ironicclient git curl sles-release tar gzip vim gawk dnsmasq dosfstools apache2 apache2-mod_wsgi inotify-tools ipcalc ipmitool iproute2 procps qemu-tools sqlite3 util-linux xorriso tftp ipxe-bootimgs python311-sushy-tools crudini openstack-ironic openstack-ironic-inspector-api; \
-    fi
-    
 # DATABASE
 RUN mkdir -p /installroot/var/lib/ironic && \
   /installroot/usr/bin/sqlite3 /installroot/var/lib/ironic/ironic.sqlite "pragma journal_mode=wal" && \
@@ -46,8 +31,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.2"
+LABEL org.opencontainers.image.version="26.1.2.0"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.2-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.0-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
@@ -79,15 +64,7 @@ RUN mkdir -p $GRUB_DIR
 
 # IRONIC #
 RUN cp /usr/share/ipxe/undionly.kpxe /tftpboot/undionly.kpxe
-#!ArchExclusiveLine: x86_64
+RUN cp /usr/share/ipxe/ipxe-x86_64.efi /tftpboot/ipxe.efi
-RUN if [ "$(uname -m)" = "x86_64" ];then \
-      cp /usr/share/ipxe/ipxe-x86_64.efi /tftpboot/ipxe.efi ;\
-    fi
-#!ArchExclusiveLine: x86_64
-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 ;\
-    fi
-    
 COPY --from=base /tmp/esp.img /tmp/uefi_esp.img
 
 COPY ironic.conf.j2 /etc/ironic/

ironic-image/prepare-efi.sh

@@ -6,37 +6,22 @@ ARCH=$(uname -m)
 DEST=${2:-/tmp/esp.img}
 OS=${1:-sles}
 
-if [ $ARCH = "aarch64" ]; then
+BOOTEFI=BOOTX64.efi
-  BOOTEFI=BOOTAA64.EFI
+GRUBEFI=grubx64.efi
-  GRUBEFI=grubaa64.efi
-else
-  BOOTEFI=BOOTX64.efi
-  GRUBEFI=grubx64.efi
-fi
 
 dd bs=1024 count=6400 if=/dev/zero of=$DEST
 mkfs.msdos -F 12 -n 'ESP_IMAGE' $DEST
 
 mkdir -p /boot/efi/EFI/BOOT
+cp -L /usr/lib64/efi/shim.efi /boot/efi/EFI/BOOT/$BOOTEFI
 mkdir -p /boot/efi/EFI/$OS
-if [ $ARCH = "aarch64" ]; then
+#cp /usr/share/grub2/x86_64-efi/grub.efi /boot/efi/EFI/$OS/$GRUBEFI
-  cp -L /usr/share/efi/aarch64/shim.efi /boot/efi/EFI/BOOT/$BOOTEFI
+cp /usr/share/grub2/x86_64-efi/grub.efi /boot/efi/EFI/$OS/grub.efi
-  cp -L /usr/share/efi/aarch64/grub.efi /boot/efi/EFI/BOOT/grub.efi
-  cp /usr/share/grub2/arm64-efi/grub.efi /boot/efi/EFI/$OS/grubaa64.efi
-else
-  cp -L /usr/lib64/efi/shim.efi /boot/efi/EFI/BOOT/$BOOTEFI
-  #cp /usr/share/grub2/x86_64-efi/grub.efi /boot/efi/EFI/$OS/$GRUBEFI
-  cp /usr/share/grub2/x86_64-efi/grub.efi /boot/efi/EFI/$OS/grub.efi
-fi
 
 mmd -i $DEST EFI
 mmd -i $DEST EFI/BOOT
 mcopy -i $DEST -v /boot/efi/EFI/BOOT/$BOOTEFI ::EFI/BOOT
-if [ $ARCH = "aarch64" ]; then
+#mcopy -i $DEST -v /boot/efi/EFI/$OS/$GRUBEFI ::EFI/BOOT
-  mcopy -i $DEST -v /boot/efi/EFI/BOOT/grub.efi ::EFI/BOOT
+mcopy -i $DEST -v /boot/efi/EFI/$OS/grub.efi ::EFI/BOOT
-  mcopy -i $DEST -v /boot/efi/EFI/$OS/$GRUBEFI ::EFI/BOOT
-else
-  mcopy -i $DEST -v /boot/efi/EFI/$OS/grub.efi ::EFI/BOOT
-fi 
 mdir -i $DEST ::EFI/BOOT;
 

ironic-image/runlogwatch.sh

@@ -3,14 +3,6 @@
 # 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 **************"

ironic-ipa-downloader-image/Dockerfile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.1
+#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.0
-#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.0-%RELEASE%
 #!BuildVersion: 15.6
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
@@ -8,14 +8,7 @@ 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 sed -i -e 's%^# rpm.install.excludedocs = no.*%rpm.install.excludedocs = yes%g' /etc/zypp/zypp.conf
-#!ArchExclusiveLine: x86_64
+RUN zypper --installroot /installroot --non-interactive install --no-recommends ironic-ipa-ramdisk-x86_64 python311-devel python311 python311-pip tar gawk git curl xz fakeroot shadow sed cpio; zypper -n clean; rm -rf /var/log/*
-RUN if [ "$(uname -m)" = "x86_64" ];then \
-  zypper --installroot /installroot --non-interactive install --no-recommends ironic-ipa-ramdisk-x86_64 python311-devel python311 python311-pip tar gawk git curl xz fakeroot shadow sed cpio; zypper -n clean; rm -rf /var/log/*; \
-  fi
-#!ArchExclusiveLine: aarch64
-RUN if [ "$(uname -m)" = "aarch64" ];then \
-  zypper --installroot /installroot --non-interactive install --no-recommends ironic-ipa-ramdisk-aarch64 python311-devel python311 python311-pip tar gawk git curl xz fakeroot shadow sed cpio; zypper -n clean; rm -rf /var/log/*; \
-  fi
 #RUN zypper --installroot /installroot --non-interactive install --no-recommends sles-release;
 RUN cp /usr/bin/getopt /installroot/
 
@@ -26,11 +19,11 @@ FROM micro AS final
 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.description="ironic-ipa-downloader based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="3.0.1"
+LABEL org.opencontainers.image.version="3.0.0"
 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.1-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.0-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

ironic-ipa-downloader-image/_service

@@ -1,6 +1,12 @@
 <services>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service mode="buildtime" name="docker_label_helper"/>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%ironic-ipa-ramdisk-x86_64_version%%</param>
+    <param name="package">ironic-ipa-ramdisk-x86_64</param>
+    <param name="parse-version">patch</param>
+  </service>
   <service name="replace_using_env" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>

ironic-ipa-downloader-image/get-resource.sh

@@ -8,10 +8,10 @@ export no_proxy=${no_proxy:-$NO_PROXY}
 
 # Which image should we use
 if [ -z "${IPA_BASEURI}" ]; then
-  # SLES BASED IPA - ironic-ipa-ramdisk-x86_64 package
+  # SLES BASED IPA - openstack-ironic-image-x86_64 package
   mkdir -p /shared/html/images
   cp /tmp/initrd.xz /shared/html/images/ironic-python-agent.initramfs
-  cp /tmp/openstack-ironic-image*.kernel /shared/html/images/ironic-python-agent.kernel
+  cp /tmp/openstack-ironic-image*.x86_64*.kernel /shared/html/images/ironic-python-agent.kernel
 else
   FILENAME=ironic-python-agent
   FILENAME_EXT=.tar
@@ -68,4 +68,4 @@ if [ -d "/tmp/ironic-certificates" ]; then
   mkdir -p etc/ironic-python-agent.d/ca-certs
   cp /tmp/ironic-certificates/* etc/ironic-python-agent.d/ca-certs/
   find . | fakeroot -i ../initrd.fakeroot cpio -o -H newc | xz --check=crc32 --x86 --lzma2 --fast > /shared/html/images/ironic-python-agent.initramfs
-fi
+fi

ironic-ipa-ramdisk/ironic-ipa-ramdisk.kiwi

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="7.4" name="openstack-ironic-image-301">
+<image schemaversion="7.4" name="openstack-ironic-image-201">
     <description type="system">
         <author>Cloud developers</author>
         <contact>cloud-devel@suse.de</contact>
@@ -116,9 +116,8 @@
         <package name="vim"/>
         <package name="grub2"/>
         <package name="grub2-x86_64-efi" arch="x86_64"/>
-        <package name="grub2-arm64-efi" arch="aarch64"/>
+        <package name="grub2-i386-pc"/>
-        <package name="grub2-i386-pc" arch="x86_64"/>
+        <package name="syslinux"/>
-        <package name="syslinux" arch="x86_64"/>
         <package name="lvm2"/>
         <package name="plymouth"/>
         <package name="fontconfig"/>
@@ -136,10 +135,12 @@
         <package name="openstack-ironic-python-agent"/>
         <package name="hdparm"/>
         <package name="qemu-tools"/>
-        <package name="python311-proliantutils"/>
+        <package name="python311-proliantutils" arch="x86_64"/>
         <package name="lshw"/>
-        <package name="dmidecode"/>
+        <package name="dmidecode" arch="aarch64"/>
-        <package name="efibootmgr"/>
+        <package name="dmidecode" arch="x86_64"/>
+        <package name="efibootmgr" arch="aarch64" />
+        <package name="efibootmgr" arch="x86_64" />
         <package name="gptfdisk"/>
         <package name="open-iscsi"/>
         <package name="hwinfo"/>
@@ -156,6 +157,7 @@
     </packages>
 
     <packages type="kis">
+        <package name="gfxboot-branding-SLE"/>
         <package name="dracut-kiwi-oem-repart"/>
         <package name="dracut-kiwi-oem-dump"/>
     </packages> 

ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec

@@ -19,7 +19,7 @@
 
 
 Name:           ironic-ipa-ramdisk
-Version:        3.0.1
+Version:        3.0.0
 Release:        0
 Summary:        Kernel and ramdisk image for OpenStack Ironic
 License:        SUSE-EULA
@@ -49,12 +49,7 @@ BuildRequires:  fontconfig
 BuildRequires:  fonts-config
 BuildRequires:  gptfdisk
 BuildRequires:  grub2
-%ifarch x86_64
 BuildRequires:  grub2-x86_64-efi
-%endif
-%ifarch aarch64
-BuildRequires:  grub2-arm64-efi
-%endif
 BuildRequires:  haveged
 BuildRequires:  hdparm
 BuildRequires:  hwinfo
@@ -98,14 +93,19 @@ BuildRequires:  plymouth-dracut
 BuildRequires:  plymouth-theme-bgrt
 BuildRequires:  dracut-kiwi-oem-dump
 BuildRequires:  dracut-kiwi-oem-repart
+BuildRequires:  gfxboot-branding-SLE
 BuildRequires:  grub2-branding-SLE
 BuildRequires:  open-iscsi
 BuildRequires:  plymouth-branding-SLE
 BuildRequires:  lshw
 BuildRequires:  kbd
+%ifarch aarch64
 BuildRequires:  dmidecode
 BuildRequires:  efibootmgr
+%endif
 %ifarch x86_64
+BuildRequires:  dmidecode
+BuildRequires:  efibootmgr
 BuildRequires:  syslinux
 %endif
 

kiwi-builder-image/Dockerfile

@@ -1,6 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.0
+#!BuildTag: kiwi-builder:10.1
-#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.0-%RELEASE%
+FROM registry.suse.com/bci/kiwi:10.1.10
-FROM registry.suse.com/bci/kiwi:10.1.16
 MAINTAINER SUSE LLC (https://www.suse.com/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
@@ -12,7 +11,7 @@ LABEL org.opencontainers.image.version="%PACKAGE_VERSION%"
 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%%kiwi-builder:10.1.16.0"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:10.1"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
@@ -21,6 +20,10 @@ LABEL com.suse.image-type="application"
 LABEL com.suse.release-stage="released"
 # endlabelprefix
 
+# Install required packages for Kiwi to function as expected
+# Should be provided via https://github.com/SUSE/BCI-dockerfile-generator/pull/1770
+# RUN zypper in -y gawk && zypper clean -a
+
 # Configure Kiwi to use kpartx
 RUN echo -e "mapper:\n  - part_mapper: kpartx" > /etc/kiwi.yml
 

kiwi-builder-image/README

@@ -8,40 +8,32 @@ Please ensure that you're running this on a registered SLE Micro 6.0 system, and
 
 Next, download the podman image:
 
-# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0
+# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10
 
 Make a local output directory (where the images will reside):
 
 # mkdir output
 
-Then, to build a standard "Base" image, run the following in podman:
-
-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image
-
-To build a "Base" SelfInstall ISO, you can add additional flags, for example:
-
-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Base-SelfInstall
-
 Then, to build a standard "Default" image, run the following in podman:
 
-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Default
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image
 
-To build a "Default" SelfInstall ISO, you can add additional flags, for example:
+To build a SelfInstall ISO, you can add additional flags, for example:
 
-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Default-SelfInstall
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image -p Default-SelfInstall
 
 To build an image with a RealTime kernel, e.g. a RAW disk image ("Default"), use the following:
 
-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Base-RT
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image -p Base-RT
 
 To build an image that supports a large block/sectorsize (4096), use the "-b" flag, for example:
 
-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Default-SelfInstall -b
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image -p Default-SelfInstall -b
 
 # mkdir mydefs/
 # cp /path/to/SL-Micro.kiwi mydefs/
 # cp /path/to/config.sh mydefs/
-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -v ./mydefs/:/micro-sdk/defs/ -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -v ./mydefs/:/micro-sdk/defs/ -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image
 
 All output will be in the local $(pwd)/output directory, for example:
 

kiwi-builder-image/build-image.sh

@@ -21,45 +21,43 @@
 #
 
 # Set image build defaults, blocksize is an empty string
-PROFILE="Base"
+PROFILE="Default"
 LARGEBLOCK=false
 
 # Print usage
 usage(){
-  cat <<-EOF
+	cat <<-EOF
-  ==============================
+	==============================
-  SLE Micro 6.0 Kiwi SDK Builder
+	SLE Micro 6.0 Kiwi SDK Builder
-  ==============================
+	==============================
 
-  Usage: ${0} [-p <profile>] [-b]
+	Usage: ${0} [-p <profile>] [-b]
 
-  Profile Options (-p):
+	Profile Options (-p):
-  * Base: RAW Disk Image with podman
+	* Default: RAW Disk Image with kernel-default
-  * Base-SelfInstall: SelfInstall ISO with podman
+	* Default-SelfInstall: SelfInstall ISO with kernel-default
-  * Default: RAW Disk Image with podman and kvm
+	* Base-RT: RAW Disk Image with kernel-rt
-  * Default-SelfInstall: SelfInstall ISO with podman and kvm
+	* Base-RT-SelfInstall: SelfInstall ISO with kernel-rt
-  * Base-RT: RAW Disk Image with kernel-rt
-  * Base-RT-SelfInstall: SelfInstall ISO with kernel-rt
 
-  4096 Blocksize (-b): If specified, use a 4096 blocksize (rather than 512) when generating the image.
+	4096 Blocksize (-b): If specified, use a 4096 blocksize (rather than 512) when generating the image.
 
-  NOTE: If both options are omitted, the "Base" profile with a standard "512" blocksize is used.
+	NOTE: If both options are omitted, the "Default" profile with a standard "512" blocksize is used.
-EOF
+	EOF
 }
 
 # Grab CLI options and handle
 while getopts 'p:bh' OPTION; do
-  case "${OPTION}" in
+	case "${OPTION}" in
-    p)
+		p)
-      PROFILE="${OPTARG}"
+			PROFILE="${OPTARG}"
-      ;;
+			;;
-    b)
+		b)
-      LARGEBLOCK=true
+			LARGEBLOCK=true
-      ;;
+			;;
-    ?)
+		?)
-      usage && exit 2
+			usage && exit 2
-      ;;
+			;;
-  esac
+	esac
 done
 
 # To avoid wasting time, perform the loop creation test first, and exit with a warning to re-run.
@@ -90,4 +88,4 @@ if [ $RESULT -eq 0 ]; then
   echo -e "\n\nINFO: Image build successful, generated images are available in the 'output' directory."
 else
   echo -e "\n\nERROR: Failed to build the image, please see above logs."
-fi
+fi

kubectl-image/Dockerfile

@@ -1,34 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%kubectl:1.30.3
-#!BuildTag: %%IMG_PREFIX%%kubectl:1.30.3-%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 kubectl; zypper -n clean; rm -rf /var/log/*
-
-FROM micro AS final
-
-# Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=com.suse.application.kubectl
-LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
-LABEL org.opencontainers.image.title="SLE kubectl image"
-LABEL org.opencontainers.image.description="kubectl on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="1.30.3"
-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%%kubectl:1.30.3-%RELEASE%"
-LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
-LABEL com.suse.eula="SUSE Combined EULA February 2024"
-LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
-LABEL com.suse.image-type="application"
-LABEL com.suse.release-stage="released"
-# endlabelprefix
-
-COPY --from=base /installroot /
-
-ENTRYPOINT ["/usr/bin/kubectl"]

kubectl/kubectl.spec

@@ -1,6 +1,6 @@
 %global debug_package %{nil}
 
-Name: kubectl
+Name: kubectl-1303
 Version: 1.30.3
 Release: 0
 Summary: Command-line utility for interacting with a Kubernetes cluster

kubevirt-chart/Chart.yaml

@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%kubevirt-chart:%%CHART_MAJOR%%.0.0_up0.4.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:%%CHART_MAJOR%%.0.0_up0.4.0-%RELEASE%
-#!BuildTag: %%IMG_PREFIX%%kubevirt-chart:%%CHART_MAJOR%%.0.0_up0.4.0
+#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:%%CHART_MAJOR%%.0.0_up0.4.0
 apiVersion: v2
 appVersion: 1.3.1
 description: A Helm chart for KubeVirt

kubevirt-dashboard-extension-chart/Chart.yaml

@@ -1,6 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0
+#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.0
-#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.1
+#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.0-%RELEASE%
-#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.1-%RELEASE%
 annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: KubeVirt
@@ -11,11 +10,11 @@ annotations:
   catalog.cattle.io/rancher-version: '>= 2.10.0-0'
   catalog.cattle.io/scope: management
   catalog.cattle.io/ui-component: plugins
-  catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
+  catalog.cattle.io/ui-extensions-version: '>= 3.0.0'
 apiVersion: v2
-appVersion: 1.2.1
+appVersion: 1.2.0
 description: 'SUSE Edge: KubeVirt extension for Rancher Dashboard'
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/kubevirt/icon/color/kubevirt-icon-color.svg
 name: kubevirt-dashboard-extension
 type: application
-version: "%%CHART_MAJOR%%.0.0+up1.2.1"
+version: "%%CHART_MAJOR%%.0.0+up1.2.0"

kubevirt-dashboard-extension-chart/templates/cr.yaml

@@ -8,7 +8,7 @@ spec:
   plugin:
     name: {{ include "extension-server.fullname" . }}
     version: {{ (semver (default .Chart.AppVersion .Values.plugin.versionOverride)).Original }}
-    endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/kubevirt-dashboard-extension/1.2.1
+    endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/kubevirt-dashboard-extension/1.2.0
     noCache: {{ .Values.plugin.noCache }}
     noAuth: {{ .Values.plugin.noAuth }}
     metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}

kubevirt-dashboard-extension-chart/values.yaml

@@ -8,5 +8,5 @@ plugin:
   metadata:
     catalog.cattle.io/display-name: KubeVirt
     catalog.cattle.io/rancher-version: ">= 2.10.0-0"
-    catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
+    catalog.cattle.io/ui-extensions-version: ">= 3.0.0"
     catalog.cattle.io/kube-version: ">= v1.26.0-0"

metal3-chart/Chart.yaml

@@ -1,16 +1,16 @@
-#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.2
+#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.0
-#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.2-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.0-%RELEASE%
 apiVersion: v2
-appVersion: 0.9.2
+appVersion: 0.9.0
 dependencies:
 - alias: metal3-baremetal-operator
   name: baremetal-operator
   repository: file://./charts/baremetal-operator
-  version: 0.6.1
+  version: 0.6.0
 - alias: metal3-ironic
   name: ironic
   repository: file://./charts/ironic
-  version: 0.9.1
+  version: 0.8.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.1
+  version: 0.6.0
 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.2"
+version: "%%CHART_MAJOR%%.0.0+up0.9.0"

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.1
+version: 0.6.0

metal3-chart/charts/baremetal-operator/templates/tests/test-connection.yaml

@@ -0,0 +1,15 @@
+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

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.1
+version: 0.8.0

metal3-chart/charts/ironic/values.yaml

@@ -56,11 +56,11 @@ images:
   ironic:
     repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic
     pullPolicy: IfNotPresent
-    tag: 26.1.2.2
+    tag: 26.1.2.0
   ironicIPADownloader:
     repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic-ipa-downloader
     pullPolicy: IfNotPresent
-    tag: 3.0.1
+    tag: 3.0.0
 
 nameOverride: ""
 fullnameOverride: ""

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.0

metal3-chart/charts/media/templates/tests/test-connection.yaml

@@ -0,0 +1,15 @@
+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

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.0
 
 imagePullSecrets: []
 nameOverride: ""

rancher-turtles-airgap-resources-chart/Chart.yaml

@@ -1,10 +1,10 @@
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.14.1
+#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.13.0
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.14.1
+#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.13.0
 apiVersion: v2
-appVersion: 0.14.1
+appVersion: 0.13.0
 description: Rancher Turtles utility chart for airgap scenarios
 home: https://github.com/rancher/turtles/
 icon: https://raw.githubusercontent.com/rancher/turtles/main/logos/capi.svg
 name: rancher-turtles-airgap-resources
 type: application
-version: "%%CHART_MAJOR%%.0.0+up0.14.1"
+version: "%%CHART_MAJOR%%.0.0+up0.13.0"

rancher-turtles-airgap-resources-chart/templates/airgap-cm-metal3.yaml

@@ -35,6 +35,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: ipam-webhook-service
               namespace: capm3-system
@@ -207,6 +208,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: ipam-webhook-service
               namespace: capm3-system
@@ -367,6 +369,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: ipam-webhook-service
               namespace: capm3-system
@@ -533,6 +536,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: capm3-webhook-service
               namespace: capm3-system
@@ -695,91 +699,6 @@ data:
     ---
     apiVersion: apiextensions.k8s.io/v1
     kind: CustomResourceDefinition
-    metadata:
-      annotations:
-        cert-manager.io/inject-ca-from: capm3-system/capm3-serving-cert
-        controller-gen.kubebuilder.io/version: v0.13.0
-      labels:
-        cluster.x-k8s.io/provider: infrastructure-metal3
-        cluster.x-k8s.io/v1beta1: v1beta1
-      name: metal3clustertemplates.infrastructure.cluster.x-k8s.io
-    spec:
-      group: infrastructure.cluster.x-k8s.io
-      names:
-        categories:
-        - cluster-api
-        kind: Metal3ClusterTemplate
-        listKind: Metal3ClusterTemplateList
-        plural: metal3clustertemplates
-        shortNames:
-        - m3ct
-        singular: metal3clustertemplate
-      scope: Namespaced
-      versions:
-      - name: v1beta1
-        schema:
-          openAPIV3Schema:
-            description: Metal3ClusterTemplate is the Schema for the metal3clustertemplates
-              API.
-            properties:
-              apiVersion:
-                description: 'APIVersion defines the versioned schema of this representation
-                  of an object. Servers should convert recognized schemas to the latest
-                  internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-                type: string
-              kind:
-                description: 'Kind is a string value representing the REST resource this
-                  object represents. Servers may infer this from the endpoint the client
-                  submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                type: string
-              metadata:
-                type: object
-              spec:
-                description: Metal3ClusterTemplateSpec defines the desired state of Metal3ClusterTemplate.
-                properties:
-                  template:
-                    description: Metal3ClusterTemplateResource describes the data for
-                      creating a Metal3Cluster from a template.
-                    properties:
-                      spec:
-                        description: Metal3ClusterSpec defines the desired state of Metal3Cluster.
-                        properties:
-                          controlPlaneEndpoint:
-                            description: ControlPlaneEndpoint represents the endpoint
-                              used to communicate with the control plane.
-                            properties:
-                              host:
-                                description: Host is the hostname on which the API server
-                                  is serving.
-                                type: string
-                              port:
-                                description: Port is the port on which the API server
-                                  is serving.
-                                type: integer
-                            required:
-                            - host
-                            - port
-                            type: object
-                          noCloudProvider:
-                            description: Determines if the cluster is not to be deployed
-                              with an external cloud provider. If set to true, CAPM3 will
-                              use node labels to set providerID on the kubernetes nodes.
-                              If set to false, providerID is set on nodes by other entities
-                              and CAPM3 uses the value of the providerID on the m3m resource.
-                            type: boolean
-                        type: object
-                    required:
-                    - spec
-                    type: object
-                required:
-                - template
-                type: object
-            type: object
-        served: true
-        storage: true
-    ---
-    apiVersion: apiextensions.k8s.io/v1
-    kind: CustomResourceDefinition
     metadata:
       annotations:
         cert-manager.io/inject-ca-from: capm3-system/capm3-serving-cert
@@ -793,6 +712,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: capm3-webhook-service
               namespace: capm3-system
@@ -948,6 +868,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: capm3-webhook-service
               namespace: capm3-system
@@ -1143,6 +1064,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: capm3-webhook-service
               namespace: capm3-system
@@ -2156,6 +2078,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: capm3-webhook-service
               namespace: capm3-system
@@ -2227,17 +2150,6 @@ data:
                     - metadata
                     - disabled
                     type: string
-                  customDeploy:
-                    description: A custom deploy procedure.
-                    properties:
-                      method:
-                        description: Custom deploy method name. This name is specific
-                          to the deploy ramdisk used. If you don't have a custom deploy
-                          ramdisk, you shouldn't use CustomDeploy.
-                        type: string
-                    required:
-                    - method
-                    type: object
                   dataTemplate:
                     description: MetadataTemplate is a reference to a Metal3DataTemplate
                       object containing a template of metadata to be rendered. Metadata
@@ -2390,6 +2302,8 @@ data:
                         type: string
                     type: object
                     x-kubernetes-map-type: atomic
+                required:
+                - image
                 type: object
               status:
                 description: Metal3MachineStatus defines the observed state of Metal3Machine.
@@ -2607,6 +2521,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: capm3-webhook-service
               namespace: capm3-system
@@ -2676,17 +2591,6 @@ data:
                             - metadata
                             - disabled
                             type: string
-                          customDeploy:
-                            description: A custom deploy procedure.
-                            properties:
-                              method:
-                                description: Custom deploy method name. This name is specific
-                                  to the deploy ramdisk used. If you don't have a custom
-                                  deploy ramdisk, you shouldn't use CustomDeploy.
-                                type: string
-                            required:
-                            - method
-                            type: object
                           dataTemplate:
                             description: MetadataTemplate is a reference to a Metal3DataTemplate
                               object containing a template of metadata to be rendered.
@@ -2841,6 +2745,8 @@ data:
                                 type: string
                             type: object
                             x-kubernetes-map-type: atomic
+                        required:
+                        - image
                         type: object
                     required:
                     - spec
@@ -2868,6 +2774,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: capm3-webhook-service
               namespace: capm3-system
@@ -2982,6 +2889,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: capm3-webhook-service
               namespace: capm3-system
@@ -3265,12 +3173,6 @@ data:
       - patch
       - update
       - watch
-    - apiGroups:
-      - ""
-      resources:
-      - pods
-      verbs:
-      - list
     - apiGroups:
       - infrastructure.cluster.x-k8s.io
       resources:
@@ -3489,13 +3391,6 @@ data:
       - get
       - patch
       - update
-    - apiGroups:
-      - storage.k8s.io
-      resources:
-      - volumeattachments
-      verbs:
-      - list
-      - watch
     ---
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRole
@@ -3739,7 +3634,7 @@ data:
           containers:
           - args:
             - --webhook-port=9443
-            - --enableBMHNameBasedPreallocation=${ENABLE_BMH_NAME_BASED_PREALLOCATION:=false}
+            - --enableBMHNameBasedPreallocation=${enableBMHNameBasedPreallocation:=false}
             - --diagnostics-address=${CAPM3_DIAGNOSTICS_ADDRESS:=:8443}
             - --insecure-diagnostics=${CAPM3_INSECURE_DIAGNOSTICS:=false}
             command:
@@ -3752,7 +3647,7 @@ data:
             envFrom:
             - configMapRef:
                 name: capm3-capm3fasttrack-configmap
-            image: registry.rancher.com/rancher/cluster-api-provider-metal3:v1.8.2
+            image: quay.io/metal3-io/cluster-api-provider-metal3:v1.7.2
             imagePullPolicy: IfNotPresent
             livenessProbe:
               httpGet:
@@ -3781,7 +3676,6 @@ data:
               privileged: false
               runAsGroup: 65532
               runAsUser: 65532
-            terminationMessagePolicy: FallbackToLogsOnError
             volumeMounts:
             - mountPath: /tmp/k8s-webhook-server/serving-certs
               name: cert
@@ -3837,7 +3731,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: quay.io/metal3-io/ip-address-manager:v1.8.1
+            image: quay.io/metal3-io/ip-address-manager:v1.7.2
             imagePullPolicy: IfNotPresent
             livenessProbe:
               httpGet:
@@ -3866,7 +3760,6 @@ data:
               privileged: false
               runAsGroup: 65532
               runAsUser: 65532
-            terminationMessagePolicy: FallbackToLogsOnError
             volumeMounts:
             - mountPath: /tmp/k8s-webhook-server/serving-certs
               name: cert
@@ -3971,28 +3864,6 @@ data:
         resources:
         - metal3clusters
       sideEffects: None
-    - admissionReviewVersions:
-      - v1
-      - v1beta1
-      clientConfig:
-        service:
-          name: capm3-webhook-service
-          namespace: capm3-system
-          path: /mutate-infrastructure-cluster-x-k8s-io-v1beta1-metal3clustertemplate
-      failurePolicy: Fail
-      matchPolicy: Equivalent
-      name: default.metal3clustertemplate.infrastructure.cluster.x-k8s.io
-      rules:
-      - apiGroups:
-        - infrastructure.cluster.x-k8s.io
-        apiVersions:
-        - v1beta1
-        operations:
-        - CREATE
-        - UPDATE
-        resources:
-        - metal3clustertemplates
-      sideEffects: None
     - admissionReviewVersions:
       - v1
       - v1beta1
@@ -4255,28 +4126,6 @@ data:
         resources:
         - metal3clusters
       sideEffects: None
-    - admissionReviewVersions:
-      - v1
-      - v1beta1
-      clientConfig:
-        service:
-          name: capm3-webhook-service
-          namespace: capm3-system
-          path: /validate-infrastructure-cluster-x-k8s-io-v1beta1-metal3clustertemplate
-      failurePolicy: Fail
-      matchPolicy: Equivalent
-      name: validation.metal3clustertemplate.infrastructure.cluster.x-k8s.io
-      rules:
-      - apiGroups:
-        - infrastructure.cluster.x-k8s.io
-        apiVersions:
-        - v1beta1
-        operations:
-        - CREATE
-        - UPDATE
-        resources:
-        - metal3clustertemplates
-      sideEffects: None
     - admissionReviewVersions:
       - v1
       - v1beta1
@@ -4511,9 +4360,6 @@ data:
     apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
     kind: Metadata
     releaseSeries:
-    - major: 1
-      minor: 8
-      contract: v1beta1
     - major: 1
       minor: 7
       contract: v1beta1
@@ -4538,7 +4384,7 @@ data:
 kind: ConfigMap
 metadata:
   creationTimestamp: null
-  name: v1.8.2
+  name: v1.7.2
   namespace: capm3-system
   labels:
     provider-components: metal3

rancher-turtles-airgap-resources-chart/templates/airgap-cm-rke2-bootstrap.yaml

@@ -32,6 +32,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: rke2-bootstrap-webhook-service
               namespace: rke2-bootstrap-system
@@ -1236,6 +1237,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: rke2-bootstrap-webhook-service
               namespace: rke2-bootstrap-system
@@ -2543,7 +2545,7 @@ data:
             - --insecure-diagnostics=${CAPRKE2_INSECURE_DIAGNOSTICS:=false}
             command:
             - /manager
-            image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.9.0
+            image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.8.0
             imagePullPolicy: IfNotPresent
             livenessProbe:
               httpGet:
@@ -2572,7 +2574,6 @@ data:
               privileged: false
               runAsGroup: 65532
               runAsUser: 65532
-            terminationMessagePolicy: FallbackToLogsOnError
             volumeMounts:
             - mountPath: /tmp/k8s-webhook-server/serving-certs
               name: cert
@@ -2754,13 +2755,10 @@ data:
       - major: 0
         minor: 8
         contract: v1beta1
-      - major: 0
-        minor: 9
-        contract: v1beta1
 kind: ConfigMap
 metadata:
   creationTimestamp: null
-  name: v0.9.0
+  name: v0.8.0
   namespace: rke2-bootstrap-system
   labels:
     provider-components: rke2-bootstrap

rancher-turtles-airgap-resources-chart/templates/airgap-cm-rke2-control-plane.yaml

@@ -32,6 +32,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: rke2-control-plane-webhook-service
               namespace: rke2-control-plane-system
@@ -2619,6 +2620,7 @@ data:
         strategy: Webhook
         webhook:
           clientConfig:
+            caBundle: Cg==
             service:
               name: rke2-control-plane-webhook-service
               namespace: rke2-control-plane-system
@@ -4293,7 +4295,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.uid
-            image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.9.0
+            image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.8.0
             imagePullPolicy: IfNotPresent
             livenessProbe:
               httpGet:
@@ -4329,7 +4331,6 @@ data:
               privileged: false
               runAsGroup: 65532
               runAsUser: 65532
-            terminationMessagePolicy: FallbackToLogsOnError
             volumeMounts:
             - mountPath: /tmp/k8s-webhook-server/serving-certs
               name: cert
@@ -4511,13 +4512,10 @@ data:
       - major: 0
         minor: 8
         contract: v1beta1
-      - major: 0
-        minor: 9
-        contract: v1beta1
 kind: ConfigMap
 metadata:
   creationTimestamp: null
-  name: v0.9.0
+  name: v0.8.0
   namespace: rke2-control-plane-system
   labels:
     provider-components: rke2-control-plane

rancher-turtles-chart/Chart.lock

@@ -3,4 +3,4 @@ dependencies:
   repository: https://kubernetes-sigs.github.io/cluster-api-operator
   version: 0.14.0
 digest: sha256:9e9e851dbab3212c279efec06bcf0da147228ea1590470f3a8cbbb5806a250d4
-generated: "2024-12-03T09:34:12.871417074Z"
+generated: "2024-10-28T11:44:34.392387979Z"

rancher-turtles-chart/Chart.yaml

@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.14.1
+#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.13.0
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.14.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.13.0-%RELEASE%
 annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: Rancher Turtles - the Cluster API Extension
@@ -7,12 +7,12 @@ annotations:
   catalog.cattle.io/namespace: rancher-turtles-system
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux
-  catalog.cattle.io/rancher-version: '>= 2.10.0-1'
+  catalog.cattle.io/rancher-version: '>= 2.9.0-1'
   catalog.cattle.io/release-name: rancher-turtles
   catalog.cattle.io/scope: management
   catalog.cattle.io/type: cluster-tool
 apiVersion: v2
-appVersion: 0.14.1
+appVersion: 0.13.0
 dependencies:
 - condition: cluster-api-operator.enabled
   name: cluster-api-operator
@@ -29,4 +29,4 @@ keywords:
 - provisioning
 name: rancher-turtles
 type: application
-version: "%%CHART_MAJOR%%.0.0+up0.14.1"
+version: "%%CHART_MAJOR%%.0.0+up0.13.0"

rancher-turtles-chart/templates/metal3-infrastructure.yaml

@@ -16,9 +16,6 @@ kind: ClusterctlConfig
 metadata:
   name: clusterctl-config
   namespace: rancher-turtles-system
-  annotations:
-    "helm.sh/hook": "post-install, post-upgrade"
-    "helm.sh/hook-weight": "1"
 spec:
   providers:
   - name: metal3

rancher-turtles-chart/templates/rancher-turtles-exp-etcdrestore-components.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
+    cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     turtles-capi.cattle.io: etcd-restore
@@ -45,65 +45,77 @@ spec:
             properties:
               clusterName:
                 type: string
+              configRef:
+                type: string
               location:
                 type: string
               machineName:
                 type: string
             required:
             - clusterName
+            - configRef
+            - location
+            - machineName
             type: object
             x-kubernetes-validations:
             - message: ETCD snapshot location can't be empty.
-              rule: size(self.clusterName)>0
+              rule: size(self.location)>0
           status:
             default: {}
             description: EtcdSnapshotRestoreStatus defines observed state of EtcdSnapshotRestore
             properties:
-              error:
+              conditions:
-                type: string
+                description: Conditions provide observations of the operational state
+                  of a Cluster API resource.
+                items:
+                  description: Condition defines an observation of a Cluster API resource
+                    operational state.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        Last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed. If that is not known, then using the time when
+                        the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        A human readable message indicating details about the transition.
+                        This field may be empty.
+                      type: string
+                    reason:
+                      description: |-
+                        The reason for the condition's last transition in CamelCase.
+                        The specific API may choose whether or not this field is considered a guaranteed API.
+                        This field may not be empty.
+                      type: string
+                    severity:
+                      description: |-
+                        Severity provides an explicit classification of Reason code, so the users or machines can immediately
+                        understand the current situation and act accordingly.
+                        The Severity field MUST be set only when Status=False.
+                      type: string
+                    status:
+                      description: Status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: |-
+                        Type of condition in CamelCase or in foo.example.com/CamelCase.
+                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
+                        can be useful (see .node.status.conditions), the ability to deconflict is important.
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              manual:
+                type: boolean
               phase:
                 description: ETCDSnapshotPhase is a string representation of the phase
                   of the etcd snapshot
                 type: string
-              s3Snapshots:
-                items:
-                  properties:
-                    creationTime:
-                      description: CreationTime is the timestamp when the snapshot
-                        was taken by etcd.
-                      format: date-time
-                      type: string
-                    location:
-                      type: string
-                    name:
-                      type: string
-                  required:
-                  - location
-                  - name
-                  type: object
-                type: array
-              snapshotFileName:
-                type: string
-              snapshots:
-                items:
-                  properties:
-                    creationTime:
-                      description: CreationTime is the timestamp when the snapshot
-                        was taken by etcd.
-                      format: date-time
-                      type: string
-                    location:
-                      type: string
-                    machineName:
-                      type: string
-                    name:
-                      type: string
-                  required:
-                  - location
-                  - machineName
-                  - name
-                  type: object
-                type: array
             type: object
         type: object
     served: true
@@ -115,7 +127,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
+    cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     turtles-capi.cattle.io: etcd-restore
@@ -234,7 +246,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
+    cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     turtles-capi.cattle.io: etcd-restore
@@ -294,6 +306,8 @@ spec:
                     type: string
                   insecure:
                     type: boolean
+                  location:
+                    type: string
                   region:
                     type: string
                   s3CredentialSecret:
@@ -323,7 +337,7 @@ metadata:
     app.kubernetes.io/part-of: rancher-turtles
     turtles-capi.cattle.io: etcd-restore
   name: rancher-turtles-etcdsnapshotrestore-manager
-  namespace: {{ index .Values "rancherTurtles" "namespace" }}
+  namespace: rancher-turtles-system
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -337,7 +351,7 @@ metadata:
     app.kubernetes.io/part-of: rancher-turtles
     turtles-capi.cattle.io: etcd-restore
   name: rancher-turtles-etcdsnapshotrestore-leader-election-role
-  namespace: {{ index .Values "rancherTurtles" "namespace" }}
+  namespace: rancher-turtles-system
 rules:
 - apiGroups:
   - ""
@@ -586,7 +600,7 @@ metadata:
     app.kubernetes.io/part-of: rancher-turtles
     turtles-capi.cattle.io: etcd-restore
   name: rancher-turtles-etcdsnapshotrestore-leader-election-rolebinding
-  namespace: {{ index .Values "rancherTurtles" "namespace" }}
+  namespace: rancher-turtles-system
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -594,7 +608,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: rancher-turtles-etcdsnapshotrestore-manager
-  namespace: {{ index .Values "rancherTurtles" "namespace" }}
+  namespace: rancher-turtles-system
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -615,7 +629,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: rancher-turtles-etcdsnapshotrestore-manager
-  namespace: {{ index .Values "rancherTurtles" "namespace" }}
+  namespace: rancher-turtles-system
 ---
 apiVersion: v1
 kind: Service
@@ -623,7 +637,7 @@ metadata:
   labels:
     turtles-capi.cattle.io: etcd-restore
   name: rancher-turtles-etcdsnapshotrestore-webhook-service
-  namespace: {{ index .Values "rancherTurtles" "namespace" }}
+  namespace: rancher-turtles-system
 spec:
   ports:
   - port: 443
@@ -638,7 +652,7 @@ metadata:
     control-plane: controller-manager
     turtles-capi.cattle.io: etcd-restore
   name: rancher-turtles-etcdsnapshotrestore-controller-manager
-  namespace: {{ index .Values "rancherTurtles" "namespace" }}
+  namespace: rancher-turtles-system
 spec:
   replicas: 1
   selector:
@@ -657,7 +671,7 @@ spec:
       - args:
         - --leader-elect
         command:
-        - ./etcd-snapshot-restore
+        - /manager
         env:
         - name: POD_NAMESPACE
           valueFrom:
@@ -671,13 +685,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.uid
-        {{- $imageVersion := index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "imageVersion" -}}
+        image: ghcr.io/rancher/turtles-etcd-snapshot-restore:dev
-        {{- if contains "sha256:" $imageVersion }}
+        imagePullPolicy: IfNotPresent
-        image: {{ index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "image" }}@{{ index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "imageVersion" }}
-        {{- else }}
-        image: {{ index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "image" }}:{{ index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "imageVersion" }}
-        {{- end }}
-        imagePullPolicy: '{{ index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "imagePullPolicy" }}'
         livenessProbe:
           httpGet:
             path: /healthz
@@ -724,11 +733,11 @@ metadata:
   labels:
     turtles-capi.cattle.io: etcd-restore
   name: rancher-turtles-etcdsnapshotrestore-serving-cert
-  namespace: {{ index .Values "rancherTurtles" "namespace" }}
+  namespace: rancher-turtles-system
 spec:
   dnsNames:
-  - rancher-turtles-etcdsnapshotrestore-webhook-service.{{ index .Values "rancherTurtles" "namespace" }}.svc
+  - rancher-turtles-etcdsnapshotrestore-webhook-service.rancher-turtles-system.svc
-  - rancher-turtles-etcdsnapshotrestore-webhook-service.{{ index .Values "rancherTurtles" "namespace" }}.svc.cluster.local
+  - rancher-turtles-etcdsnapshotrestore-webhook-service.rancher-turtles-system.svc.cluster.local
   issuerRef:
     kind: Issuer
     name: rancher-turtles-etcdsnapshotrestore-selfsigned-issuer
@@ -740,7 +749,7 @@ metadata:
   labels:
     turtles-capi.cattle.io: etcd-restore
   name: rancher-turtles-etcdsnapshotrestore-selfsigned-issuer
-  namespace: {{ index .Values "rancherTurtles" "namespace" }}
+  namespace: rancher-turtles-system
 spec:
   selfSigned: {}
 ---
@@ -748,7 +757,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
+    cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert
   labels:
     turtles-capi.cattle.io: etcd-restore
   name: rancher-turtles-etcdsnapshotrestore-mutating-webhook-configuration
@@ -758,7 +767,7 @@ webhooks:
   clientConfig:
     service:
       name: rancher-turtles-etcdsnapshotrestore-webhook-service
-      namespace: {{ index .Values "rancherTurtles" "namespace" }}
+      namespace: rancher-turtles-system
       path: /mutate-bootstrap-cluster-x-k8s-io-v1beta1-rke2config
   failurePolicy: Fail
   name: systemagentrke2config.kb.io
@@ -778,7 +787,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
+    cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert
   labels:
     turtles-capi.cattle.io: etcd-restore
   name: rancher-turtles-etcdsnapshotrestore-validating-webhook-configuration
@@ -788,7 +797,7 @@ webhooks:
   clientConfig:
     service:
       name: rancher-turtles-etcdsnapshotrestore-webhook-service
-      namespace: {{ index .Values "rancherTurtles" "namespace" }}
+      namespace: rancher-turtles-system
       path: /validate-turtles-capi-cattle-io-v1alpha1-etcdmachinesnapshot
   failurePolicy: Fail
   matchPolicy: Equivalent
@@ -809,7 +818,7 @@ webhooks:
   clientConfig:
     service:
       name: rancher-turtles-etcdsnapshotrestore-webhook-service
-      namespace: {{ index .Values "rancherTurtles" "namespace" }}
+      namespace: rancher-turtles-system
       path: /validate-turtles-capi-cattle-io-v1alpha1-etcdsnapshotrestore
   failurePolicy: Fail
   matchPolicy: Equivalent

rancher-turtles-chart/values.yaml

@@ -1,6 +1,6 @@
 rancherTurtles:
   image: registry.rancher.com/rancher/rancher/turtles
-  imageVersion: v0.14.1
+  imageVersion: v0.13.0
   imagePullPolicy: IfNotPresent
   namespace: rancher-turtles-system
   managerArguments: []
@@ -25,9 +25,6 @@ rancherTurtles:
       enabled: false
     etcd-snapshot-restore:
       enabled: false
-      image: registry.rancher.com/rancher/rancher/turtles
-      imageVersion: v0.14.1
-      imagePullPolicy: IfNotPresent
     addon-provider-fleet:
       enabled: false
 cluster-api-operator:
@@ -55,35 +52,40 @@ cluster-api-operator:
         readOnly: true
   cluster-api:
     enabled: true
+    version: "v1.7.7"
     configSecret:
       name: ""
       defaultName: capi-env-variables
     core:
       namespace: capi-system
+      imageUrl: "registry.rancher.com/rancher/cluster-api-controller:v1.7.7"
       fetchConfig:
         url: ""
         selector: ""
     rke2:
       enabled: true
+      version: "v0.8.0"
       bootstrap:
         namespace: rke2-bootstrap-system
+        imageUrl: "registry.rancher.com/rancher/cluster-api-provider-rke2-bootstrap:v0.8.0"
         fetchConfig:
           url: ""
           selector: ""
       controlPlane:
         namespace: rke2-control-plane-system
+        imageUrl: "registry.rancher.com/rancher/cluster-api-provider-rke2-controlplane:v0.8.0"
         fetchConfig:
           url: ""
           selector: ""
     metal3:
       enabled: true
-      version: "v1.8.2"
+      version: "v1.7.2"
       infrastructure:
         namespace: capm3-system
-        imageUrl: "registry.rancher.com/rancher/cluster-api-metal3-controller:v1.8.2"
+        imageUrl: "%%IMG_REPO%%/%%IMG_PREFIX%%cluster-api-provider-metal3:1.7.2"
         fetchConfig:
           url: ""
           selector: ""
       ipam:
         namespace: capm3-system
-        imageUrl: "registry.rancher.com/rancher/cluster-api-metal3-ipam-controller:v1.8.1"
+        imageUrl: "%%IMG_REPO%%/%%IMG_PREFIX%%ip-address-manager:1.7.2"

release-manifest-image/_service

@@ -4,7 +4,7 @@
     <param name="file">Dockerfile</param>
     <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
     <param name="var">IMG_PREFIX</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
     <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
     <param name="var">SUPPORT_LEVEL</param>

release-manifest-image/release_manifest.yaml

@@ -7,74 +7,9 @@ spec:
   components:
     kubernetes:
       k3s:
-        version: v1.31.3+k3s1
+        version: v1.31.2+k3s1
-        coreComponents:
-        - name: traefik-crd
-          version: 27.0.201+up27.0.2
-          type: HelmChart
-        - name: traefik
-          version: 27.0.201+up27.0.2
-          type: HelmChart
-        - name: local-path-provisioner
-          containers:
-          - name: local-path-provisioner
-            image: rancher/local-path-provisioner:v0.0.30
-          type: Deployment
-        - name: coredns
-          containers:
-          - name: coredns
-            image: rancher/mirrored-coredns-coredns:1.11.3
-          type: Deployment
-        - name: metrics-server
-          containers:
-          - name: metrics-server
-            image: rancher/mirrored-metrics-server:v0.7.2
-          type: Deployment
       rke2:
-        version: v1.31.3+rke2r1
+        version: v1.31.2+rke2r1
-        coreComponents:
-        - name: rke2-cilium
-          version: 1.16.303
-          type: HelmChart
-        - name: rke2-canal
-          version: v3.29.0-build2024110400
-          type: HelmChart
-        - name: rke2-calico-crd
-          version: v3.29.000
-          type: HelmChart
-        - name: rke2-calico
-          version: v3.29.000
-          type: HelmChart
-        - name: rke2-coredns
-          version: 1.33.005
-          type: HelmChart
-        - name: rke2-ingress-nginx
-          version: 4.10.502
-          type: HelmChart
-        - name: rke2-metrics-server
-          version: 3.12.004
-          type: HelmChart
-        - name: rancher-vsphere-csi
-          version: 3.3.1-rancher700
-          type: HelmChart
-        - name: rancher-vsphere-cpi
-          version: 1.9.100
-          type: HelmChart
-        - name: harvester-cloud-provider
-          version: 0.2.600
-          type: HelmChart
-        - name: harvester-csi-driver
-          version: 0.1.2000
-          type: HelmChart
-        - name: rke2-snapshot-controller-crd
-          version: 3.0.601
-          type: HelmChart
-        - name: rke2-snapshot-controller
-          version: 3.0.601
-          type: HelmChart
-        - name: rke2-snapshot-validation-webhook
-          version: 1.9.001
-          type: HelmChart
     operatingSystem:
       version: "6.0"
       zypperID: "SL-Micro"
@@ -88,20 +23,17 @@ spec:
         - prettyName: Rancher
           releaseName: rancher
           chart: rancher
-          version: 2.10.1
+          version: v2.10.0
-          repository: https://charts.rancher.com/server-charts/prime
+          repository: https://releases.rancher.com/server-charts/stable
-          values:
-            postDelete:
-              enabled: false
         - prettyName: Longhorn
           releaseName: longhorn
           chart: longhorn
-          version: 105.1.0+up1.7.2
+          version: 104.2.1+up1.7.2
           repository: https://charts.rancher.io
           dependencyCharts:
             - releaseName: longhorn-crd
               chart: longhorn-crd
-              version: 105.1.0+up1.7.2
+              version: 104.2.1+up1.7.2
               repository: https://charts.rancher.io
         - prettyName: MetalLB
           releaseName: metallb
@@ -118,22 +50,22 @@ spec:
           addonCharts:
             - releaseName: kubevirt-dashboard-extension
               chart: %%CHART_REPO%%/%%IMG_PREFIX%%kubevirt-dashboard-extension-chart
-              version: %%CHART_MAJOR%%.0.0+up1.2.1
+              version: %%CHART_MAJOR%%.0.0+up1.2.0
         - prettyName: NeuVector
           releaseName: neuvector
           chart: neuvector
-          version: 105.0.0+up2.8.3
+          version: 104.0.2+up2.8.0
           repository: https://charts.rancher.io
           dependencyCharts:
             - releaseName: neuvector-crd
               chart: neuvector-crd
-              version: 105.0.0+up2.8.3
+              version: 104.0.2+up2.8.0
               repository: https://charts.rancher.io
           addonCharts:
             - releaseName: neuvector-ui-ext
               chart: neuvector-ui-ext
               repository: https://github.com/rancher/ui-plugin-charts/raw/main
-              version: 2.0.1
+              version: 2.0.0
         - prettyName: EndpointCopierOperator
           releaseName: endpoint-copier-operator
           chart: %%CHART_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator-chart
@@ -146,11 +78,6 @@ spec:
             - releaseName: elemental-operator-crds
               chart: oci://registry.suse.com/rancher/elemental-operator-crds-chart
               version: 1.6.5
-          addonCharts:
-            - releaseName: elemental
-              chart: elemental
-              repository: https://github.com/rancher/ui-plugin-charts/raw/main
-              version: 3.0.0
         - prettyName: SRIOV
           releaseName: sriov-network-operator
           chart: %%CHART_REPO%%/%%IMG_PREFIX%%sriov-network-operator-chart
@@ -166,7 +93,7 @@ spec:
           addonCharts:
             - releaseName: akri-dashboard-extension
               chart: %%CHART_REPO%%/%%IMG_PREFIX%%akri-dashboard-extension-chart
-              version: %%CHART_MAJOR%%.0.0+up1.2.1
+              version: %%CHART_MAJOR%%.0.0+up1.1.0
         - prettyName: Metal3
           releaseName: metal3
           chart: %%CHART_REPO%%/%%IMG_PREFIX%%metal3-chart
@@ -174,4 +101,4 @@ spec:
         - prettyName: RancherTurtles
           releaseName: rancher-turtles
           chart: %%CHART_REPO%%/%%IMG_PREFIX%%rancher-turtles-chart
-          version: %%CHART_MAJOR%%.0.0+up0.14.1
+          version: %%CHART_MAJOR%%.0.0+up0.4.0

upgrade-controller-chart/Chart.yaml

@@ -1,13 +1,13 @@
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.1
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.0
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.0-%RELEASE%
 apiVersion: v2
-appVersion: 0.1.1
+appVersion: 0.1.0
 dependencies:
 - condition: crds.enabled
   name: lifecycle-crds
   repository: file://./charts/lifecycle-crds
-  version: 0.1.1
+  version: 0.1.0
 description: A Helm chart for Upgrade Controller
 name: upgrade-controller
 type: application
-version: "%%CHART_MAJOR%%.0.0+up0.1.1"
+version: "%%CHART_MAJOR%%.0.0+up0.1.0"

upgrade-controller-chart/_service

@@ -6,8 +6,6 @@
     <param name="var">IMG_PREFIX</param>
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
-    <param name="eval">MANIFEST_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
-    <param name="var">MANIFEST_REPO</param>
   </service>
   <service name="replace_using_env" mode="buildtime">
     <param name="file">Chart.yaml</param>
@@ -17,3 +15,4 @@
     <param name="var">CHART_MAJOR</param>
   </service>
 </services>
+

upgrade-controller-chart/charts/lifecycle-crds/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 0.1.1
+appVersion: 0.1.0
 description: A Helm chart containing SUSE Lifecycle CRDs
 name: lifecycle-crds
 type: application
-version: 0.1.1
+version: 0.1.0

upgrade-controller-chart/charts/lifecycle-crds/templates/release-manifest-crd.yaml

@@ -43,35 +43,6 @@ spec:
                       properties:
                         k3s:
                           properties:
-                            coreComponents:
-                              items:
-                                properties:
-                                  containers:
-                                    items:
-                                      properties:
-                                        image:
-                                          type: string
-                                        name:
-                                          type: string
-                                      required:
-                                        - image
-                                        - name
-                                      type: object
-                                    type: array
-                                  name:
-                                    type: string
-                                  type:
-                                    enum:
-                                      - HelmChart
-                                      - Deployment
-                                    type: string
-                                  version:
-                                    type: string
-                                required:
-                                  - name
-                                  - type
-                                type: object
-                              type: array
                             version:
                               type: string
                           required:
@@ -79,35 +50,6 @@ spec:
                           type: object
                         rke2:
                           properties:
-                            coreComponents:
-                              items:
-                                properties:
-                                  containers:
-                                    items:
-                                      properties:
-                                        image:
-                                          type: string
-                                        name:
-                                          type: string
-                                      required:
-                                        - image
-                                        - name
-                                      type: object
-                                    type: array
-                                  name:
-                                    type: string
-                                  type:
-                                    enum:
-                                      - HelmChart
-                                      - Deployment
-                                    type: string
-                                  version:
-                                    type: string
-                                required:
-                                  - name
-                                  - type
-                                type: object
-                              type: array
                             version:
                               type: string
                           required:

upgrade-controller-chart/templates/clusterrole.yaml

@@ -29,14 +29,6 @@ rules:
   - customresourcedefinitions
   verbs:
   - get
-- apiGroups:
-  - apps
-  resources:
-  - deployments
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - batch
   resources:

upgrade-controller-chart/values.yaml

@@ -12,7 +12,7 @@ image:
 
 env:
   releaseManifest:
-    image: %%MANIFEST_REPO%%/%%IMG_PREFIX%%release-manifest
+    image: %%IMG_REPO%%/%%IMG_PREFIX%%release-manifest
   kubectl:
     image: %%IMG_REPO%%/%%IMG_PREFIX%%kubectl
     version: 1.30.3

upgrade-controller-image/Dockerfile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.1
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.0
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.0-%RELEASE%
 #!BuildVersion: 15.6
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
@@ -16,11 +16,11 @@ FROM micro AS final
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE Edge Upgrade Controller Container Image"
 LABEL org.opencontainers.image.description="Edge Update Controller Image based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="0.1.1"
+LABEL org.opencontainers.image.version="0.1.0"
 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%%upgrade-controller:0.1.1-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%upgrade-controller:0.1.0-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

upgrade-controller/_service

@@ -4,7 +4,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="revision">v0.1.1</param>
+    <param name="revision">v0.1.0</param>
     <param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>
     <param name="versionrewrite-replacement">\1.\2.\3</param>
     <param name="changesgenerate">enable</param>

upgrade-controller/upgrade-controller.spec

@@ -17,7 +17,7 @@
 
 
 Name:           upgrade-controller
-Version:        0.1.1
+Version:        0.1.0
 Release:        0
 Summary:        Upgrade Controller
 License:        Apache-2.0