Merge remote-tracking branch 'upstream/3.2' into 3.2

Merge pull request '[3.2] Update kubevirt-dashboard-extension-chart to v1.2.1' (#50 ) from jtomasek/Factory:kubevirt-extension-3.2-bkprt into 3.2
Reviewed-on: #50 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>
2024-12-06 13:20:40 +02:00 · 2024-12-06 11:03:10 +01:00 · 2024-12-06 11:03:01 +01:00 · 2024-12-06 10:57:08 +01:00 · 2024-12-06 09:54:10 +01:00 · 2024-12-06 09:52:36 +01:00
32 changed files with 462 additions and 576 deletions
--- a/.obs/common.py
+++ b/.obs/common.py
@ -1,3 +1,3 @@
-PROJECT = "isv:SUSE:Edge:Factory"
+PROJECT = "isv:SUSE:Edge:3.2"
 REPOSITORY = "https://src.opensuse.org/suse-edge/Factory"
-BRANCH = "main"
+BRANCH = "3.2"
--- a/.obs/workflows.yml
+++ b/.obs/workflows.yml
@ -4,225 +4,209 @@ staging_build:
  steps:
  - branch_package:
      source_package: endpoint-copier-operator
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: endpoint-copier-operator-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: endpoint-copier-operator-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-agent-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-controller-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-debug-echo-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-onvif-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-opcua-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-udev-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-webhook-configuration-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: obs-service-set_version
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cosign
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: frr-k8s
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubectl
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: upgrade-controller
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: nm-configurator
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kube-rbac-proxy
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: edge-image-builder
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      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
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2: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
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2: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
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: sriov-crd-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: upgrade-controller-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: edge-image-builder-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ironic-ipa-downloader-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: upgrade-controller-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metal3-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: baremetal-operator-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: sriov-network-operator-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      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
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb-speaker-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ironic-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cri-tools
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: crudini
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: fakeroot
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ipcalc
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: autoconf
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: rancher-turtles-airgap-resources-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: rancher-turtles-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kube-rbac-proxy-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ironic-ipa-ramdisk
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubevirt-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kiwi-builder-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubevirt-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: release-manifest-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: frr-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubectl-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
--- a/akri-dashboard-extension-chart/Chart.yaml
+++ b/akri-dashboard-extension-chart/Chart.yaml
@ -1,5 +1,5 @@
-#!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.0-%RELEASE%
+#!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.1-%RELEASE%
 annotations:
  catalog.cattle.io/certified: rancher
  catalog.cattle.io/display-name: Akri
@ -10,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"
+  catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
 apiVersion: v2
-appVersion: 1.2.0
+appVersion: 1.2.1
 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.0"
+version: "%%CHART_MAJOR%%.0.0+up1.2.1"
--- a/akri-dashboard-extension-chart/templates/cr.yaml
+++ b/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.0
+    endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/akri-dashboard-extension/1.2.1
    noCache: {{ .Values.plugin.noCache }}
    noAuth: {{ .Values.plugin.noAuth }}
    metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}
--- a/akri-dashboard-extension-chart/values.yaml
+++ b/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"
+    catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
    catalog.cattle.io/kube-version: ">= v1.26.0-0"
--- a/cluster-api-provider-metal3-image/Dockerfile
+++ b/cluster-api-provider-metal3-image/Dockerfile
@ -1,36 +0,0 @@
-# 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" ]
--- a/cluster-api-provider-metal3-image/_service
+++ b/cluster-api-provider-metal3-image/_service
@ -1,19 +0,0 @@
-<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>
-    <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">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
-    <param name="var">SUPPORT_LEVEL</param>
-  </service>
-</services>
--- a/cluster-api-provider-metal3/_service
+++ b/cluster-api-provider-metal3/_service
@ -1,23 +0,0 @@
-<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>
--- a/cluster-api-provider-metal3/cluster-api-provider-metal3.spec
+++ b/cluster-api-provider-metal3/cluster-api-provider-metal3.spec
@ -1,54 +0,0 @@
-#
-# 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
--- a/edge-image-builder-image/_service
+++ b/edge-image-builder-image/_service
@ -7,10 +7,14 @@
    <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>

--- a/edge-image-builder-image/artifacts.yaml
+++ b/edge-image-builder-image/artifacts.yaml
@ -1,11 +1,11 @@
 metallb:
  chart: metallb-chart
-  repository: %%CHART_REPO%%/3.1
-  version: 0.14.9
+  repository: "%%CHART_REPO%%/%%IMG_PREFIX%%"
+  version: "%%CHART_MAJOR%%.0.0+up0.14.9"
 endpoint-copier-operator:
  chart: endpoint-copier-operator-chart
-  repository: %%CHART_REPO%%/3.1
-  version: 0.2.1
+  repository: "%%CHART_REPO%%/%%IMG_PREFIX%%"
+  version: "%%CHART_MAJOR%%.0.0+up0.2.1"
 kubernetes:
  k3s:
    selinuxPackage: k3s-selinux-1.6-1.slemicro.noarch
@ -13,4 +13,3 @@ kubernetes:
  rke2:
    selinuxPackage: rke2-selinux
    selinuxRepository: https://rpm.rancher.io/rke2/stable/common/slemicro/noarch
-
--- a/ip-address-manager-image/Dockerfile
+++ b/ip-address-manager-image/Dockerfile
@ -1,36 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%ip-address-manager:v%%ip-address-manager_version%%
-#!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 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.ip-address-manager
-LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
-LABEL org.opencontainers.image.title="SLE ip-address-manager Container Image"
-LABEL org.opencontainers.image.description="ip-address-manager based on the SLE Base Container Image."
-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%%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"
-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/ip-address-manager /manager
-# Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies
-USER 65532
-ENTRYPOINT [ "/manager" ]
--- a/ip-address-manager-image/_service
+++ b/ip-address-manager-image/_service
@ -1,19 +0,0 @@
-<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">%%ip-address-manager_version%%</param>
-    <param name="package">ip-address-manager</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>
-    <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">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
-    <param name="var">SUPPORT_LEVEL</param>
-  </service>
-</services>
--- a/ip-address-manager/_service
+++ b/ip-address-manager/_service
@ -1,23 +0,0 @@
-<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>
--- a/ip-address-manager/ip-address-manager.spec
+++ b/ip-address-manager/ip-address-manager.spec
@ -1,51 +0,0 @@
-#
-# 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
--- a/kiwi-builder-image/Dockerfile
+++ b/kiwi-builder-image/Dockerfile
@ -1,5 +1,6 @@
-#!BuildTag: kiwi-builder:10.1
-FROM registry.suse.com/bci/kiwi:10.1.10
+#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.0
+#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.0-%RELEASE%
+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
@ -11,7 +12,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"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:10.1.16.0"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
@ -20,10 +21,6 @@ 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

--- a/kiwi-builder-image/README
+++ b/kiwi-builder-image/README
@ -8,32 +8,40 @@ 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
+# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0

 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 build-image
+# 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

-To build a SelfInstall ISO, you can add additional flags, for example:
+To build a "Default" 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 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.1.16.0 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 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.1.16.0 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 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.1.16.0 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 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.1.16.0 build-image

 All output will be in the local $(pwd)/output directory, for example:

--- a/kiwi-builder-image/build-image.sh
+++ b/kiwi-builder-image/build-image.sh
@ -21,43 +21,45 @@
 #

 # Set image build defaults, blocksize is an empty string
-PROFILE="Default"
+PROFILE="Base"
 LARGEBLOCK=false

 # Print usage
 usage(){
-	cat <<-EOF
-	==============================
-	SLE Micro 6.0 Kiwi SDK Builder
-	==============================
+  cat <<-EOF
+  ==============================
+  SLE Micro 6.0 Kiwi SDK Builder
+  ==============================

-	Usage: ${0} [-p <profile>] [-b]
+  Usage: ${0} [-p <profile>] [-b]

-	Profile Options (-p):
-	* Default: RAW Disk Image with kernel-default
-	* Default-SelfInstall: SelfInstall ISO with kernel-default
-	* Base-RT: RAW Disk Image with kernel-rt
-	* Base-RT-SelfInstall: SelfInstall ISO with kernel-rt
+  Profile Options (-p):
+  * Base: RAW Disk Image with podman
+  * Base-SelfInstall: SelfInstall ISO with podman
+  * Default: RAW Disk Image with podman and kvm
+  * Default-SelfInstall: SelfInstall ISO with podman and kvm
+  * 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 "Default" profile with a standard "512" blocksize is used.
-	EOF
+  NOTE: If both options are omitted, the "Base" profile with a standard "512" blocksize is used.
+EOF
 }

 # Grab CLI options and handle
 while getopts 'p:bh' OPTION; do
-	case "${OPTION}" in
-		p)
-			PROFILE="${OPTARG}"
-			;;
-		b)
-			LARGEBLOCK=true
-			;;
-		?)
-			usage && exit 2
-			;;
-	esac
+  case "${OPTION}" in
+    p)
+      PROFILE="${OPTARG}"
+      ;;
+    b)
+      LARGEBLOCK=true
+      ;;
+    ?)
+      usage && exit 2
+      ;;
+  esac
 done

 # To avoid wasting time, perform the loop creation test first, and exit with a warning to re-run.
--- a/kubevirt-dashboard-extension-chart/Chart.yaml
+++ b/kubevirt-dashboard-extension-chart/Chart.yaml
@ -1,5 +1,5 @@
-#!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.0-%RELEASE%
+#!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.1-%RELEASE%
 annotations:
  catalog.cattle.io/certified: rancher
  catalog.cattle.io/display-name: KubeVirt
@ -10,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'
+  catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
 apiVersion: v2
-appVersion: 1.2.0
+appVersion: 1.2.1
 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.0"
+version: "%%CHART_MAJOR%%.0.0+up1.2.1"
--- a/kubevirt-dashboard-extension-chart/templates/cr.yaml
+++ b/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.0
+    endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/kubevirt-dashboard-extension/1.2.1
    noCache: {{ .Values.plugin.noCache }}
    noAuth: {{ .Values.plugin.noAuth }}
    metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}
--- a/kubevirt-dashboard-extension-chart/values.yaml
+++ b/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"
+    catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
    catalog.cattle.io/kube-version: ">= v1.26.0-0"
--- a/rancher-turtles-airgap-resources-chart/Chart.yaml
+++ b/rancher-turtles-airgap-resources-chart/Chart.yaml
@ -1,10 +1,10 @@
-#!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.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.14.1
 apiVersion: v2
-appVersion: 0.13.0
+appVersion: 0.14.1
 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.13.0"
+version: "%%CHART_MAJOR%%.0.0+up0.14.1"
--- a/rancher-turtles-airgap-resources-chart/templates/airgap-cm-core.yaml
+++ b/rancher-turtles-airgap-resources-chart/templates/airgap-cm-core.yaml
--- a/rancher-turtles-airgap-resources-chart/templates/airgap-cm-metal3.yaml
+++ b/rancher-turtles-airgap-resources-chart/templates/airgap-cm-metal3.yaml
@ -35,7 +35,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: ipam-webhook-service
              namespace: capm3-system
@ -208,7 +207,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: ipam-webhook-service
              namespace: capm3-system
@ -369,7 +367,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: ipam-webhook-service
              namespace: capm3-system
@ -536,7 +533,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: capm3-webhook-service
              namespace: capm3-system
@ -699,6 +695,91 @@ 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
@ -712,7 +793,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: capm3-webhook-service
              namespace: capm3-system
@ -868,7 +948,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: capm3-webhook-service
              namespace: capm3-system
@ -1064,7 +1143,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: capm3-webhook-service
              namespace: capm3-system
@ -2078,7 +2156,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: capm3-webhook-service
              namespace: capm3-system
@ -2150,6 +2227,17 @@ 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
@ -2302,8 +2390,6 @@ data:
                        type: string
                    type: object
                    x-kubernetes-map-type: atomic
-                required:
-                - image
                type: object
              status:
                description: Metal3MachineStatus defines the observed state of Metal3Machine.
@ -2521,7 +2607,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: capm3-webhook-service
              namespace: capm3-system
@ -2591,6 +2676,17 @@ 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.
@ -2745,8 +2841,6 @@ data:
                                type: string
                            type: object
                            x-kubernetes-map-type: atomic
-                        required:
-                        - image
                        type: object
                    required:
                    - spec
@ -2774,7 +2868,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: capm3-webhook-service
              namespace: capm3-system
@ -2889,7 +2982,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: capm3-webhook-service
              namespace: capm3-system
@ -3173,6 +3265,12 @@ data:
      - patch
      - update
      - watch
+    - apiGroups:
+      - ""
+      resources:
+      - pods
+      verbs:
+      - list
    - apiGroups:
      - infrastructure.cluster.x-k8s.io
      resources:
@ -3391,6 +3489,13 @@ data:
      - get
      - patch
      - update
+    - apiGroups:
+      - storage.k8s.io
+      resources:
+      - volumeattachments
+      verbs:
+      - list
+      - watch
    ---
    apiVersion: rbac.authorization.k8s.io/v1
    kind: ClusterRole
@ -3634,7 +3739,7 @@ data:
          containers:
          - args:
            - --webhook-port=9443
-            - --enableBMHNameBasedPreallocation=${enableBMHNameBasedPreallocation:=false}
+            - --enableBMHNameBasedPreallocation=${ENABLE_BMH_NAME_BASED_PREALLOCATION:=false}
            - --diagnostics-address=${CAPM3_DIAGNOSTICS_ADDRESS:=:8443}
            - --insecure-diagnostics=${CAPM3_INSECURE_DIAGNOSTICS:=false}
            command:
@ -3647,7 +3752,7 @@ data:
            envFrom:
            - configMapRef:
                name: capm3-capm3fasttrack-configmap
-            image: quay.io/metal3-io/cluster-api-provider-metal3:v1.7.2
+            image: registry.rancher.com/rancher/cluster-api-provider-metal3:v1.8.2
            imagePullPolicy: IfNotPresent
            livenessProbe:
              httpGet:
@ -3676,6 +3781,7 @@ data:
              privileged: false
              runAsGroup: 65532
              runAsUser: 65532
+            terminationMessagePolicy: FallbackToLogsOnError
            volumeMounts:
            - mountPath: /tmp/k8s-webhook-server/serving-certs
              name: cert
@ -3731,7 +3837,7 @@ data:
              valueFrom:
                fieldRef:
                  fieldPath: metadata.namespace
-            image: quay.io/metal3-io/ip-address-manager:v1.7.2
+            image: quay.io/metal3-io/ip-address-manager:v1.8.1
            imagePullPolicy: IfNotPresent
            livenessProbe:
              httpGet:
@ -3760,6 +3866,7 @@ data:
              privileged: false
              runAsGroup: 65532
              runAsUser: 65532
+            terminationMessagePolicy: FallbackToLogsOnError
            volumeMounts:
            - mountPath: /tmp/k8s-webhook-server/serving-certs
              name: cert
@ -3864,6 +3971,28 @@ 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
@ -4126,6 +4255,28 @@ 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
@ -4360,6 +4511,9 @@ data:
    apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
    kind: Metadata
    releaseSeries:
+    - major: 1
+      minor: 8
+      contract: v1beta1
    - major: 1
      minor: 7
      contract: v1beta1
@ -4384,7 +4538,7 @@ data:
 kind: ConfigMap
 metadata:
  creationTimestamp: null
-  name: v1.7.2
+  name: v1.8.2
  namespace: capm3-system
  labels:
    provider-components: metal3
--- a/rancher-turtles-airgap-resources-chart/templates/airgap-cm-rke2-bootstrap.yaml
+++ b/rancher-turtles-airgap-resources-chart/templates/airgap-cm-rke2-bootstrap.yaml
@ -32,7 +32,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: rke2-bootstrap-webhook-service
              namespace: rke2-bootstrap-system
@ -1237,7 +1236,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: rke2-bootstrap-webhook-service
              namespace: rke2-bootstrap-system
@ -2545,7 +2543,7 @@ data:
            - --insecure-diagnostics=${CAPRKE2_INSECURE_DIAGNOSTICS:=false}
            command:
            - /manager
-            image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.8.0
+            image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.9.0
            imagePullPolicy: IfNotPresent
            livenessProbe:
              httpGet:
@ -2574,6 +2572,7 @@ data:
              privileged: false
              runAsGroup: 65532
              runAsUser: 65532
+            terminationMessagePolicy: FallbackToLogsOnError
            volumeMounts:
            - mountPath: /tmp/k8s-webhook-server/serving-certs
              name: cert
@ -2755,10 +2754,13 @@ data:
      - major: 0
        minor: 8
        contract: v1beta1
+      - major: 0
+        minor: 9
+        contract: v1beta1
 kind: ConfigMap
 metadata:
  creationTimestamp: null
-  name: v0.8.0
+  name: v0.9.0
  namespace: rke2-bootstrap-system
  labels:
    provider-components: rke2-bootstrap
--- a/rancher-turtles-airgap-resources-chart/templates/airgap-cm-rke2-control-plane.yaml
+++ b/rancher-turtles-airgap-resources-chart/templates/airgap-cm-rke2-control-plane.yaml
@ -32,7 +32,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: rke2-control-plane-webhook-service
              namespace: rke2-control-plane-system
@ -2620,7 +2619,6 @@ data:
        strategy: Webhook
        webhook:
          clientConfig:
-            caBundle: Cg==
            service:
              name: rke2-control-plane-webhook-service
              namespace: rke2-control-plane-system
@ -4295,7 +4293,7 @@ data:
              valueFrom:
                fieldRef:
                  fieldPath: metadata.uid
-            image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.8.0
+            image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.9.0
            imagePullPolicy: IfNotPresent
            livenessProbe:
              httpGet:
@ -4331,6 +4329,7 @@ data:
              privileged: false
              runAsGroup: 65532
              runAsUser: 65532
+            terminationMessagePolicy: FallbackToLogsOnError
            volumeMounts:
            - mountPath: /tmp/k8s-webhook-server/serving-certs
              name: cert
@ -4512,10 +4511,13 @@ data:
      - major: 0
        minor: 8
        contract: v1beta1
+      - major: 0
+        minor: 9
+        contract: v1beta1
 kind: ConfigMap
 metadata:
  creationTimestamp: null
-  name: v0.8.0
+  name: v0.9.0
  namespace: rke2-control-plane-system
  labels:
    provider-components: rke2-control-plane
--- a/rancher-turtles-chart/Chart.lock
+++ b/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-10-28T11:44:34.392387979Z"
+generated: "2024-12-03T09:34:12.871417074Z"
--- a/rancher-turtles-chart/Chart.yaml
+++ b/rancher-turtles-chart/Chart.yaml
@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.13.0
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.13.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.14.1
+#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.14.1-%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.9.0-1'
+  catalog.cattle.io/rancher-version: '>= 2.10.0-1'
  catalog.cattle.io/release-name: rancher-turtles
  catalog.cattle.io/scope: management
  catalog.cattle.io/type: cluster-tool
 apiVersion: v2
-appVersion: 0.13.0
+appVersion: 0.14.1
 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.13.0"
+version: "%%CHART_MAJOR%%.0.0+up0.14.1"
--- a/rancher-turtles-chart/templates/metal3-infrastructure.yaml
+++ b/rancher-turtles-chart/templates/metal3-infrastructure.yaml
@ -16,6 +16,9 @@ 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
--- a/rancher-turtles-chart/templates/rancher-turtles-exp-etcdrestore-components.yaml
+++ b/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: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert
+    cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
    controller-gen.kubebuilder.io/version: v0.14.0
  labels:
    turtles-capi.cattle.io: etcd-restore
@ -45,77 +45,65 @@ 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.location)>0
+              rule: size(self.clusterName)>0
          status:
            default: {}
            description: EtcdSnapshotRestoreStatus defines observed state of EtcdSnapshotRestore
            properties:
-              conditions:
-                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
+              error:
+                type: string
              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
@ -127,7 +115,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
-    cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert
+    cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
    controller-gen.kubebuilder.io/version: v0.14.0
  labels:
    turtles-capi.cattle.io: etcd-restore
@ -246,7 +234,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
-    cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert
+    cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
    controller-gen.kubebuilder.io/version: v0.14.0
  labels:
    turtles-capi.cattle.io: etcd-restore
@ -306,8 +294,6 @@ spec:
                    type: string
                  insecure:
                    type: boolean
-                  location:
-                    type: string
                  region:
                    type: string
                  s3CredentialSecret:
@ -337,7 +323,7 @@ metadata:
    app.kubernetes.io/part-of: rancher-turtles
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-manager
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@ -351,7 +337,7 @@ metadata:
    app.kubernetes.io/part-of: rancher-turtles
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-leader-election-role
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 rules:
 - apiGroups:
  - ""
@ -600,7 +586,7 @@ metadata:
    app.kubernetes.io/part-of: rancher-turtles
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-leader-election-rolebinding
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
@ -608,7 +594,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: rancher-turtles-etcdsnapshotrestore-manager
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@ -629,7 +615,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: rancher-turtles-etcdsnapshotrestore-manager
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 ---
 apiVersion: v1
 kind: Service
@ -637,7 +623,7 @@ metadata:
  labels:
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-webhook-service
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 spec:
  ports:
  - port: 443
@ -652,7 +638,7 @@ metadata:
    control-plane: controller-manager
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-controller-manager
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 spec:
  replicas: 1
  selector:
@ -671,7 +657,7 @@ spec:
      - args:
        - --leader-elect
        command:
-        - /manager
+        - ./etcd-snapshot-restore
        env:
        - name: POD_NAMESPACE
          valueFrom:
@ -685,8 +671,13 @@ spec:
          valueFrom:
            fieldRef:
              fieldPath: metadata.uid
-        image: ghcr.io/rancher/turtles-etcd-snapshot-restore:dev
-        imagePullPolicy: IfNotPresent
+        {{- $imageVersion := index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "imageVersion" -}}
+        {{- if contains "sha256:" $imageVersion }}
+        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
@ -733,11 +724,11 @@ metadata:
  labels:
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-serving-cert
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 spec:
  dnsNames:
-  - rancher-turtles-etcdsnapshotrestore-webhook-service.rancher-turtles-system.svc
-  - rancher-turtles-etcdsnapshotrestore-webhook-service.rancher-turtles-system.svc.cluster.local
+  - rancher-turtles-etcdsnapshotrestore-webhook-service.{{ index .Values "rancherTurtles" "namespace" }}.svc
+  - rancher-turtles-etcdsnapshotrestore-webhook-service.{{ index .Values "rancherTurtles" "namespace" }}.svc.cluster.local
  issuerRef:
    kind: Issuer
    name: rancher-turtles-etcdsnapshotrestore-selfsigned-issuer
@ -749,7 +740,7 @@ metadata:
  labels:
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-selfsigned-issuer
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 spec:
  selfSigned: {}
 ---
@ -757,7 +748,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
  annotations:
-    cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert
+    cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
  labels:
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-mutating-webhook-configuration
@ -767,7 +758,7 @@ webhooks:
  clientConfig:
    service:
      name: rancher-turtles-etcdsnapshotrestore-webhook-service
-      namespace: rancher-turtles-system
+      namespace: {{ index .Values "rancherTurtles" "namespace" }}
      path: /mutate-bootstrap-cluster-x-k8s-io-v1beta1-rke2config
  failurePolicy: Fail
  name: systemagentrke2config.kb.io
@ -787,7 +778,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
  annotations:
-    cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert
+    cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
  labels:
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-validating-webhook-configuration
@ -797,7 +788,7 @@ webhooks:
  clientConfig:
    service:
      name: rancher-turtles-etcdsnapshotrestore-webhook-service
-      namespace: rancher-turtles-system
+      namespace: {{ index .Values "rancherTurtles" "namespace" }}
      path: /validate-turtles-capi-cattle-io-v1alpha1-etcdmachinesnapshot
  failurePolicy: Fail
  matchPolicy: Equivalent
@ -818,7 +809,7 @@ webhooks:
  clientConfig:
    service:
      name: rancher-turtles-etcdsnapshotrestore-webhook-service
-      namespace: rancher-turtles-system
+      namespace: {{ index .Values "rancherTurtles" "namespace" }}
      path: /validate-turtles-capi-cattle-io-v1alpha1-etcdsnapshotrestore
  failurePolicy: Fail
  matchPolicy: Equivalent
--- a/rancher-turtles-chart/values.yaml
+++ b/rancher-turtles-chart/values.yaml
@ -1,6 +1,6 @@
 rancherTurtles:
  image: registry.rancher.com/rancher/rancher/turtles
-  imageVersion: v0.13.0
+  imageVersion: v0.14.1
  imagePullPolicy: IfNotPresent
  namespace: rancher-turtles-system
  managerArguments: []
@ -25,6 +25,9 @@ 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:
@ -52,40 +55,35 @@ 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.7.2"
+      version: "v1.8.2"
      infrastructure:
        namespace: capm3-system
-        imageUrl: "%%IMG_REPO%%/%%IMG_PREFIX%%cluster-api-provider-metal3:1.7.2"
+        imageUrl: "registry.rancher.com/rancher/cluster-api-metal3-controller:v1.8.2"
        fetchConfig:
          url: ""
          selector: ""
      ipam:
        namespace: capm3-system
-        imageUrl: "%%IMG_REPO%%/%%IMG_PREFIX%%ip-address-manager:1.7.2"
+        imageUrl: "registry.rancher.com/rancher/cluster-api-metal3-ipam-controller:v1.8.1"
--- a/release-manifest-image/release_manifest.yaml
+++ b/release-manifest-image/release_manifest.yaml
@ -28,12 +28,12 @@ spec:
        - prettyName: Longhorn
          releaseName: longhorn
          chart: longhorn
-          version: 104.2.1+up1.7.2
+          version: 105.1.0+up1.7.2
          repository: https://charts.rancher.io
          dependencyCharts:
            - releaseName: longhorn-crd
              chart: longhorn-crd
-              version: 104.2.1+up1.7.2
+              version: 105.1.0+up1.7.2
              repository: https://charts.rancher.io
        - prettyName: MetalLB
          releaseName: metallb
@ -50,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.0
+              version: %%CHART_MAJOR%%.0.0+up1.2.1
        - prettyName: NeuVector
          releaseName: neuvector
          chart: neuvector
-          version: 104.0.2+up2.8.0
+          version: 105.0.0+up2.8.3
          repository: https://charts.rancher.io
          dependencyCharts:
            - releaseName: neuvector-crd
              chart: neuvector-crd
-              version: 104.0.2+up2.8.0
+              version: 105.0.0+up2.8.3
              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.0
+              version: 2.0.1
        - prettyName: EndpointCopierOperator
          releaseName: endpoint-copier-operator
          chart: %%CHART_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator-chart
@ -93,7 +93,7 @@ spec:
          addonCharts:
            - releaseName: akri-dashboard-extension
              chart: %%CHART_REPO%%/%%IMG_PREFIX%%akri-dashboard-extension-chart
-              version: %%CHART_MAJOR%%.0.0+up1.1.0
+              version: %%CHART_MAJOR%%.0.0+up1.2.1
        - prettyName: Metal3
          releaseName: metal3
          chart: %%CHART_REPO%%/%%IMG_PREFIX%%metal3-chart
@ -101,4 +101,4 @@ spec:
        - prettyName: RancherTurtles
          releaseName: rancher-turtles
          chart: %%CHART_REPO%%/%%IMG_PREFIX%%rancher-turtles-chart
-          version: %%CHART_MAJOR%%.0.0+up0.4.0
+          version: %%CHART_MAJOR%%.0.0+up0.14.1
Author	SHA256	Message	Date
Denislav Prodanov	bf90cfaf79	Merge remote-tracking branch 'upstream/3.2' into 3.2	2024-12-06 13:20:40 +02:00
Jiří Tomášek	af59834eaf	Merge pull request '[3.2] Update kubevirt-dashboard-extension-chart to v1.2.1' (#50 ) from jtomasek/Factory:kubevirt-extension-3.2-bkprt into 3.2 Reviewed-on: #50 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2024-12-06 11:03:10 +01:00
Jiří Tomášek	5ff222b69b	Merge pull request '[3.2] Update akri-dashboard-extension-chart to v1.2.1' (#51 ) from jtomasek/Factory:akri-extension-3.2-bkprt into 3.2 Reviewed-on: #51 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2024-12-06 11:03:01 +01:00
Denislav Prodanov	14b56eabbe	Merge pull request '[3.2] Backport rancher-turtles updates' (#47 ) from steven.hardy/Factory:turtles_3.2 into 3.2 Reviewed-on: #47 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2024-12-06 10:57:08 +01:00
Jiri Tomasek	d91b28fb5b	Update akri-dashboard-extension-chart to v1.2.1 (cherry picked from commit `87c7e1be88`)	2024-12-06 09:54:10 +01:00
Jiri Tomasek	4aa46388cf	Update kubevirt-dashboard-extension-chart to v1.2.1 (cherry picked from commit `568d5d1590`)	2024-12-06 09:52:36 +01:00
Steven Hardy	dfa68ba86e	release-manifest: Update rancher-turtles chart Fix the rancher-turtles-chart version to align with #44 (cherry picked from commit `fbd596290a`)	2024-12-05 17:46:29 +00:00
Steven Hardy	075e2a209c	Remove CAPM3/IPAM images These are now provided by the rancher registry since #44 Conflicts: .obs/workflows.yml (cherry picked from commit `ec6c4745ea`)	2024-12-05 17:45:54 +00:00
Steven Hardy	2928b2076e	rancher-turtles-airgap-resources-chart: Update to 0.14.1 upstream release Aligns with https://github.com/suse-edge/charts/pull/174 which rebases to 0.14.1, which is marked as compatible with Rancher 2.10 (cherry picked from commit `856ec2ac8e`)	2024-12-05 17:43:56 +00:00
Steven Hardy	39338dd6ac	rancher-turtles-chart: Update to 0.14.1 upstream release Aligns with https://github.com/suse-edge/charts/pull/174 which rebases to 0.14.1, which is marked as compatible with Rancher 2.10 (cherry picked from commit `7721c66ab0`)	2024-12-05 17:43:43 +00:00
Denislav Prodanov	121f4a14db	Merge remote-tracking branch 'upstream/3.2' into 3.2	2024-12-04 17:17:47 +02:00
Denislav Prodanov	dfc8bb30d9	Merge pull request 'backport into 3.2 fixed versions in eib artifacts' (#43 ) from dprodanov/Factory:eib-3.2 into 3.2 Reviewed-on: #43 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>	2024-12-04 16:16:35 +01:00
Denislav Prodanov	33f56e8b23	fixed versions in eib artifacts	2024-12-04 17:12:03 +02:00
Denislav Prodanov	67d7d572a9	Merge remote-tracking branch 'upstream/3.2' into 3.2	2024-12-04 15:40:13 +02:00
Steven Hardy	744d04b40a	kiwi-builder-image: Align with OBS latest version Aligns with the latest fixes in isv:SUSE:Edge:KiwiBuilder/kiwi-builder-10 (cherry picked from commit `8a93aae7c5`)	2024-12-04 12:25:44 +00:00
Denislav Prodanov	5e098df843	Merge pull request 'updated longhorn and neuvector to latest 105 charts' (#39 ) from dprodanov/Factory:upstream-3.2 into 3.2 Reviewed-on: #39 Reviewed-by: Ivo Petrov <ipetrov117@noreply.src.opensuse.org>	2024-11-28 16:23:41 +01:00
Denislav Prodanov	7555048917	updated longhorn and neuvector to latest 105 charts	2024-11-28 17:16:25 +02:00
Denislav Prodanov	e92a50d110	Merge pull request '[3.2 backport] rancher-turtles: Fix issue in 0.4.0 chart' (#37 ) from steven.hardy/Factory:turtles_fix_3.2 into 3.2 Reviewed-on: #37 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org> Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2024-11-27 14:08:45 +01:00
Steven Hardy	da2ad77951	rancher-turtles: Fix issue in 0.4.0 chart The previous import was based on a pre-merge copy of the following PR - an issue was discovered during SV validation which required an additional change to ensure CRDs are created before creating the ClusterctlConfig CR https://github.com/suse-edge/charts/pull/166 (cherry picked from commit `636493adba`)	2024-11-27 11:16:59 +00:00
Denislav Prodanov	be4fae4b18	3.2 branching	2024-11-25 15:59:33 +02:00
Denislav Prodanov	6335b818e3	3.2 branching	2024-11-25 15:54:26 +02:00