Merge pull request 'changed the entry point for pre-commit to call the script from the venv' (#250) from backport-pre-commit-fix-2 into 3.2

Reviewed-on: #250
Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>

.gitea/workflows/check_manifest.yaml

@@ -0,0 +1,23 @@
+name: Check Release Manifest Local Charts Versions
+on:
+  pull_request:
+      branches-ignore:
+      - "devel"
+
+
+jobs:
+  sync-pr-project:
+    name: "Check Release Manifest Local Charts Versions"
+    runs-on: tumbleweed
+    steps:
+        # Waiting on PR to get merged for support in upstream action/checkout action
+      - uses: 'https://github.com/yangskyboxlabs/action-checkout@sha256'
+        name: Checkout repository
+        with:
+          object-format: 'sha256'
+      - name: Setup dependencies
+        run: |
+          zypper in -y python3-ruamel.yaml
+      - name: Check release manifest
+        run: |
+          python3 .obs/manifest-check.py --check

.gitea/workflows/trigger_devel.yaml

@@ -1,30 +0,0 @@
-name: Trigger Devel Packages
-on:
-  schedule:
-    - cron: "@daily"
-
-jobs:
-  sync-pr-project:
-    name: "Trigger source services for devel packages that changed"
-    runs-on: tumbleweed
-    steps:
-      - name: Setup OSC
-        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'
-        name: Checkout repository
-        with:
-          object-format: 'sha256'
-          ref: 'devel'
-      - name: "Trigger packages"
-        run: |
-          python3 .obs/trigger_package.py

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

.obs/manifest-check.py

@@ -0,0 +1,84 @@
+#!/usr/bin/python3
+
+import ruamel.yaml
+import pathlib
+import argparse
+import sys
+
+yaml = ruamel.yaml.YAML()
+
+def get_chart_version(chart_name: str) -> str:
+    with open(f"./{chart_name}/Chart.yaml") as f:
+        chart = yaml.load(f)
+        return chart["version"]
+
+def get_charts(chart):
+    if not chart["chart"].startswith("%%CHART_REPO%%"):
+        # Not a locally managed chart
+        return {}
+
+    chart_name = chart["chart"][len("%%CHART_REPO%%/%%IMG_PREFIX%%"):]
+    charts = { chart_name: chart["version"] }
+    for child_chart in chart.get("dependencyCharts", []) + chart.get("addonCharts", []):
+        charts.update(get_charts(child_chart))
+    return charts
+
+def get_charts_list():
+    with open("./release-manifest-image/release_manifest.yaml") as f:
+        manifest = yaml.load(f)
+    charts = {}
+    for chart in manifest["spec"]["components"]["workloads"]["helm"]:
+        charts.update(get_charts(chart))
+    return charts
+
+def check_charts(fix: bool) -> bool:
+    success = True
+    charts = get_charts_list()
+    to_fix = {}
+    for chart in charts:
+        expected_version = get_chart_version(chart)
+        if expected_version != charts[chart]:
+            success = False
+            to_fix[f'%%CHART_REPO%%/%%IMG_PREFIX%%{chart}'] = expected_version
+            print(f"{chart}: Expected: {expected_version}, Got: {charts[chart]}")
+    if fix and not success:
+        fix_charts(to_fix)
+        return True
+    return success
+
+def fix_charts(to_fix):
+    manifest_path = pathlib.Path("./release-manifest-image/release_manifest.yaml")
+    manifest = yaml.load(manifest_path)
+    yaml.indent(mapping=2, sequence=4, offset=2)
+    yaml.width = 4096
+    for chart_index, chart in enumerate(manifest["spec"]["components"]["workloads"]["helm"]):
+        changed = False
+        if chart["chart"] in to_fix.keys():
+            changed = True
+            chart["version"] = to_fix[chart["chart"]]
+        for subchart_index, subchart in enumerate(chart.get("addonCharts", [])):
+            if subchart["chart"] in to_fix.keys():
+                changed = True
+                subchart["version"] = to_fix[subchart["chart"]]
+                chart["addonCharts"][subchart_index] = subchart
+        for subchart_index, subchart in enumerate(chart.get("dependencyCharts", [])):
+            if subchart["chart"] in to_fix.keys():
+                changed = True
+                subchart["version"] = to_fix[subchart["chart"]]
+                chart["dependencyCharts"][subchart_index] = subchart
+        if changed:
+            manifest["spec"]["components"]["workloads"]["helm"][chart_index] = chart
+    yaml.dump(manifest, manifest_path)
+
+def main():
+    print("Checking charts versions in release manifest")
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-c', '--check', action='store_true')
+    args = parser.parse_args()
+    if not check_charts(not args.check):
+        sys.exit(1)
+    else:
+        print("All local charts in release manifest are using the right version")
+
+if __name__ == "__main__":
+    main()

.obs/render_meta.py

@@ -8,7 +8,6 @@ def render(base_project, subproject, internal, scm_url=None):
     context = {
         "base_project": subproject == "",
         "title": f"SUSE Edge {version} {subproject}".rstrip(),
-        "ironic_base": "ISV:SUSE:Edge:Ironic" if internal else "Cloud:OpenStack",
     }
     if subproject == "ToTest":
         context["project"] = f"{base_project}:ToTest"

.pre-commit-config.yaml

@@ -0,0 +1,10 @@
+repos:
+  - repo: local
+    hooks:
+      - id: check-manifest
+        name: "Check release-manifest"
+        entry: python3 .obs/manifest-check.py
+        language: python
+        additional_dependencies: ['ruamel.yaml']
+        pass_filenames: false
+        always_run: true

_config

@@ -103,6 +103,36 @@ BuildFlags: onlybuild:release-manifest-image
     PublishFlags: archsync
 %endif
 
+%if "%_repository" == "images_6.0"
+    Prefer: container:sles15-image
+    Type: docker
+    BuildEngine: podman
+    Repotype: none
+    Patterntype: none
+    BuildFlags: dockerarg:SLE_VERSION=16.0
+    BuildFlags: onlybuild:kiwi-builder-image
+
+    # Publish multi-arch container images only once all archs have been built
+    PublishFlags: archsync
+
+    # Exclude the images selected by the aarch64 section
+    %ifarch aarch64
+      BuildFlags: excludebuild:baremetal-operator-image
+      BuildFlags: excludebuild:edge-image-builder-image
+      BuildFlags: excludebuild:endpoint-copier-operator-image
+      BuildFlags: excludebuild:ironic-image
+      BuildFlags: excludebuild:ironic-ipa-downloader-image
+      BuildFlags: excludebuild:kube-rbac-proxy-image
+      BuildFlags: excludebuild:metallb-controller-image
+      BuildFlags: excludebuild:metallb-speaker-image
+    %endif
+
+%else
+    BuildFlags: excludebuild:kiwi-builder-image
+%endif
+
+
+
 %if "%_repository" == "charts" || "%_repository" == "phantomcharts" || "%_repository" == "releasecharts"
     Type: helm
     Repotype: helm

_meta

@@ -31,14 +31,19 @@
     <arch>x86_64</arch>
   </repository>
 {%- endif %}
-{%- for repository in ["images", "test_manifest_images"] %}
+{%- for repository in ["images", "images_6.0", "test_manifest_images"] %}
   <repository name="{{ repository }}">
-    {%- if release_project is defined and repository == "images" %}
+    {%- if release_project is defined and repository != "test_manifest_images" %}
     <releasetarget project="{{ release_project }}" repository="images" trigger="manual"/>
     {%- endif %}
     <path project="SUSE:Registry" repository="standard"/>
-    <path project="SUSE:CA" repository="SLE_15_SP6"/>
+    {%- if repository == "images_6.0" %}
-    <path project="{{ project }}" repository="standard"/>
+      <path project="SUSE:CA" repository="16.0"/>
+      <path project="SUSE:ALP:Products:Marble:6.0" repository="standard"/>
+    {%- else %}
+      <path project="SUSE:CA" repository="SLE_15_SP6"/>
+      <path project="{{ project }}" repository="standard"/>
+    {%- endif %}
     <arch>x86_64</arch>
     <arch>aarch64</arch>
   </repository>
@@ -47,7 +52,7 @@
     {%- if release_project is defined and not for_release %}
     <releasetarget project="{{ release_project }}" repository="standard" trigger="manual"/>
     {%- endif %}
-    <path project="{{ ironic_base }}:2024.2" repository="15.6"/>
+    <path project="Cloud:OpenStack:2024.2" repository="15.6"/>
     <path project="SUSE:SLE-15-SP6:Update" repository="standard"/>
     <arch>x86_64</arch>
     <arch>aarch64</arch>

akri-dashboard-extension-chart/Chart.yaml

@@ -13,9 +13,9 @@ annotations:
   catalog.cattle.io/ui-component: plugins
   catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
 apiVersion: v2
-appVersion: 1.2.1
+appVersion: 302.0.0+up1.2.1
-description: "SUSE Edge: Akri extension for Rancher Dashboard"
+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"
+icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/akri/icon/color/akri-icon-color.svg

akri-dashboard-extension-chart/templates/_helpers.tpl

@@ -38,7 +38,7 @@ Common labels
 helm.sh/chart: {{ include "extension-server.chart" . }}
 {{ include "extension-server.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | replace "+" "_" | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
@@ -60,4 +60,4 @@ Pkg annotations
 {{ $key }}: {{ $value | quote }}
 {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}

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/302.0.0+up1.2.1
     noCache: {{ .Values.plugin.noCache }}
     noAuth: {{ .Values.plugin.noAuth }}
     metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}

baremetal-operator/_service

@@ -2,7 +2,7 @@
  <service name="obs_scm">
     <param name="url">https://github.com/metal3-io/baremetal-operator</param>
     <param name="scm">git</param>
-    <param name="revision">v0.9.0</param>
+    <param name="revision">v0.8.0</param>
     <param name="version">_auto_</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="changesgenerate">enable</param>

baremetal-operator/baremetal-operator.spec

@@ -17,14 +17,14 @@
 
 
 Name:           baremetal-operator
-Version:        0.9.0
+Version:        0.8.0
-Release:        0
+Release:        0.8.0
 Summary:        Implements a Kubernetes API for managing bare metal hosts
 License:        Apache-2.0
 URL:            https://github.com/metal3-io/baremetal-operator
-Source:         baremetal-operator-%{version}.tar.gz
+Source:         baremetal-operator-%{version}.tar
 Source1:        vendor.tar.gz
-BuildRequires:  golang(API) = 1.23
+BuildRequires:  golang(API) = 1.22
 ExcludeArch:    s390
 ExcludeArch:    %{ix86}
 

edge-image-builder-image/Dockerfile

@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.0
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.2-rc1
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.2-rc1-%RELEASE%
 #!BuildVersion: 15.6
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-base:$SLE_VERSION
@@ -15,11 +15,11 @@ RUN zypper --non-interactive install --no-recommends edge-image-builder qemu-x86
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE edge-image-builder Container Image"
 LABEL org.opencontainers.image.description="edge-image-builder based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="1.1.0"
+LABEL org.opencontainers.image.version="1.1.2-rc1"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.1.0-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.1.2-rc1-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

edge-image-builder-image/artifacts.yaml

@@ -1,7 +1,7 @@
 metallb:
   chart: metallb-chart
   repository: "%%CHART_REPO%%/%%IMG_PREFIX%%"
-  version: "%%CHART_MAJOR%%.0.0+up0.14.9"
+  version: "%%CHART_MAJOR%%.0.1+up0.14.9"
 endpoint-copier-operator:
   chart: endpoint-copier-operator-chart
   repository: "%%CHART_REPO%%/%%IMG_PREFIX%%"

edge-image-builder/_service

@@ -1,10 +1,13 @@
 <services>
   <service name="obs_scm">
     <param name="url">https://github.com/suse-edge/edge-image-builder.git</param>
-    <param name="versionformat">@PARENT_TAG@</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="revision">v1.1.0</param>
+    <param name="revision">v1.1.2-rc1</param>
+    <!-- Uncomment and set this For Pre-Release Version -->
+    <param name="version">1.1.2~rc0</param>
+    <!-- Uncomment and this for regular version -->
+    <!-- <param name="versionformat">@PARENT_TAG@</param> -->
     <param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>
     <param name="versionrewrite-replacement">\1.\2.\3</param>
     <param name="changesgenerate">enable</param>

edge-image-builder/edge-image-builder.spec

@@ -17,7 +17,7 @@
 
 
 Name:           edge-image-builder
-Version:        1.1.0
+Version:        1.1.2~rc1
 Release:        0
 Summary:        Edge Image Builder
 License:        Apache-2.0

kiwi-builder-image/Dockerfile

@@ -1,18 +1,20 @@
-#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.1
+#!BuildTag: %%IMG_PREFIX%%kiwi-builder:%%kiwi_version%%.1-%RELEASE%
-#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%kiwi-builder:%%kiwi_version%%.1
-FROM registry.suse.com/bci/kiwi:10.1.16
+
-MAINTAINER SUSE LLC (https://www.suse.com/)
+ARG KIWIVERSION="10.2.12"
+FROM registry.suse.com/bci/kiwi:${KIWIVERSION}
+ARG KIWIVERSION
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.akri
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE Kiwi Builder Container Image"
 LABEL org.opencontainers.image.description="kiwi-builder based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="%PACKAGE_VERSION%"
+LABEL org.opencontainers.image.version="%%kiwi_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.1"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:%%kiwi_version%%.1-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
@@ -21,8 +23,8 @@ LABEL com.suse.image-type="application"
 LABEL com.suse.release-stage="released"
 # endlabelprefix
 
-# Configure Kiwi to use kpartx
+# help the build service understand the need for python3-kiwi
-RUN echo -e "mapper:\n  - part_mapper: kpartx" > /etc/kiwi.yml
+RUN zypper -n install -d -D python3-kiwi; [ "%%kiwi_version%%" = "${KIWIVERSION}" ] || { echo "expected kiwi version ${KIWIVERSION}: version mismatch"; exit 1; }
 
 # Copy build script into image and make it executable
 ADD build-image.sh /usr/bin/build-image

kiwi-builder-image/README

@@ -2,13 +2,13 @@
 Kiwi SDK Image Instructions
 ###########################
 
-Please ensure that you're running this on a registered SUSE Linux Micro 6.1 system, and make sure that SELinux is disabled:
+Please ensure that you're running this on a registered SLE Micro 6.0 system, and make sure that SELinux is disabled:
 
 # setenforce 0
 
 Next, download the podman image:
 
-# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.1
+# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:%%kiwi_version%%.1
 
 Make a local output directory (where the images will reside):
 
@@ -16,40 +16,40 @@ Make a local output directory (where the images will reside):
 
 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.1 build-image
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:%%kiwi_version%%.1 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.1 build-image -p Base-SelfInstall
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:%%kiwi_version%%.1 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.1 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:%%kiwi_version%%.1 build-image -p Default
 
 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.1.16.1 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:%%kiwi_version%%.1 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.1 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:%%kiwi_version%%.1 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.1 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:%%kiwi_version%%.1 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.1 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:%%kiwi_version%%.1 build-image
 
 All output will be in the local $(pwd)/output directory, for example:
 
 # ls -1 output/
-SLE-Micro.x86_64-6.1.changes
+SL-Micro.x86_64-6.0.changes
-SLE-Micro.x86_64-6.1.packages
+SL-Micro.x86_64-6.0.packages
-SLE-Micro.x86_64-6.1.raw
+SL-Micro.x86_64-6.0.raw
-SLE-Micro.x86_64-6.1.verified
+SL-Micro.x86_64-6.0.verified
 build
 kiwi.result
 kiwi.result.json

kiwi-builder-image/SL-Micro.kiwi

@@ -33,12 +33,6 @@
         <profile name="aarch64-self_install" description="Raw disk for aarch64" arch="aarch64">
             <requires profile="bootloader"/>
         </profile>
-        <profile name="aarch64-rt" description="Raw disk for aarch64 with RT kernel" arch="aarch64">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="aarch64-rt-self_install" description="Raw disk for aarch64 with RT kernel" arch="aarch64">
-            <requires profile="bootloader"/>
-        </profile>
         <profile name="x86-legacy" description="Raw disk for x86_64 - legacy boot" arch="x86_64">
             <requires profile="bootloader"/>
         </profile>
@@ -69,21 +63,6 @@
         <profile name="s390-fba" description="Raw disk for s390 - DASD" arch="s390x">
             <requires profile="bootloader"/>
         </profile>
-        <profile name="s390-fcp" description="Raw disk for s390 - SCSI" arch="s390x">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-512ss" description="Raw disk for PPc64 - 512 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-4096ss" description="Raw disk for PPc64 - 4096 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-512ss-self_install" description="Raw disk for PPc64 - 512 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-4096ss-self_install" description="Raw disk for PPc64 - 4096 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
         <!-- Images (flavor + platform) -->
         <profile name="Default" description="SL Micro with Podman and KVM as raw image with uEFI boot" arch="x86_64">
             <requires profile="full"/>
@@ -161,15 +140,6 @@
             <requires profile="x86-rt-self_install"/>
             <requires profile="self_install"/>
         </profile>
-        <profile name="Base-RT" description="SL Micro with Podman as raw image with uEFI boot" arch="aarch64">
-            <requires profile="container-host"/>
-            <requires profile="aarch64-rt"/>
-        </profile>
-        <profile name="Base-RT-SelfInstall" description="SL Micro with Podman as raw image with uEFI boot - SelfInstall" arch="aarch64">
-            <requires profile="container-host"/>
-            <requires profile="aarch64-rt-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
         <profile name="Default-qcow" description="SL Micro with Podman and KVM as raw image for KVM on System z" arch="s390x">
             <requires profile="full"/>
             <requires profile="s390-kvm"/>
@@ -194,14 +164,6 @@
             <requires profile="container-host"/>
             <requires profile="s390-fba"/>
         </profile>
-        <profile name="Default-fcp" description="SL Micro with Podman and KVM as raw image for zFCP on System z" arch="s390x">
-            <requires profile="full"/>
-            <requires profile="s390-fcp"/>
-        </profile>
-        <profile name="Base-fcp" description="SL Micro with Podman as raw image for zFCP on System z" arch="s390x">
-            <requires profile="container-host"/>
-            <requires profile="s390-fcp"/>
-        </profile>
         <profile name="Default-legacy" description="SL Micro with Podman as raw image with legacy boot" arch="x86_64">
             <requires profile="full"/>
             <requires profile="x86-legacy"/>
@@ -222,47 +184,10 @@
 	    <requires profile="container-host"/>
 	    <requires profile="aarch64-qcow"/>
         </profile>
-
-	<profile name="Base-512" description="SL Micro with Podman as raw image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-512ss"/>
-        </profile>
-	<profile name="Base-4096" description="SL Micro with Podman as raw image for ppc64le with 4096b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-4096ss"/>
-        </profile>
-	<profile name="Base-512-SelfInstall" description="SL Micro with Podman as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-512ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
-	<profile name="Base-4096-SelfInstall" description="SL Micro with Podman as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-4096ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
-	<profile name="Default-512" description="SL Micro with Podman and KVM as raw image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-512ss"/>
-        </profile>
-	<profile name="Default-4096" description="SL Micro with Podman and KVM as raw image for ppc64le with 4096b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-4096ss"/>
-        </profile>
-	<profile name="Default-512-SelfInstall" description="SL Micro with Podman and KVM as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-512ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
-	<profile name="Default-4096-SelfInstall" description="SL Micro with Podman and KVM as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-4096ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
     </profiles>
 
     <preferences profiles="x86-encrypted,x86-rt-encrypted">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -273,7 +198,7 @@
             initrd_system="dracut"
             filesystem="btrfs"
             firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -286,7 +211,7 @@
 	    luks_pbkdf="pbkdf2"
         >
             <luksformat>
-                <option name="--cipher" value="aes-xts-plain64"/>
+                <option name="--cipher" value="aes"/>
             </luksformat>
             <bootloader name="grub2" console="gfxterm" use_disk_password="true" />
             <systemdisk>
@@ -305,7 +230,7 @@
         </type>
     </preferences>
     <preferences profiles="x86,x86-rt">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -316,7 +241,7 @@
             initrd_system="dracut"
             filesystem="btrfs"
             firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -341,7 +266,7 @@
     </preferences>
 
     <preferences profiles="x86-self_install,x86-rt-self_install">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -351,12 +276,11 @@
             image="oem"
             initrd_system="dracut"
             installiso="true"
-            installpxe="true"
             filesystem="btrfs"
             installboot="install"
             install_continue_on_timeout="false"
             firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -380,8 +304,8 @@
         </type>
     </preferences>
 
-    <preferences profiles="rpi,aarch64-rt">
+    <preferences profiles="rpi">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -396,11 +320,11 @@
             install_continue_on_timeout="false"
             fsmountoptions="noatime"
             firmware="uefi"
-            kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200n8 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
             bootpartition="false"
             devicepersistency="by-uuid"
             btrfs_root_is_snapshot="true"
-            efipartsize="128"
+            efipartsize="128"     
             editbootinstall="editbootinstall_rpi.sh"
             btrfs_root_is_readonly_snapshot="true"
             btrfs_quota_groups="false"
@@ -420,8 +344,8 @@
             </systemdisk>
         </type>
     </preferences>
-    <preferences profiles="aarch64-self_install,aarch64-rt-self_install">
+    <preferences profiles="aarch64-self_install">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -431,13 +355,12 @@
             image="oem"
             initrd_system="dracut"
             installiso="true"
-            installpxe="true"
             filesystem="btrfs"
             installboot="install"
             install_continue_on_timeout="false"
             firmware="uefi"
-            efipartsize="128"
+            efipartsize="128"     
-            kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+	    kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -462,22 +385,22 @@
     </preferences>
 
     <preferences profiles="s390-kvm">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
         <rpm-excludedocs>true</rpm-excludedocs>
         <locale>en_US</locale>
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
+
         <type
             image="oem"
             filesystem="btrfs"
             bootpartition="true"
             bootpartsize="300"
-            bootfilesystem="ext4"
+            bootfilesystem="ext2"
         initrd_system="dracut"
         format="qcow2"
-            kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 ignition.platform.id=metal"
+            kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
         devicepersistency="by-uuid"
             btrfs_root_is_snapshot="true"
             btrfs_root_is_readonly_snapshot="true"
@@ -500,7 +423,7 @@
 
 
     <preferences profiles="s390-dasd">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -511,9 +434,9 @@
           filesystem="btrfs"
           bootpartition="true"
           bootpartsize="300"
-          bootfilesystem="ext4"
+          bootfilesystem="ext2"
           initrd_system="dracut"
-          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1"
+          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
           devicepersistency="by-uuid"
           target_blocksize="4096"
           btrfs_root_is_snapshot="true"
@@ -538,7 +461,7 @@
 
 
     <preferences profiles="s390-fba">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -549,9 +472,9 @@
           filesystem="btrfs"
           bootpartition="true"
           bootpartsize="300"
-          bootfilesystem="ext4"
+          bootfilesystem="ext2"
           initrd_system="dracut"
-          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1"
+          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
           devicepersistency="by-uuid"
           btrfs_root_is_snapshot="true"
           btrfs_root_is_readonly_snapshot="true"
@@ -572,47 +495,9 @@
         </type>
     </preferences>
 
-    <preferences profiles="s390-fcp">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <type
-          image="oem"
-          filesystem="btrfs"
-          installpxe="true"
-          bootpartition="true"
-          bootpartsize="300"
-          bootfilesystem="ext4"
-          initrd_system="dracut"
-          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1"
-          devicepersistency="by-uuid"
-          btrfs_root_is_snapshot="true"
-          btrfs_root_is_readonly_snapshot="true"
-          btrfs_quota_groups="true"
-        >
-            <oemconfig>
-                <oem-multipath-scan>true</oem-multipath-scan>
-            </oemconfig>
-            <bootloader name="grub2_s390x_emu" console="serial" timeout="3" targettype="SCSI"/>
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/s390x-emu" mountpoint="boot/grub2/s390x-emu"/>
-                <volume name="boot/writable"/>
-                <volume name="usr/local"/>
-                <volume name="var" copy_on_write="false"/>
-            </systemdisk>
-            <size unit="G">5</size>
-        </type>
-    </preferences>
 
     <preferences profiles="x86-vmware">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -647,7 +532,7 @@
         </type>
     </preferences>
     <preferences profiles="x86-qcow">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -658,7 +543,7 @@
             format="qcow2"
             filesystem="btrfs"
             firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=qemu"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=qemu"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -682,9 +567,9 @@
             <size unit="G">32</size>
         </type>
     </preferences>
-
+ 
     <preferences profiles="aarch64-qcow">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -695,8 +580,8 @@
             format="qcow2"
             filesystem="btrfs"
             firmware="uefi"
-            efipartsize="128"
+            efipartsize="128"     
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=qemu"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=qemu"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -707,7 +592,7 @@
             <systemdisk>
                 <volume name="home"/>
                 <volume name="root"/>
-                <volume name="opt"/>
+ 		<volume name="opt"/>
                 <volume name="srv"/>
                 <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
                 <volume name="boot/writable"/>
@@ -718,161 +603,6 @@
         </type>
     </preferences>
 
-    <preferences profiles="ppc64le-512ss">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-    <preferences profiles="ppc64le-4096ss">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- TODO: supposedly this is needed as type attribute, but kiwi needs patching
-             disk_start_sector="256" -->
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            target_blocksize="4096"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-
-    <preferences profiles="ppc64le-512ss-self_install">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            installiso="true"
-            installpxe="true"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <installmedia>
-                <initrd action="omit">
-                    <dracut module="drm"/>
-                </initrd>
-            </installmedia>
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-    <preferences profiles="ppc64le-4096ss-self_install">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- TODO: supposedly this is needed as type attribute, but kiwi needs patching
-             disk_start_sector="256" -->
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            installiso="true"
-            installpxe="true"
-            target_blocksize="4096"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <installmedia>
-                <initrd action="omit">
-                    <dracut module="drm"/>
-                </initrd>
-            </installmedia>
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-
-
    <repository type="rpm-md" >
         <source path='obsrepositories:/'/>
     </repository>
@@ -886,7 +616,7 @@
 	<package name="patterns-base-kvm_host"/>
 	<package name="lzop"/>
         <namedCollection name="container_runtime_podman"/>
-        <package name="patterns-container-runtime_podman"/>
+        <package name="patterns-container-runtime_podman"/> 
         <namedCollection name="cockpit"/>
         <package name="patterns-base-cockpit"/>
         <namedCollection name="selinux"/>
@@ -898,6 +628,7 @@
         <package name="firewalld"/>
         <package name="wpa_supplicant" arch="x86_64,aarch64"/>
 	<package name="libpwquality-tools"/>
+        <!-- <package name="k3s-install"/> -->
     </packages>
 
     <packages type="image" profiles="x86-encrypted,x86-rt-encrypted">
@@ -916,7 +647,9 @@
         <namedCollection name="base_transactional"/>
         <package name="patterns-base-transactional"/>
         <namedCollection name="container_runtime_podman"/>
-        <package name="patterns-container-runtime_podman"/>
+        <package name="patterns-container-runtime_podman"/> 
+        <namedCollection name="cockpit"/>
+        <package name="patterns-base-cockpit"/>
         <namedCollection name="selinux"/>
         <package name="patterns-base-selinux"/>
         <package name="suseconnect-ng"/>
@@ -970,7 +703,7 @@
         <package name="NetworkManager"/>
         <package name="NetworkManager-branding-SLE"/>
 	<package name="ModemManager"/>
-	<!-- FIXME does not build without control file which is obsolete
+	<!-- FIXME does not build without control file which is obsolete 
 	<package name="live-add-yast-repos"/> -->
 	<package name="parted"/> <!-- seems missing to deploy the image -->
     </packages>
@@ -980,8 +713,7 @@
         <package name="grub2-x86_64-efi" arch="x86_64"/>
         <package name="grub2-arm64-efi" arch="aarch64"/>
         <package name="grub2-s390x-emu" arch="s390x"/>
-        <package name="grub2-powerpc-ieee1275" arch="ppc64le"/>
+        <package name="grub2-branding-SLE" bootinclude="true" arch="x86_64,aarch64"/>
-        <package name="grub2-branding-SLE" bootinclude="true" arch="x86_64,aarch64,ppc64le"/>
         <package name="grub2-snapper-plugin"/>
         <package name="shim" arch="x86_64,aarch64"/>
 	<package name="mokutil" arch="x86_64,aarch64"/>
@@ -989,44 +721,46 @@
 	    <package name="kpartx" arch="s390x"/>--> <!-- previous releases picked it always, now kiwi picks partx instead -->
     </packages>
     <!-- rpi kernel-default-base does not provide all necessary drivers -->
-    <packages type="image" profiles="rpi,aarch64-self_install,x86,x86-encrypted,x86-legacy,x86-self_install,x86-vmware,x86-qcow,aarch64-qcow,s390-kvm,s390-dasd,s390-fba,s390-fcp,ppc64le-512ss,ppc64le-4096ss,ppc64le-512ss-self_install,ppc64le-4096ss-self_install">
+    <packages type="image" profiles="x86,x86-encrypted,x86-legacy,x86-self_install,x86-vmware,x86-qcow,aarch64-qcow,s390-kvm,s390-dasd,s390-fba">
         <package name="kernel-default"/>
         <package name="kernel-firmware-all"/>
     </packages>
-    <packages type="image" profiles="x86-rt,x86-rt-self_install,x86-rt-encrypted,aarch64-rt,aarch64-rt-self_install">
+    <packages type="image" profiles="x86-rt,x86-rt-self_install,x86-rt-encrypted">
         <package name="kernel-rt"/>
-        <package name="kernel-firmware-all"/>
+	<package name="kernel-firmware-all"/>
-	<!-- FIXME intentionally removed from ALP code stream
+	<!-- FIXME intentionally removed from ALP code stream 
-        <package name="cpuset"/> -->
+	<package name="cpuset"/> -->
     </packages>
-    <packages type="image" profiles="s390-kvm,s390-dasd,s390-fba,s390-fcp">
+    <!-- makes the image build, but also include kernel-default
-        <package name="dracut-kiwi-oem-dump"/>
+    <packages type="image" profiles="x86-rt-encrypted">
+        <package name="kernel-default-extra"/>
+    </packages> -->
+    <packages type="image" profiles="s390-kvm,s390-dasd,s390-fba">
         <package name="dracut-kiwi-oem-repart"/>
         <package name="blog"/>
     </packages>
-    <!-- FCP is usually used multipathed. -->
+    <packages type="image" profiles="x86,x86-encrypted,x86-rt-encrypted,x86-self_install,x86-legacy,x86-vmware,x86-rt,x86-rt-self_install,x86-qcow,aarch64-qcow,rpi,aarch64-self_install">
-    <packages type="image" profiles="s390-fcp">
-        <package name="multipath-tools"/>
-    </packages>
-    <packages type="image" profiles="x86,x86-encrypted,x86-rt-encrypted,x86-self_install,x86-legacy,x86-vmware,x86-rt,x86-rt-self_install,x86-qcow,aarch64-qcow,rpi,aarch64-self_install,aarch64-rt,aarch64-rt-self_install,ppc64le-512ss,ppc64le-4096ss,ppc64le-512ss-self_install,ppc64le-4096ss-self_install">
         <package name="dracut-kiwi-oem-repart"/>
         <package name="dracut-kiwi-oem-dump"/>
     </packages>
-    <packages type="image" profiles="rpi,aarch64-self_install,aarch64-rt,aarch64-rt-self_install">
+    <packages type="image" profiles="rpi,aarch64-self_install">
         <package name="raspberrypi-firmware" arch="aarch64"/>
         <package name="raspberrypi-firmware-config" arch="aarch64"/>
         <package name="raspberrypi-firmware-dt" arch="aarch64"/>
         <package name="u-boot-rpiarm64" arch="aarch64"/>
         <package name="dracut-kiwi-oem-repart"/>
         <package name="bcm43xx-firmware"/>
+        <package name="kernel-firmware-all"/><!-- Fix choice between kernel-firmware and kernel-firmware-all -->
         <package name="wireless-regdb"/>
         <package name="wireless-tools"/>
         <package name="wpa_supplicant"/>
         <package name="grub2-arm64-efi"/>
+        <!-- kernel-default-base does not have all required drivers -->
+        <package name="kernel-default"/>
     </packages>
     <packages type="bootstrap">
-        <package name="filesystem"/>
         <package name="coreutils"/>
+        <package name="filesystem"/>
         <package name="ca-certificates"/>
         <package name="ca-certificates-mozilla"/>
     </packages>
@@ -1040,14 +774,4 @@
     <packages type="image" profiles="x86-qcow,aarch64-qcow">
         <package name="qemu-guest-agent"/>
     </packages>
-
-    <!-- jsc#PED-8599 -->
-    <packages type="image" profiles="Base,Base-encrypted,Base-RT,Base-RT-encrypted,Base-fba,Base-dasd,Base-fcp,Base-512,Base-4096,Default,Default-encrypted,Default-fba,Default-dasd,Default-fcp,Default-512,Default-4096">
-        <package name="usbguard"/>
-    </packages>
-
-    <!-- jsc#PED-8788 -->
-    <packages type="image" profiles="Base-RT,Base-RT-encrypted,x86-rt-encrypted,x86-rt,x86-rt-self_install,aarch64-rt,aarch64-rt-self_install">
-        <package name="stalld"/>
-    </packages>
 </image>

kiwi-builder-image/SL-Micro.kiwi.4096

@@ -33,12 +33,6 @@
         <profile name="aarch64-self_install" description="Raw disk for aarch64" arch="aarch64">
             <requires profile="bootloader"/>
         </profile>
-        <profile name="aarch64-rt" description="Raw disk for aarch64 with RT kernel" arch="aarch64">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="aarch64-rt-self_install" description="Raw disk for aarch64 with RT kernel" arch="aarch64">
-            <requires profile="bootloader"/>
-        </profile>
         <profile name="x86-legacy" description="Raw disk for x86_64 - legacy boot" arch="x86_64">
             <requires profile="bootloader"/>
         </profile>
@@ -69,21 +63,6 @@
         <profile name="s390-fba" description="Raw disk for s390 - DASD" arch="s390x">
             <requires profile="bootloader"/>
         </profile>
-        <profile name="s390-fcp" description="Raw disk for s390 - SCSI" arch="s390x">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-512ss" description="Raw disk for PPc64 - 512 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-4096ss" description="Raw disk for PPc64 - 4096 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-512ss-self_install" description="Raw disk for PPc64 - 512 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
-        <profile name="ppc64le-4096ss-self_install" description="Raw disk for PPc64 - 4096 sector size" arch="ppc64le">
-            <requires profile="bootloader"/>
-        </profile>
         <!-- Images (flavor + platform) -->
         <profile name="Default" description="SL Micro with Podman and KVM as raw image with uEFI boot" arch="x86_64">
             <requires profile="full"/>
@@ -161,15 +140,6 @@
             <requires profile="x86-rt-self_install"/>
             <requires profile="self_install"/>
         </profile>
-        <profile name="Base-RT" description="SL Micro with Podman as raw image with uEFI boot" arch="aarch64">
-            <requires profile="container-host"/>
-            <requires profile="aarch64-rt"/>
-        </profile>
-        <profile name="Base-RT-SelfInstall" description="SL Micro with Podman as raw image with uEFI boot - SelfInstall" arch="aarch64">
-            <requires profile="container-host"/>
-            <requires profile="aarch64-rt-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
         <profile name="Default-qcow" description="SL Micro with Podman and KVM as raw image for KVM on System z" arch="s390x">
             <requires profile="full"/>
             <requires profile="s390-kvm"/>
@@ -194,14 +164,6 @@
             <requires profile="container-host"/>
             <requires profile="s390-fba"/>
         </profile>
-        <profile name="Default-fcp" description="SL Micro with Podman and KVM as raw image for zFCP on System z" arch="s390x">
-            <requires profile="full"/>
-            <requires profile="s390-fcp"/>
-        </profile>
-        <profile name="Base-fcp" description="SL Micro with Podman as raw image for zFCP on System z" arch="s390x">
-            <requires profile="container-host"/>
-            <requires profile="s390-fcp"/>
-        </profile>
         <profile name="Default-legacy" description="SL Micro with Podman as raw image with legacy boot" arch="x86_64">
             <requires profile="full"/>
             <requires profile="x86-legacy"/>
@@ -222,47 +184,10 @@
 	    <requires profile="container-host"/>
 	    <requires profile="aarch64-qcow"/>
         </profile>
-
-	<profile name="Base-512" description="SL Micro with Podman as raw image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-512ss"/>
-        </profile>
-	<profile name="Base-4096" description="SL Micro with Podman as raw image for ppc64le with 4096b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-4096ss"/>
-        </profile>
-	<profile name="Base-512-SelfInstall" description="SL Micro with Podman as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-512ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
-	<profile name="Base-4096-SelfInstall" description="SL Micro with Podman as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="container-host"/>
-            <requires profile="ppc64le-4096ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
-	<profile name="Default-512" description="SL Micro with Podman and KVM as raw image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-512ss"/>
-        </profile>
-	<profile name="Default-4096" description="SL Micro with Podman and KVM as raw image for ppc64le with 4096b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-4096ss"/>
-        </profile>
-	<profile name="Default-512-SelfInstall" description="SL Micro with Podman and KVM as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-512ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
-	<profile name="Default-4096-SelfInstall" description="SL Micro with Podman and KVM as self-install image for ppc64le with 512b sector size" arch="ppc64le">
-            <requires profile="full"/>
-            <requires profile="ppc64le-4096ss-self_install"/>
-            <requires profile="self_install"/>
-        </profile>
     </profiles>
 
     <preferences profiles="x86-encrypted,x86-rt-encrypted">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -273,7 +198,7 @@
             initrd_system="dracut"
             filesystem="btrfs"
             firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -288,7 +213,7 @@
             efipartsize="200"
         >
             <luksformat>
-                <option name="--cipher" value="aes-xts-plain64"/>
+                <option name="--cipher" value="aes"/>
             </luksformat>
             <bootloader name="grub2" console="gfxterm" use_disk_password="true" />
             <systemdisk>
@@ -307,7 +232,7 @@
         </type>
     </preferences>
     <preferences profiles="x86,x86-rt">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -318,7 +243,7 @@
             initrd_system="dracut"
             filesystem="btrfs"
             firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -345,7 +270,7 @@
     </preferences>
 
     <preferences profiles="x86-self_install,x86-rt-self_install">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -355,12 +280,11 @@
             image="oem"
             initrd_system="dracut"
             installiso="true"
-            installpxe="true"
             filesystem="btrfs"
             installboot="install"
             install_continue_on_timeout="false"
             firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -386,8 +310,8 @@
         </type>
     </preferences>
 
-    <preferences profiles="rpi,aarch64-rt">
+    <preferences profiles="rpi">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -402,7 +326,7 @@
             install_continue_on_timeout="false"
             fsmountoptions="noatime"
             firmware="uefi"
-            kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+            kernelcmdline="console=ttyS0,115200n8 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
             bootpartition="false"
             devicepersistency="by-uuid"
             btrfs_root_is_snapshot="true"
@@ -426,8 +350,8 @@
             </systemdisk>
         </type>
     </preferences>
-    <preferences profiles="aarch64-self_install,aarch64-rt-self_install">
+    <preferences profiles="aarch64-self_install">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -437,13 +361,12 @@
             image="oem"
             initrd_system="dracut"
             installiso="true"
-            installpxe="true"
             filesystem="btrfs"
             installboot="install"
             install_continue_on_timeout="false"
             firmware="uefi"
             efipartsize="128"
-            kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0"
+	    kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -468,22 +391,22 @@
     </preferences>
 
     <preferences profiles="s390-kvm">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
         <rpm-excludedocs>true</rpm-excludedocs>
         <locale>en_US</locale>
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
+
         <type
             image="oem"
             filesystem="btrfs"
             bootpartition="true"
             bootpartsize="300"
-            bootfilesystem="ext4"
+            bootfilesystem="ext2"
         initrd_system="dracut"
         format="qcow2"
-            kernelcmdline="security=selinux selinux=1 quiet systemd.show_status=1 ignition.platform.id=metal"
+            kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
         devicepersistency="by-uuid"
             btrfs_root_is_snapshot="true"
             btrfs_root_is_readonly_snapshot="true"
@@ -506,7 +429,7 @@
 
 
     <preferences profiles="s390-dasd">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -517,9 +440,9 @@
           filesystem="btrfs"
           bootpartition="true"
           bootpartsize="300"
-          bootfilesystem="ext4"
+          bootfilesystem="ext2"
           initrd_system="dracut"
-          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1"
+          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
           devicepersistency="by-uuid"
           target_blocksize="4096"
           btrfs_root_is_snapshot="true"
@@ -544,7 +467,7 @@
 
 
     <preferences profiles="s390-fba">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -555,9 +478,9 @@
           filesystem="btrfs"
           bootpartition="true"
           bootpartsize="300"
-          bootfilesystem="ext4"
+          bootfilesystem="ext2"
           initrd_system="dracut"
-          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1"
+          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
           devicepersistency="by-uuid"
           btrfs_root_is_snapshot="true"
           btrfs_root_is_readonly_snapshot="true"
@@ -578,47 +501,9 @@
         </type>
     </preferences>
 
-    <preferences profiles="s390-fcp">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <type
-          image="oem"
-          filesystem="btrfs"
-          installpxe="true"
-          bootpartition="true"
-          bootpartsize="300"
-          bootfilesystem="ext4"
-          initrd_system="dracut"
-          kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet systemd.show_status=1"
-          devicepersistency="by-uuid"
-          btrfs_root_is_snapshot="true"
-          btrfs_root_is_readonly_snapshot="true"
-          btrfs_quota_groups="true"
-        >
-            <oemconfig>
-                <oem-multipath-scan>true</oem-multipath-scan>
-            </oemconfig>
-            <bootloader name="grub2_s390x_emu" console="serial" timeout="3" targettype="SCSI"/>
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/s390x-emu" mountpoint="boot/grub2/s390x-emu"/>
-                <volume name="boot/writable"/>
-                <volume name="usr/local"/>
-                <volume name="var" copy_on_write="false"/>
-            </systemdisk>
-            <size unit="G">5</size>
-        </type>
-    </preferences>
 
     <preferences profiles="x86-vmware">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -653,7 +538,7 @@
         </type>
     </preferences>
     <preferences profiles="x86-qcow">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -664,7 +549,7 @@
             format="qcow2"
             filesystem="btrfs"
             firmware="uefi"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=qemu"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=qemu"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -692,7 +577,7 @@
     </preferences>
 
     <preferences profiles="aarch64-qcow">
-        <version>6.1</version>
+        <version>6.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>SLE</bootsplash-theme>
         <bootloader-theme>SLE</bootloader-theme>
@@ -704,7 +589,7 @@
             filesystem="btrfs"
             firmware="uefi"
             efipartsize="128"
-            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=qemu"
+            kernelcmdline="console=ttyS0,115200 console=tty0 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=qemu"
             bootpartition="false"
             bootkernel="custom"
             devicepersistency="by-uuid"
@@ -715,7 +600,7 @@
             <systemdisk>
                 <volume name="home"/>
                 <volume name="root"/>
-                <volume name="opt"/>
+ 		<volume name="opt"/>
                 <volume name="srv"/>
                 <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
                 <volume name="boot/writable"/>
@@ -726,161 +611,6 @@
         </type>
     </preferences>
 
-    <preferences profiles="ppc64le-512ss">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-    <preferences profiles="ppc64le-4096ss">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- TODO: supposedly this is needed as type attribute, but kiwi needs patching
-             disk_start_sector="256" -->
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            target_blocksize="4096"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-
-    <preferences profiles="ppc64le-512ss-self_install">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            installiso="true"
-            installpxe="true"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <installmedia>
-                <initrd action="omit">
-                    <dracut module="drm"/>
-                </initrd>
-            </installmedia>
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-    <preferences profiles="ppc64le-4096ss-self_install">
-        <version>6.1</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>SLE</bootsplash-theme>
-        <bootloader-theme>SLE</bootloader-theme>
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <locale>en_US</locale>
-        <!-- TODO: supposedly this is needed as type attribute, but kiwi needs patching
-             disk_start_sector="256" -->
-        <!-- Use ignition.platform.id=metal to avoid bsc#1227689 -->
-        <type
-            image="oem"
-            installiso="true"
-            installpxe="true"
-            target_blocksize="4096"
-            filesystem="btrfs"
-            firmware="ofw"
-            kernelcmdline="console=hvc0,115200 security=selinux selinux=1 quiet systemd.show_status=1 net.ifnames=0 ignition.platform.id=metal"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
-            btrfs_quota_groups="true"
-        >
-            <installmedia>
-                <initrd action="omit">
-                    <dracut module="drm"/>
-                </initrd>
-            </installmedia>
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-		<!-- on tmpfs jsc#SMO-2                <volume name="tmp"/> -->
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/powerpc-ieee1275"/>
-                <volume name="boot/writable"/>
-		<volume name="usr/local"/>
-		<volume name="var" copy_on_write="false"/>
-            </systemdisk>
-        </type>
-    </preferences>
-
-
    <repository type="rpm-md" >
         <source path='obsrepositories:/'/>
     </repository>
@@ -925,6 +655,8 @@
         <package name="patterns-base-transactional"/>
         <namedCollection name="container_runtime_podman"/>
         <package name="patterns-container-runtime_podman"/>
+        <namedCollection name="cockpit"/>
+        <package name="patterns-base-cockpit"/>
         <namedCollection name="selinux"/>
         <package name="patterns-base-selinux"/>
         <package name="suseconnect-ng"/>
@@ -988,8 +720,7 @@
         <package name="grub2-x86_64-efi" arch="x86_64"/>
         <package name="grub2-arm64-efi" arch="aarch64"/>
         <package name="grub2-s390x-emu" arch="s390x"/>
-        <package name="grub2-powerpc-ieee1275" arch="ppc64le"/>
+        <package name="grub2-branding-SLE" bootinclude="true" arch="x86_64,aarch64"/>
-        <package name="grub2-branding-SLE" bootinclude="true" arch="x86_64,aarch64,ppc64le"/>
         <package name="grub2-snapper-plugin"/>
         <package name="shim" arch="x86_64,aarch64"/>
 	<package name="mokutil" arch="x86_64,aarch64"/>
@@ -997,44 +728,46 @@
 	    <package name="kpartx" arch="s390x"/>--> <!-- previous releases picked it always, now kiwi picks partx instead -->
     </packages>
     <!-- rpi kernel-default-base does not provide all necessary drivers -->
-    <packages type="image" profiles="rpi,aarch64-self_install,x86,x86-encrypted,x86-legacy,x86-self_install,x86-vmware,x86-qcow,aarch64-qcow,s390-kvm,s390-dasd,s390-fba,s390-fcp,ppc64le-512ss,ppc64le-4096ss,ppc64le-512ss-self_install,ppc64le-4096ss-self_install">
+    <packages type="image" profiles="x86,x86-encrypted,x86-legacy,x86-self_install,x86-vmware,x86-qcow,aarch64-qcow,s390-kvm,s390-dasd,s390-fba">
         <package name="kernel-default"/>
         <package name="kernel-firmware-all"/>
     </packages>
-    <packages type="image" profiles="x86-rt,x86-rt-self_install,x86-rt-encrypted,aarch64-rt,aarch64-rt-self_install">
+    <packages type="image" profiles="x86-rt,x86-rt-self_install,x86-rt-encrypted">
         <package name="kernel-rt"/>
-        <package name="kernel-firmware-all"/>
+	<package name="kernel-firmware-all"/>
 	<!-- FIXME intentionally removed from ALP code stream
-        <package name="cpuset"/> -->
+	<package name="cpuset"/> -->
     </packages>
-    <packages type="image" profiles="s390-kvm,s390-dasd,s390-fba,s390-fcp">
+    <!-- makes the image build, but also include kernel-default
-        <package name="dracut-kiwi-oem-dump"/>
+    <packages type="image" profiles="x86-rt-encrypted">
+        <package name="kernel-default-extra"/>
+    </packages> -->
+    <packages type="image" profiles="s390-kvm,s390-dasd,s390-fba">
         <package name="dracut-kiwi-oem-repart"/>
         <package name="blog"/>
     </packages>
-    <!-- FCP is usually used multipathed. -->
+    <packages type="image" profiles="x86,x86-encrypted,x86-rt-encrypted,x86-self_install,x86-legacy,x86-vmware,x86-rt,x86-rt-self_install,x86-qcow,aarch64-qcow,rpi,aarch64-self_install">
-    <packages type="image" profiles="s390-fcp">
-        <package name="multipath-tools"/>
-    </packages>
-    <packages type="image" profiles="x86,x86-encrypted,x86-rt-encrypted,x86-self_install,x86-legacy,x86-vmware,x86-rt,x86-rt-self_install,x86-qcow,aarch64-qcow,rpi,aarch64-self_install,aarch64-rt,aarch64-rt-self_install,ppc64le-512ss,ppc64le-4096ss,ppc64le-512ss-self_install,ppc64le-4096ss-self_install">
         <package name="dracut-kiwi-oem-repart"/>
         <package name="dracut-kiwi-oem-dump"/>
     </packages>
-    <packages type="image" profiles="rpi,aarch64-self_install,aarch64-rt,aarch64-rt-self_install">
+    <packages type="image" profiles="rpi,aarch64-self_install">
         <package name="raspberrypi-firmware" arch="aarch64"/>
         <package name="raspberrypi-firmware-config" arch="aarch64"/>
         <package name="raspberrypi-firmware-dt" arch="aarch64"/>
         <package name="u-boot-rpiarm64" arch="aarch64"/>
         <package name="dracut-kiwi-oem-repart"/>
         <package name="bcm43xx-firmware"/>
+        <package name="kernel-firmware-all"/><!-- Fix choice between kernel-firmware and kernel-firmware-all -->
         <package name="wireless-regdb"/>
         <package name="wireless-tools"/>
         <package name="wpa_supplicant"/>
         <package name="grub2-arm64-efi"/>
+        <!-- kernel-default-base does not have all required drivers -->
+        <package name="kernel-default"/>
     </packages>
     <packages type="bootstrap">
-        <package name="filesystem"/>
         <package name="coreutils"/>
+        <package name="filesystem"/>
         <package name="ca-certificates"/>
         <package name="ca-certificates-mozilla"/>
     </packages>
@@ -1048,14 +781,4 @@
     <packages type="image" profiles="x86-qcow,aarch64-qcow">
         <package name="qemu-guest-agent"/>
     </packages>
-
+</image>
-    <!-- jsc#PED-8599 -->
-    <packages type="image" profiles="Base,Base-encrypted,Base-RT,Base-RT-encrypted,Base-fba,Base-dasd,Base-fcp,Base-512,Base-4096,Default,Default-encrypted,Default-fba,Default-dasd,Default-fcp,Default-512,Default-4096">
-        <package name="usbguard"/>
-    </packages>
-
-    <!-- jsc#PED-8788 -->
-    <packages type="image" profiles="Base-RT,Base-RT-encrypted,x86-rt-encrypted,x86-rt,x86-rt-self_install,aarch64-rt,aarch64-rt-self_install">
-        <package name="stalld"/>
-    </packages>
-</image>

kiwi-builder-image/_service

@@ -16,4 +16,14 @@
     <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
     <param name="var">SUPPORT_LEVEL</param>
   </service>
+  <service mode="buildtime" name="replace_using_package_version">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%kiwi_version%%</param>
+    <param name="package">python3-kiwi</param>
+  </service>
+  <service mode="buildtime" name="replace_using_package_version">
+    <param name="file">README</param>
+    <param name="regex">%%kiwi_version%%</param>
+    <param name="package">python3-kiwi</param>
+  </service>
 </services>

kiwi-builder-image/build-image.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -27,9 +27,9 @@ LARGEBLOCK=false
 # Print usage
 usage(){
   cat <<-EOF
-  =====================================
+  ==============================
-  SUSE Linux Micro 6.1 Kiwi SDK Builder
+  SLE Micro 6.0 Kiwi SDK Builder
-  =====================================
+  ==============================
 
   Usage: ${0} [-p <profile>] [-b]
 

kiwi-builder-image/config.sh

@@ -35,6 +35,14 @@ mkdir /var/lib/misc/reconfig_system
 #--------------------------------------
 echo "Configure image: [$kiwi_iname]-[$kiwi_profiles]..."
 
+#======================================
+# This is a workaround - someone,
+# somewhere needs to load the xts crypto
+# module, otherwise luksOpen will fail while
+# creating the image.
+#--------------------------------------
+modprobe xts || true
+
 #======================================
 # add missing fonts
 #--------------------------------------
@@ -131,6 +139,9 @@ for i in /usr/lib/rpm/gnupg/keys/gpg-pubkey*asc; do
     rpm --import $i || true
 done
 
+# Temporary workaround for bsc#1212187
+echo "techpreview.ZYPP_MEDIANETWORK=1" >> /etc/zypp/zypp.conf
+
 #======================================
 # Enable kubelet if installed
 #--------------------------------------
@@ -159,18 +170,8 @@ if [ "${kiwi_btrfs_root_is_snapshot-false}" = 'true' ]; then
 	sed -i'' 's/^NUMBER_LIMIT_IMPORTANT=.*$/NUMBER_LIMIT_IMPORTANT="4-10"/g' /etc/snapper/configs/root
 fi
 
-# Enable multipathd for MP images
+# Enable jeos-firstboot if installed, disabled by combustion/ignition
-if [ "${kiwi_oemmultipath_scan-false}" = 'true' ]; then
+if rpm -q --whatprovides jeos-firstboot >/dev/null; then
-        systemctl enable multipathd.service
-fi
-
-# On those s390 targets the console is not capable of running jeos-firstboot,
-# use systemd-firstboot as minimal alternative.
-if [[ "$kiwi_profiles" =~ s390-(dasd|fba|fcp) ]]; then
-	systemctl enable systemd-firstboot
-	# Enable prompting for the root password
-	echo 'root:!unprovisioned' | chpasswd -e
-elif rpm -q --whatprovides jeos-firstboot >/dev/null; then
         mkdir -p /var/lib/YaST2
         touch /var/lib/YaST2/reconfig_system
         systemctl enable jeos-firstboot.service
@@ -280,7 +281,7 @@ if [[ "$kiwi_profiles" == *"RaspberryPi"* ]]; then
 		options smsc95xx turbo_mode=N
 	EOF
 
-	cat > /etc/sysctl.d/50-rpi3.conf <<-EOF
+	cat > /usr/lib/sysctl.d/50-rpi3.conf <<-EOF
 		# Avoid running out of DMA pages for smsc95xx (bsc#1012449)
 		vm.min_free_kbytes = 2048
 	EOF

kubevirt-dashboard-extension-chart/Chart.yaml

@@ -13,9 +13,10 @@ annotations:
   catalog.cattle.io/ui-component: plugins
   catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
 apiVersion: v2
-appVersion: 1.2.1
+appVersion: 302.0.0+up1.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.1"
+icon: >-
+  https://raw.githubusercontent.com/cncf/artwork/master/projects/kubevirt/icon/color/kubevirt-icon-color.svg

kubevirt-dashboard-extension-chart/templates/_helpers.tpl

@@ -38,7 +38,7 @@ Common labels
 helm.sh/chart: {{ include "extension-server.chart" . }}
 {{ include "extension-server.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | replace "+" "_" | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
@@ -60,4 +60,4 @@ Pkg annotations
 {{ $key }}: {{ $value | quote }}
 {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}

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/302.0.0+up1.2.1
     noCache: {{ .Values.plugin.noCache }}
     noAuth: {{ .Values.plugin.noAuth }}
     metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}

metal3-chart/Chart.yaml

@@ -1,12 +1,12 @@
-#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.10.0
+#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.1_up0.9.4
-#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.10.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.1_up0.9.4-%RELEASE%
 apiVersion: v2
-appVersion: 0.10.0
+appVersion: 0.9.4
 dependencies:
 - alias: metal3-baremetal-operator
   name: baremetal-operator
   repository: file://./charts/baremetal-operator
-  version: 0.9.0
+  version: 0.6.1
 - alias: metal3-ironic
   name: ironic
   repository: file://./charts/ironic
@@ -25,4 +25,4 @@ description: A Helm chart that installs all of the dependencies needed for Metal
 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.10.0"
+version: "%%CHART_MAJOR%%.0.1+up0.9.4"

metal3-chart/charts/baremetal-operator/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 0.9.0
+appVersion: 0.8.0
 description: A Helm chart for baremetal-operator, used by Metal3
 name: baremetal-operator
 type: application
-version: 0.9.0
+version: 0.6.1

metal3-chart/charts/baremetal-operator/crds/customresource-bmceventsubscriptions.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     clusterctl.cluster.x-k8s.io: ""
   name: bmceventsubscriptions.metal3.io
@@ -34,19 +34,14 @@ spec:
         description: BMCEventSubscription is the Schema for the fast eventing API
         properties:
           apiVersion:
-            description: |-
+            description: 'APIVersion defines the versioned schema of this representation
-              APIVersion defines the versioned schema of this representation of an object.
+              of an object. Servers should convert recognized schemas to the latest
-              Servers should convert recognized schemas to the latest internal value, and
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: |-
+            description: 'Kind is a string value representing the REST resource this
-              Kind is a string value representing the REST resource this object represents.
+              object represents. Servers may infer this from the endpoint the client
-              Servers may infer this from the endpoint the client submits requests to.
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              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
@@ -62,9 +57,8 @@ spec:
                 description: A reference to a BareMetalHost
                 type: string
               httpHeadersRef:
-                description: |-
+                description: A secret containing HTTP headers which should be passed
-                  A secret containing HTTP headers which should be passed along to the Destination
+                  along to the Destination when making a request
-                  when making a request
                 properties:
                   name:
                     description: name is unique within a namespace to reference a

metal3-chart/charts/baremetal-operator/crds/customresource-dataimages.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: dataimages.metal3.io
 spec:
   group: metal3.io
@@ -20,19 +20,14 @@ spec:
         description: DataImage is the Schema for the dataimages API.
         properties:
           apiVersion:
-            description: |-
+            description: 'APIVersion defines the versioned schema of this representation
-              APIVersion defines the versioned schema of this representation of an object.
+              of an object. Servers should convert recognized schemas to the latest
-              Servers should convert recognized schemas to the latest internal value, and
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: |-
+            description: 'Kind is a string value representing the REST resource this
-              Kind is a string value representing the REST resource this object represents.
+              object represents. Servers may infer this from the endpoint the client
-              Servers may infer this from the endpoint the client submits requests to.
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              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
@@ -40,8 +35,7 @@ spec:
             description: DataImageSpec defines the desired state of DataImage.
             properties:
               url:
-                description: |-
+                description: Url is the address of the dataImage that we want to attach
-                  Url is the address of the dataImage that we want to attach
                   to a BareMetalHost
                 type: string
             required:

metal3-chart/charts/baremetal-operator/crds/customresource-firmwareschemas.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     clusterctl.cluster.x-k8s.io: ""
   name: firmwareschemas.metal3.io
@@ -22,19 +22,14 @@ spec:
         description: FirmwareSchema is the Schema for the firmwareschemas API.
         properties:
           apiVersion:
-            description: |-
+            description: 'APIVersion defines the versioned schema of this representation
-              APIVersion defines the versioned schema of this representation of an object.
+              of an object. Servers should convert recognized schemas to the latest
-              Servers should convert recognized schemas to the latest internal value, and
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: |-
+            description: 'Kind is a string value representing the REST resource this
-              Kind is a string value representing the REST resource this object represents.
+              object represents. Servers may infer this from the endpoint the client
-              Servers may infer this from the endpoint the client submits requests to.
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              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
@@ -78,9 +73,8 @@ spec:
                       description: Whether or not this setting is read only.
                       type: boolean
                     unique:
-                      description: |-
+                      description: Whether or not this setting's value is unique to
-                        Whether or not this setting's value is unique to this node, e.g.
+                        this node, e.g. a serial number.
-                        a serial number.
                       type: boolean
                     upper_bound:
                       description: The highest value for an Integer type setting.

metal3-chart/charts/baremetal-operator/crds/customresource-hardwaredata.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     clusterctl.cluster.x-k8s.io: ""
   name: hardwaredata.metal3.io
@@ -29,19 +29,14 @@ spec:
         description: HardwareData is the Schema for the hardwaredata API.
         properties:
           apiVersion:
-            description: |-
+            description: 'APIVersion defines the versioned schema of this representation
-              APIVersion defines the versioned schema of this representation of an object.
+              of an object. Servers should convert recognized schemas to the latest
-              Servers should convert recognized schemas to the latest internal value, and
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: |-
+            description: 'Kind is a string value representing the REST resource this
-              Kind is a string value representing the REST resource this object represents.
+              object represents. Servers may infer this from the endpoint the client
-              Servers may infer this from the endpoint the client submits requests to.
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              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
@@ -52,7 +47,7 @@ spec:
                 description: The hardware discovered on the host during its inspection.
                 properties:
                   cpu:
-                    description: Details of the CPU(s) in the system.
+                    description: CPU describes one processor on the host.
                     properties:
                       arch:
                         type: string
@@ -70,7 +65,7 @@ spec:
                         type: string
                     type: object
                   firmware:
-                    description: System firmware information.
+                    description: Firmware describes the firmware on the host.
                     properties:
                       bios:
                         description: The BIOS for this firmware
@@ -89,15 +84,14 @@ spec:
                   hostname:
                     type: string
                   nics:
-                    description: List of network interfaces for the host.
                     items:
                       description: NIC describes one network interface on the host.
                       properties:
                         ip:
-                          description: |-
+                          description: The IP address of the interface. This will
-                            The IP address of the interface. This will be an IPv4 or IPv6 address
+                            be an IPv4 or IPv6 address if one is present.  If both
-                            if one is present.  If both IPv4 and IPv6 addresses are present in a
+                            IPv4 and IPv6 addresses are present in a dual-stack environment,
-                            dual-stack environment, two nics will be output, one with each IP.
+                            two nics will be output, one with each IP.
                           type: string
                         mac:
                           description: The device MAC address
@@ -140,20 +134,16 @@ spec:
                       type: object
                     type: array
                   ramMebibytes:
-                    description: The host's amount of memory in Mebibytes.
                     type: integer
                   storage:
-                    description: List of storage (disk, SSD, etc.) available to the
-                      host.
                     items:
                       description: Storage describes one storage device (disk, SSD,
                         etc.) on the host.
                       properties:
                         alternateNames:
-                          description: |-
+                          description: A list of alternate Linux device names of the
-                            A list of alternate Linux device names of the disk, e.g. "/dev/sda".
+                            disk, e.g. "/dev/sda". Note that this list is not exhaustive,
-                            Note that this list is not exhaustive, and names may not be stable
+                            and names may not be stable across reboots.
-                            across reboots.
                           items:
                             type: string
                           type: array
@@ -164,17 +154,15 @@ spec:
                           description: Hardware model
                           type: string
                         name:
-                          description: |-
+                          description: A Linux device name of the disk, e.g. "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0".
-                            A Linux device name of the disk, e.g.
+                            This will be a name that is stable across reboots if one
-                            "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0". This will be a name
+                            is available.
-                            that is stable across reboots if one is available.
                           type: string
                         rotational:
-                          description: |-
+                          description: Whether this disk represents rotational storage.
-                            Whether this disk represents rotational storage.
+                            This field is not recommended for usage, please prefer
-                            This field is not recommended for usage, please
+                            using 'Type' field instead, this field will be deprecated
-                            prefer using 'Type' field instead, this field
+                            eventually.
-                            will be deprecated eventually.
                           type: boolean
                         serialNumber:
                           description: The serial number of the device
@@ -205,7 +193,8 @@ spec:
                       type: object
                     type: array
                   systemVendor:
-                    description: System vendor information.
+                    description: HardwareSystemVendor stores details about the whole
+                      hardware system.
                     properties:
                       manufacturer:
                         type: string

metal3-chart/charts/baremetal-operator/crds/customresource-hostfirmwarecomponents.yaml

@@ -3,9 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.12.1
-  labels:
-    clusterctl.cluster.x-k8s.io: ""
   name: hostfirmwarecomponents.metal3.io
 spec:
   group: metal3.io
@@ -23,19 +21,14 @@ spec:
           API.
         properties:
           apiVersion:
-            description: |-
+            description: 'APIVersion defines the versioned schema of this representation
-              APIVersion defines the versioned schema of this representation of an object.
+              of an object. Servers should convert recognized schemas to the latest
-              Servers should convert recognized schemas to the latest internal value, and
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: |-
+            description: 'Kind is a string value representing the REST resource this
-              Kind is a string value representing the REST resource this object represents.
+              object represents. Servers may infer this from the endpoint the client
-              Servers may infer this from the endpoint the client submits requests to.
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              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
@@ -89,35 +82,43 @@ spec:
                 description: Track whether updates stored in the spec are valid based
                   on the schema
                 items:
-                  description: Condition contains details for one aspect of the current
+                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.
+                    state of this API Resource. --- This struct is intended for direct
+                    use as an array at the field path .status.conditions.  For example,
+                    \n type FooStatus struct{ // Represents the observations of a
+                    foo's current state. // Known .status.conditions.type are: \"Available\",
+                    \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+                    // +listType=map // +listMapKey=type Conditions []metav1.Condition
+                    `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
+                    protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
                   properties:
                     lastTransitionTime:
-                      description: |-
+                      description: lastTransitionTime is the last time the condition
-                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        transitioned from one status to another. This should be when
-                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        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: |-
+                      description: message is a human readable message indicating
-                        message is a human readable message indicating details about the transition.
+                        details about the transition. This may be an empty string.
-                        This may be an empty string.
                       maxLength: 32768
                       type: string
                     observedGeneration:
-                      description: |-
+                      description: observedGeneration represents the .metadata.generation
-                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        that the condition was set based upon. For instance, if .metadata.generation
-                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        is currently 12, but the .status.conditions[x].observedGeneration
-                        with respect to the current state of the instance.
+                        is 9, the condition is out of date with respect to the current
+                        state of the instance.
                       format: int64
                       minimum: 0
                       type: integer
                     reason:
-                      description: |-
+                      description: reason contains a programmatic identifier indicating
-                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        the reason for the condition's last transition. Producers
-                        Producers of specific condition types may define expected values and meanings for this field,
+                        of specific condition types may define expected values and
-                        and whether the values are considered a guaranteed API.
+                        meanings for this field, and whether the values are considered
-                        The value should be a CamelCase string.
+                        a guaranteed API. The value should be a CamelCase string.
                         This field may not be empty.
                       maxLength: 1024
                       minLength: 1
@@ -132,6 +133,10 @@ spec:
                       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. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string
@@ -151,9 +156,8 @@ spec:
                 format: date-time
                 type: string
               updates:
-                description: |-
+                description: Updates is the list of all firmware components that should
-                  Updates is the list of all firmware components that should be updated
+                  be updated they are specified via name and url fields.
-                  they are specified via name and url fields.
                 items:
                   description: FirmwareUpdate defines a firmware update specification.
                   properties:

metal3-chart/charts/baremetal-operator/crds/customresource-hostfirmwaresettings.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     clusterctl.cluster.x-k8s.io: ""
   name: hostfirmwaresettings.metal3.io
@@ -25,19 +25,14 @@ spec:
           API.
         properties:
           apiVersion:
-            description: |-
+            description: 'APIVersion defines the versioned schema of this representation
-              APIVersion defines the versioned schema of this representation of an object.
+              of an object. Servers should convert recognized schemas to the latest
-              Servers should convert recognized schemas to the latest internal value, and
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: |-
+            description: 'Kind is a string value representing the REST resource this
-              Kind is a string value representing the REST resource this object represents.
+              object represents. Servers may infer this from the endpoint the client
-              Servers may infer this from the endpoint the client submits requests to.
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              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
@@ -64,35 +59,43 @@ spec:
                 description: Track whether settings stored in the spec are valid based
                   on the schema
                 items:
-                  description: Condition contains details for one aspect of the current
+                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.
+                    state of this API Resource. --- This struct is intended for direct
+                    use as an array at the field path .status.conditions.  For example,
+                    \n type FooStatus struct{ // Represents the observations of a
+                    foo's current state. // Known .status.conditions.type are: \"Available\",
+                    \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+                    // +listType=map // +listMapKey=type Conditions []metav1.Condition
+                    `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
+                    protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
                   properties:
                     lastTransitionTime:
-                      description: |-
+                      description: lastTransitionTime is the last time the condition
-                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        transitioned from one status to another. This should be when
-                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        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: |-
+                      description: message is a human readable message indicating
-                        message is a human readable message indicating details about the transition.
+                        details about the transition. This may be an empty string.
-                        This may be an empty string.
                       maxLength: 32768
                       type: string
                     observedGeneration:
-                      description: |-
+                      description: observedGeneration represents the .metadata.generation
-                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        that the condition was set based upon. For instance, if .metadata.generation
-                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        is currently 12, but the .status.conditions[x].observedGeneration
-                        with respect to the current state of the instance.
+                        is 9, the condition is out of date with respect to the current
+                        state of the instance.
                       format: int64
                       minimum: 0
                       type: integer
                     reason:
-                      description: |-
+                      description: reason contains a programmatic identifier indicating
-                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        the reason for the condition's last transition. Producers
-                        Producers of specific condition types may define expected values and meanings for this field,
+                        of specific condition types may define expected values and
-                        and whether the values are considered a guaranteed API.
+                        meanings for this field, and whether the values are considered
-                        The value should be a CamelCase string.
+                        a guaranteed API. The value should be a CamelCase string.
                         This field may not be empty.
                       maxLength: 1024
                       minLength: 1
@@ -107,6 +110,10 @@ spec:
                       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. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string
@@ -126,9 +133,8 @@ spec:
                 format: date-time
                 type: string
               schema:
-                description: |-
+                description: FirmwareSchema is a reference to the Schema used to describe
-                  FirmwareSchema is a reference to the Schema used to describe each
+                  each FirmwareSetting. By default, this will be a Schema in the same
-                  FirmwareSetting. By default, this will be a Schema in the same
                   Namespace as the settings but it can be overwritten in the Spec
                 properties:
                   name:

metal3-chart/charts/baremetal-operator/crds/customresource-hostupdatepolicies.yaml

@@ -1,62 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
-  labels:
-    clusterctl.cluster.x-k8s.io: ""
-  name: hostupdatepolicies.metal3.io
-spec:
-  group: metal3.io
-  names:
-    kind: HostUpdatePolicy
-    listKind: HostUpdatePolicyList
-    plural: hostupdatepolicies
-    singular: hostupdatepolicy
-  scope: Namespaced
-  versions:
-  - name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        description: HostUpdatePolicy is the Schema for the hostupdatepolicy 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: HostUpdatePolicySpec defines the desired state of HostUpdatePolicy.
-            properties:
-              firmwareSettings:
-                description: Defines policy for changing firmware settings
-                enum:
-                - onPreparing
-                - onReboot
-                type: string
-              firmwareUpdates:
-                description: Defines policy for updating firmware
-                enum:
-                - onPreparing
-                - onReboot
-                type: string
-            type: object
-          status:
-            description: HostUpdatePolicyStatus defines the observed state of HostUpdatePolicy.
-            type: object
-        type: object
-    served: true
-    storage: true

metal3-chart/charts/baremetal-operator/crds/customresource-preprovisioningimages.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     clusterctl.cluster.x-k8s.io: ""
   name: preprovisioningimages.metal3.io
@@ -34,19 +34,14 @@ spec:
           API.
         properties:
           apiVersion:
-            description: |-
+            description: 'APIVersion defines the versioned schema of this representation
-              APIVersion defines the versioned schema of this representation of an object.
+              of an object. Servers should convert recognized schemas to the latest
-              Servers should convert recognized schemas to the latest internal value, and
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: |-
+            description: 'Kind is a string value representing the REST resource this
-              Kind is a string value representing the REST resource this object represents.
+              object represents. Servers may infer this from the endpoint the client
-              Servers may infer this from the endpoint the client submits requests to.
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              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
@@ -67,9 +62,8 @@ spec:
                   to build the image.
                 type: string
               networkDataName:
-                description: |-
+                description: networkDataName is the name of a Secret in the local
-                  networkDataName is the name of a Secret in the local namespace that
+                  namespace that contains network data to build in to the image.
-                  contains network data to build in to the image.
                 type: string
             type: object
           status:
@@ -83,35 +77,43 @@ spec:
               conditions:
                 description: conditions describe the state of the built image
                 items:
-                  description: Condition contains details for one aspect of the current
+                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.
+                    state of this API Resource. --- This struct is intended for direct
+                    use as an array at the field path .status.conditions.  For example,
+                    \n type FooStatus struct{ // Represents the observations of a
+                    foo's current state. // Known .status.conditions.type are: \"Available\",
+                    \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+                    // +listType=map // +listMapKey=type Conditions []metav1.Condition
+                    `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
+                    protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
                   properties:
                     lastTransitionTime:
-                      description: |-
+                      description: lastTransitionTime is the last time the condition
-                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        transitioned from one status to another. This should be when
-                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        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: |-
+                      description: message is a human readable message indicating
-                        message is a human readable message indicating details about the transition.
+                        details about the transition. This may be an empty string.
-                        This may be an empty string.
                       maxLength: 32768
                       type: string
                     observedGeneration:
-                      description: |-
+                      description: observedGeneration represents the .metadata.generation
-                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        that the condition was set based upon. For instance, if .metadata.generation
-                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        is currently 12, but the .status.conditions[x].observedGeneration
-                        with respect to the current state of the instance.
+                        is 9, the condition is out of date with respect to the current
+                        state of the instance.
                       format: int64
                       minimum: 0
                       type: integer
                     reason:
-                      description: |-
+                      description: reason contains a programmatic identifier indicating
-                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        the reason for the condition's last transition. Producers
-                        Producers of specific condition types may define expected values and meanings for this field,
+                        of specific condition types may define expected values and
-                        and whether the values are considered a guaranteed API.
+                        meanings for this field, and whether the values are considered
-                        The value should be a CamelCase string.
+                        a guaranteed API. The value should be a CamelCase string.
                         This field may not be empty.
                       maxLength: 1024
                       minLength: 1
@@ -126,6 +128,10 @@ spec:
                       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. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string
@@ -141,14 +147,13 @@ spec:
                 - type
                 x-kubernetes-list-type: map
               extraKernelParams:
-                description: |-
+                description: extraKernelParams is a string with extra parameters to
-                  extraKernelParams is a string with extra parameters to pass to the
+                  pass to the kernel when booting the image over network. Only makes
-                  kernel when booting the image over network. Only makes sense for initrd images.
+                  sense for initrd images.
                 type: string
               format:
-                description: |-
+                description: 'format is the type of image that is available at the
-                  format is the type of image that is available at the download url:
+                  download url: either iso or initrd.'
-                  either iso or initrd.
                 enum:
                 - iso
                 - initrd
@@ -158,14 +163,12 @@ spec:
                   downloaded.
                 type: string
               kernelUrl:
-                description: |-
+                description: kernelUrl is the URL from which the kernel of the image
-                  kernelUrl is the URL from which the kernel of the image can be downloaded.
+                  can be downloaded. Only makes sense for initrd images.
-                  Only makes sense for initrd images.
                 type: string
               networkData:
-                description: |-
+                description: networkData is a reference to the version of the Secret
-                  networkData is a reference to the version of the Secret containing the
+                  containing the network data used to build the image.
-                  network data used to build the image.
                 properties:
                   name:
                     type: string

metal3-chart/charts/baremetal-operator/templates/clusterrole-manager.yaml

@@ -184,23 +184,3 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - metal3.io
-  resources:
-  - hostupdatepolicies
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - metal3.io
-  resources:
-  - hostupdatepolicies/status
-  verbs:
-  - get
-  - patch
-  - update

metal3-chart/charts/baremetal-operator/templates/deployment.yaml

@@ -24,8 +24,8 @@ spec:
     spec:
       containers:
       - args:
+        - --metrics-addr=127.0.0.1:8085
         - --enable-leader-election
-        - --tls-min-version=TLS13
         env:
         - name: POD_NAME
           valueFrom:
@@ -56,9 +56,6 @@ spec:
         - containerPort: 9443
           name: webhook-server
           protocol: TCP
-        - containerPort: 8443
-          protocol: TCP
-          name: https
         readinessProbe:
           failureThreshold: 10
           httpGet:
@@ -87,6 +84,19 @@ spec:
           mountPath: "/opt/metal3/certs/ca"
           readOnly: true
         {{- end }}
+      - args:
+        - --secure-listen-address=0.0.0.0:8443
+        - --upstream=http://127.0.0.1:8085/
+        - --logtostderr=true
+        - --v=10
+        image: "{{ .Values.images.rbacProxy.repository }}:{{ .Values.images.rbacProxy.tag }}"
+        imagePullPolicy: {{ .Values.images.rbacProxy.pullPolicy }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 10 }}
+        name: kube-rbac-proxy
+        ports:
+        - containerPort: 8443
+          name: https
       serviceAccountName: {{ include "baremetal-operator.serviceAccountName" . }}
       terminationGracePeriodSeconds: 10
       volumes:

metal3-chart/charts/baremetal-operator/templates/metrics_auth_role.yaml

@@ -1,19 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "baremetal-operator.fullname" . }}-metrics-auth-role
-  labels:
-    {{- include "baremetal-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - authentication.k8s.io
-  resources:
-  - tokenreviews
-  verbs:
-  - create
-- apiGroups:
-  - authorization.k8s.io
-  resources:
-  - subjectaccessreviews
-  verbs:
-  - create

metal3-chart/charts/baremetal-operator/templates/metrics_auth_role_binding.yaml

@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "baremetal-operator.fullname" . }}-metrics-auth-rolebinding
-  labels:
-    {{- include "baremetal-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ include "baremetal-operator.fullname" . }}-metrics-auth-role
-subjects:
-- kind: ServiceAccount
-  name: {{ include "baremetal-operator.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}

metal3-chart/charts/baremetal-operator/templates/metrics_reader_role.yaml

@@ -1,11 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "baremetal-operator.fullname" . }}-metrics-reader
-  labels:
-    {{- include "baremetal-operator.labels" . | nindent 4 }}
-rules:
-- nonResourceURLs:
-  - "/metrics"
-  verbs:
-  - get

metal3-chart/charts/baremetal-operator/templates/metrics_service.yaml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    {{- include "baremetal-operator.labels" . | nindent 4 }}
-    control-plane: controller-manager
-  name: {{ include "baremetal-operator.fullname" . }}-controller-manager-metrics-service
-spec:
-  ports:
-  - name: https
-    port: 8443
-    targetPort: https
-  selector:
-    control-plane: controller-manager

metal3-chart/charts/baremetal-operator/values.yaml

@@ -28,7 +28,11 @@ images:
   baremetalOperator:
     repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/baremetal-operator
     pullPolicy: IfNotPresent
-    tag: "0.9.0"
+    tag: "0.8.0"
+  rbacProxy:
+    repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/kube-rbac-proxy
+    pullPolicy: IfNotPresent
+    tag: "0.18.1"
 
 imagePullSecrets: []
 nameOverride: "manger"

metallb-chart/Chart.yaml

@@ -1,9 +1,10 @@
-#!BuildTag: %%IMG_PREFIX%%metallb-chart:%%CHART_MAJOR%%.0.0_up0.14.9
+#!BuildTag: %%IMG_PREFIX%%metallb-chart:%%CHART_MAJOR%%.0.1_up0.14.9
-#!BuildTag: %%IMG_PREFIX%%metallb-chart:%%CHART_MAJOR%%.0.0_up0.14.9-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%metallb-chart:%%CHART_MAJOR%%.0.1_up0.14.9-%RELEASE%
 apiVersion: v2
 appVersion: v0.14.3
 dependencies:
-- condition: frrk8s.enabled
+- alias: metallb-frr-k8s
+  condition: frrk8s.enabled
   name: frr-k8s
   repository: file://./charts/frr-k8s
   version: 0.0.15
@@ -20,4 +21,4 @@ name: metallb
 sources:
 - https://github.com/metallb/metallb
 type: application
-version: "%%CHART_MAJOR%%.0.0+up0.14.9"
+version: "%%CHART_MAJOR%%.0.1+up0.14.9"

metallb-chart/charts/frr-k8s/values.yaml

@@ -53,7 +53,7 @@ prometheus:
   # the image to be used for the kuberbacproxy container
   rbacProxy:
     repository: "registry.opensuse.org/isv/suse/edge/metallb/images/kube-rbac-proxy"
-    tag: "v0.18.0"
+    tag: "0.18.1"
     pullPolicy: IfNotPresent
 
   # Prometheus Operator ServiceMonitors.

metallb-chart/values.yaml

@@ -378,3 +378,15 @@ frrk8s:
   enabled: false
   external: false
   namespace: ""
+
+# Override any settings for the metallb frr-k8s service here
+metallb-frr-k8s:
+  prometheus:
+    rbacProxy:
+      repository: "%%IMG_REPO%%/%%IMG_PREFIX%%kube-rbac-proxy"
+  frrk8s:
+    image:
+      repository: "%%IMG_REPO%%/%%IMG_PREFIX%%frr-k8s"
+    frr:
+      image:
+        repository: "%%IMG_REPO%%/%%IMG_PREFIX%%frr"

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

@@ -1,10 +1,10 @@
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.16.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.16.0
+#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.14.1
 apiVersion: v2
-appVersion: 0.16.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.16.0"
+version: "%%CHART_MAJOR%%.0.0+up0.14.1"

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

@@ -22,7 +22,7 @@ data:
     metadata:
       annotations:
         cert-manager.io/inject-ca-from: rke2-bootstrap-system/rke2-bootstrap-serving-cert
-        controller-gen.kubebuilder.io/version: v0.16.1
+        controller-gen.kubebuilder.io/version: v0.14.0
       labels:
         cluster.x-k8s.io/provider: bootstrap-rke2
         cluster.x-k8s.io/v1beta1: v1alpha1_v1beta1
@@ -154,6 +154,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -299,6 +300,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -437,6 +439,7 @@ data:
                                     the event) or if no container name is specified "spec.containers[2]" (container with
                                     index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                     referencing a part of an object.
+                                    TODO: this design is not final and this field is subject to change in the future.
                                   type: string
                                 kind:
                                   description: |-
@@ -492,6 +495,7 @@ data:
                                         the event) or if no container name is specified "spec.containers[2]" (container with
                                         index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                         referencing a part of an object.
+                                        TODO: this design is not final and this field is subject to change in the future.
                                       type: string
                                     kind:
                                       description: |-
@@ -578,20 +582,20 @@ data:
                           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 be empty.
+                            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
+                            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.
+                          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.
+                            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
@@ -738,6 +742,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -888,6 +893,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -1023,6 +1029,7 @@ data:
                                     the event) or if no container name is specified "spec.containers[2]" (container with
                                     index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                     referencing a part of an object.
+                                    TODO: this design is not final and this field is subject to change in the future.
                                   type: string
                                 kind:
                                   description: |-
@@ -1078,6 +1085,7 @@ data:
                                         the event) or if no container name is specified "spec.containers[2]" (container with
                                         index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                         referencing a part of an object.
+                                        TODO: this design is not final and this field is subject to change in the future.
                                       type: string
                                     kind:
                                       description: |-
@@ -1164,20 +1172,20 @@ data:
                           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 be empty.
+                            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
+                            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.
+                          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.
+                            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
@@ -1218,7 +1226,7 @@ data:
     metadata:
       annotations:
         cert-manager.io/inject-ca-from: rke2-bootstrap-system/rke2-bootstrap-serving-cert
-        controller-gen.kubebuilder.io/version: v0.16.1
+        controller-gen.kubebuilder.io/version: v0.14.0
       labels:
         cluster.x-k8s.io/provider: bootstrap-rke2
         cluster.x-k8s.io/v1beta1: v1alpha1_v1beta1
@@ -1361,6 +1369,7 @@ data:
                                       the event) or if no container name is specified "spec.containers[2]" (container with
                                       index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                       referencing a part of an object.
+                                      TODO: this design is not final and this field is subject to change in the future.
                                     type: string
                                   kind:
                                     description: |-
@@ -1514,6 +1523,7 @@ data:
                                       the event) or if no container name is specified "spec.containers[2]" (container with
                                       index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                       referencing a part of an object.
+                                      TODO: this design is not final and this field is subject to change in the future.
                                     type: string
                                   kind:
                                     description: |-
@@ -1654,6 +1664,7 @@ data:
                                             the event) or if no container name is specified "spec.containers[2]" (container with
                                             index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                             referencing a part of an object.
+                                            TODO: this design is not final and this field is subject to change in the future.
                                           type: string
                                         kind:
                                           description: |-
@@ -1709,6 +1720,7 @@ data:
                                                 the event) or if no container name is specified "spec.containers[2]" (container with
                                                 index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                                 referencing a part of an object.
+                                                TODO: this design is not final and this field is subject to change in the future.
                                               type: string
                                             kind:
                                               description: |-
@@ -1908,6 +1920,7 @@ data:
                                       the event) or if no container name is specified "spec.containers[2]" (container with
                                       index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                       referencing a part of an object.
+                                      TODO: this design is not final and this field is subject to change in the future.
                                     type: string
                                   kind:
                                     description: |-
@@ -2066,6 +2079,7 @@ data:
                                       the event) or if no container name is specified "spec.containers[2]" (container with
                                       index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                       referencing a part of an object.
+                                      TODO: this design is not final and this field is subject to change in the future.
                                     type: string
                                   kind:
                                     description: |-
@@ -2203,6 +2217,7 @@ data:
                                             the event) or if no container name is specified "spec.containers[2]" (container with
                                             index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                             referencing a part of an object.
+                                            TODO: this design is not final and this field is subject to change in the future.
                                           type: string
                                         kind:
                                           description: |-
@@ -2258,6 +2273,7 @@ data:
                                                 the event) or if no container name is specified "spec.containers[2]" (container with
                                                 index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                                 referencing a part of an object.
+                                                TODO: this design is not final and this field is subject to change in the future.
                                               type: string
                                             kind:
                                               description: |-
@@ -2527,7 +2543,7 @@ data:
             - --insecure-diagnostics=${CAPRKE2_INSECURE_DIAGNOSTICS:=false}
             command:
             - /manager
-            image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.11.0
+            image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.9.0
             imagePullPolicy: IfNotPresent
             livenessProbe:
               httpGet:
@@ -2741,16 +2757,10 @@ data:
       - major: 0
         minor: 9
         contract: v1beta1
-      - major: 0
-        minor: 10
-        contract: v1beta1
-      - major: 0
-        minor: 11
-        contract: v1beta1
 kind: ConfigMap
 metadata:
   creationTimestamp: null
-  name: v0.11.0
+  name: v0.9.0
   namespace: rke2-bootstrap-system
   labels:
     provider-components: rke2-bootstrap

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

@@ -22,7 +22,7 @@ data:
     metadata:
       annotations:
         cert-manager.io/inject-ca-from: rke2-control-plane-system/rke2-control-plane-serving-cert
-        controller-gen.kubebuilder.io/version: v0.16.1
+        controller-gen.kubebuilder.io/version: v0.14.0
       labels:
         cluster.x-k8s.io/provider: control-plane-rke2
         cluster.x-k8s.io/v1beta1: v1alpha1_v1beta1
@@ -154,6 +154,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -299,6 +300,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -416,6 +418,7 @@ data:
                           the event) or if no container name is specified "spec.containers[2]" (container with
                           index 2 in this pod). This syntax is chosen only to have some well-defined way of
                           referencing a part of an object.
+                          TODO: this design is not final and this field is subject to change in the future.
                         type: string
                       kind:
                         description: |-
@@ -461,6 +464,7 @@ data:
                           the event) or if no container name is specified "spec.containers[2]" (container with
                           index 2 in this pod). This syntax is chosen only to have some well-defined way of
                           referencing a part of an object.
+                          TODO: this design is not final and this field is subject to change in the future.
                         type: string
                       kind:
                         description: |-
@@ -533,6 +537,7 @@ data:
                                     the event) or if no container name is specified "spec.containers[2]" (container with
                                     index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                     referencing a part of an object.
+                                    TODO: this design is not final and this field is subject to change in the future.
                                   type: string
                                 kind:
                                   description: |-
@@ -588,6 +593,7 @@ data:
                                         the event) or if no container name is specified "spec.containers[2]" (container with
                                         index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                         referencing a part of an object.
+                                        TODO: this design is not final and this field is subject to change in the future.
                                       type: string
                                     kind:
                                       description: |-
@@ -721,6 +727,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -797,6 +804,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -927,6 +935,7 @@ data:
                                           the event) or if no container name is specified "spec.containers[2]" (container with
                                           index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                           referencing a part of an object.
+                                          TODO: this design is not final and this field is subject to change in the future.
                                         type: string
                                       kind:
                                         description: |-
@@ -971,7 +980,6 @@ data:
                                     description: |-
                                       S3CredentialSecret is a reference to a Secret containing the Access Key and Secret Key necessary to access the target S3 Bucket.
                                       The Secret must contain the following keys: "aws_access_key_id" and "aws_secret_access_key".
-                                      If empty, the controller will default to IAM authentication
                                     properties:
                                       apiVersion:
                                         description: API version of the referent.
@@ -985,6 +993,7 @@ data:
                                           the event) or if no container name is specified "spec.containers[2]" (container with
                                           index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                           referencing a part of an object.
+                                          TODO: this design is not final and this field is subject to change in the future.
                                         type: string
                                       kind:
                                         description: |-
@@ -1015,6 +1024,7 @@ data:
                                     x-kubernetes-map-type: atomic
                                 required:
                                 - endpoint
+                                - s3CredentialSecret
                                 type: object
                               scheduleCron:
                                 description: 'ScheduleCron Snapshot interval time in cron
@@ -1191,20 +1201,20 @@ data:
                           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 be empty.
+                            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
+                            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.
+                          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.
+                            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
@@ -1377,6 +1387,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -1527,6 +1538,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -1628,7 +1640,6 @@ data:
                     description: |-
                       InfrastructureRef is a required reference to a custom resource
                       offered by an infrastructure provider.
-                      This field is deprecated. Use `.machineTemplate.infrastructureRef` instead.
                     properties:
                       apiVersion:
                         description: API version of the referent.
@@ -1642,6 +1653,7 @@ data:
                           the event) or if no container name is specified "spec.containers[2]" (container with
                           index 2 in this pod). This syntax is chosen only to have some well-defined way of
                           referencing a part of an object.
+                          TODO: this design is not final and this field is subject to change in the future.
                         type: string
                       kind:
                         description: |-
@@ -1692,6 +1704,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -1729,7 +1742,7 @@ data:
                             additionalProperties:
                               type: string
                             description: |-
-                              annotations is an unstructured key value map stored with a resource that may be
+                              Annotations is an unstructured key value map stored with a resource that may be
                               set by external tools to store and retrieve arbitrary metadata. They are not
                               queryable and should be preserved when modifying objects.
                               More info: http://kubernetes.io/docs/user-guide/annotations
@@ -1770,6 +1783,7 @@ data:
                           the event) or if no container name is specified "spec.containers[2]" (container with
                           index 2 in this pod). This syntax is chosen only to have some well-defined way of
                           referencing a part of an object.
+                          TODO: this design is not final and this field is subject to change in the future.
                         type: string
                       kind:
                         description: |-
@@ -1803,7 +1817,6 @@ data:
                       NodeDrainTimeout is the total amount of time that the controller will spend on draining a controlplane node
                       The default value is 0, meaning that the node can be drained without any time limitations.
                       NOTE: NodeDrainTimeout is different from `kubectl drain --timeout`
-                      This field is deprecated. Use `.machineTemplate.nodeDrainTimeout` instead.
                     type: string
                   postRKE2Commands:
                     description: PostRKE2Commands specifies extra commands to run after
@@ -1843,6 +1856,7 @@ data:
                                     the event) or if no container name is specified "spec.containers[2]" (container with
                                     index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                     referencing a part of an object.
+                                    TODO: this design is not final and this field is subject to change in the future.
                                   type: string
                                 kind:
                                   description: |-
@@ -1898,6 +1912,7 @@ data:
                                         the event) or if no container name is specified "spec.containers[2]" (container with
                                         index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                         referencing a part of an object.
+                                        TODO: this design is not final and this field is subject to change in the future.
                                       type: string
                                     kind:
                                       description: |-
@@ -2028,6 +2043,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -2104,6 +2120,7 @@ data:
                               the event) or if no container name is specified "spec.containers[2]" (container with
                               index 2 in this pod). This syntax is chosen only to have some well-defined way of
                               referencing a part of an object.
+                              TODO: this design is not final and this field is subject to change in the future.
                             type: string
                           kind:
                             description: |-
@@ -2234,6 +2251,7 @@ data:
                                           the event) or if no container name is specified "spec.containers[2]" (container with
                                           index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                           referencing a part of an object.
+                                          TODO: this design is not final and this field is subject to change in the future.
                                         type: string
                                       kind:
                                         description: |-
@@ -2278,7 +2296,6 @@ data:
                                     description: |-
                                       S3CredentialSecret is a reference to a Secret containing the Access Key and Secret Key necessary to access the target S3 Bucket.
                                       The Secret must contain the following keys: "aws_access_key_id" and "aws_secret_access_key".
-                                      If empty, the controller will default to IAM authentication
                                     properties:
                                       apiVersion:
                                         description: API version of the referent.
@@ -2292,6 +2309,7 @@ data:
                                           the event) or if no container name is specified "spec.containers[2]" (container with
                                           index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                           referencing a part of an object.
+                                          TODO: this design is not final and this field is subject to change in the future.
                                         type: string
                                       kind:
                                         description: |-
@@ -2322,6 +2340,7 @@ data:
                                     x-kubernetes-map-type: atomic
                                 required:
                                 - endpoint
+                                - s3CredentialSecret
                                 type: object
                               scheduleCron:
                                 description: 'ScheduleCron Snapshot interval time in cron
@@ -2471,6 +2490,7 @@ data:
                     pattern: (v\d\.\d{2}\.\d+\+rke2r\d)|^$
                     type: string
                 required:
+                - infrastructureRef
                 - rolloutStrategy
                 type: object
               status:
@@ -2504,20 +2524,20 @@ data:
                           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 be empty.
+                            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
+                            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.
+                          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.
+                            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
@@ -2589,7 +2609,7 @@ data:
     metadata:
       annotations:
         cert-manager.io/inject-ca-from: rke2-control-plane-system/rke2-control-plane-serving-cert
-        controller-gen.kubebuilder.io/version: v0.16.1
+        controller-gen.kubebuilder.io/version: v0.14.0
       labels:
         cluster.x-k8s.io/provider: control-plane-rke2
         cluster.x-k8s.io/v1beta1: v1alpha1_v1beta1
@@ -2776,6 +2796,7 @@ data:
                                       the event) or if no container name is specified "spec.containers[2]" (container with
                                       index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                       referencing a part of an object.
+                                      TODO: this design is not final and this field is subject to change in the future.
                                     type: string
                                   kind:
                                     description: |-
@@ -2934,6 +2955,7 @@ data:
                                       the event) or if no container name is specified "spec.containers[2]" (container with
                                       index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                       referencing a part of an object.
+                                      TODO: this design is not final and this field is subject to change in the future.
                                     type: string
                                   kind:
                                     description: |-
@@ -3036,7 +3058,6 @@ data:
                             description: |-
                               InfrastructureRef is a required reference to a custom resource
                               offered by an infrastructure provider.
-                              This field is deprecated. Use `.machineTemplate.infrastructureRef` instead.
                             properties:
                               apiVersion:
                                 description: API version of the referent.
@@ -3050,6 +3071,7 @@ data:
                                   the event) or if no container name is specified "spec.containers[2]" (container with
                                   index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                   referencing a part of an object.
+                                  TODO: this design is not final and this field is subject to change in the future.
                                 type: string
                               kind:
                                 description: |-
@@ -3100,6 +3122,7 @@ data:
                                       the event) or if no container name is specified "spec.containers[2]" (container with
                                       index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                       referencing a part of an object.
+                                      TODO: this design is not final and this field is subject to change in the future.
                                     type: string
                                   kind:
                                     description: |-
@@ -3137,7 +3160,7 @@ data:
                                     additionalProperties:
                                       type: string
                                     description: |-
-                                      annotations is an unstructured key value map stored with a resource that may be
+                                      Annotations is an unstructured key value map stored with a resource that may be
                                       set by external tools to store and retrieve arbitrary metadata. They are not
                                       queryable and should be preserved when modifying objects.
                                       More info: http://kubernetes.io/docs/user-guide/annotations
@@ -3178,6 +3201,7 @@ data:
                                   the event) or if no container name is specified "spec.containers[2]" (container with
                                   index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                   referencing a part of an object.
+                                  TODO: this design is not final and this field is subject to change in the future.
                                 type: string
                               kind:
                                 description: |-
@@ -3211,7 +3235,6 @@ data:
                               NodeDrainTimeout is the total amount of time that the controller will spend on draining a controlplane node
                               The default value is 0, meaning that the node can be drained without any time limitations.
                               NOTE: NodeDrainTimeout is different from `kubectl drain --timeout`
-                              This field is deprecated. Use `.machineTemplate.nodeDrainTimeout` instead.
                             type: string
                           postRKE2Commands:
                             description: PostRKE2Commands specifies extra commands to
@@ -3252,6 +3275,7 @@ data:
                                             the event) or if no container name is specified "spec.containers[2]" (container with
                                             index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                             referencing a part of an object.
+                                            TODO: this design is not final and this field is subject to change in the future.
                                           type: string
                                         kind:
                                           description: |-
@@ -3307,6 +3331,7 @@ data:
                                                 the event) or if no container name is specified "spec.containers[2]" (container with
                                                 index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                                 referencing a part of an object.
+                                                TODO: this design is not final and this field is subject to change in the future.
                                               type: string
                                             kind:
                                               description: |-
@@ -3441,6 +3466,7 @@ data:
                                       the event) or if no container name is specified "spec.containers[2]" (container with
                                       index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                       referencing a part of an object.
+                                      TODO: this design is not final and this field is subject to change in the future.
                                     type: string
                                   kind:
                                     description: |-
@@ -3519,6 +3545,7 @@ data:
                                       the event) or if no container name is specified "spec.containers[2]" (container with
                                       index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                       referencing a part of an object.
+                                      TODO: this design is not final and this field is subject to change in the future.
                                     type: string
                                   kind:
                                     description: |-
@@ -3652,6 +3679,7 @@ data:
                                                   the event) or if no container name is specified "spec.containers[2]" (container with
                                                   index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                                   referencing a part of an object.
+                                                  TODO: this design is not final and this field is subject to change in the future.
                                                 type: string
                                               kind:
                                                 description: |-
@@ -3696,7 +3724,6 @@ data:
                                             description: |-
                                               S3CredentialSecret is a reference to a Secret containing the Access Key and Secret Key necessary to access the target S3 Bucket.
                                               The Secret must contain the following keys: "aws_access_key_id" and "aws_secret_access_key".
-                                              If empty, the controller will default to IAM authentication
                                             properties:
                                               apiVersion:
                                                 description: API version of the referent.
@@ -3710,6 +3737,7 @@ data:
                                                   the event) or if no container name is specified "spec.containers[2]" (container with
                                                   index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                                   referencing a part of an object.
+                                                  TODO: this design is not final and this field is subject to change in the future.
                                                 type: string
                                               kind:
                                                 description: |-
@@ -3740,6 +3768,7 @@ data:
                                             x-kubernetes-map-type: atomic
                                         required:
                                         - endpoint
+                                        - s3CredentialSecret
                                         type: object
                                       scheduleCron:
                                         description: 'ScheduleCron Snapshot interval time
@@ -3898,6 +3927,7 @@ data:
                             pattern: (v\d\.\d{2}\.\d+\+rke2r\d)|^$
                             type: string
                         required:
+                        - infrastructureRef
                         - rolloutStrategy
                         type: object
                     required:
@@ -3937,20 +3967,20 @@ data:
                           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 be empty.
+                            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
+                            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.
+                          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.
+                            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
@@ -4263,7 +4293,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.uid
-            image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.11.0
+            image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.9.0
             imagePullPolicy: IfNotPresent
             livenessProbe:
               httpGet:
@@ -4318,7 +4348,7 @@ data:
           volumes:
           - name: cert
             secret:
-              secretName: rke2-controlplane-webhook-service-cert
+              secretName: rke2-control-plane-webhook-service-cert
     ---
     apiVersion: cert-manager.io/v1
     kind: Certificate
@@ -4334,7 +4364,7 @@ data:
       issuerRef:
         kind: Issuer
         name: rke2-control-plane-selfsigned-issuer
-      secretName: rke2-controlplane-webhook-service-cert
+      secretName: rke2-control-plane-webhook-service-cert
       subject:
         organizations:
         - Rancher by SUSE
@@ -4484,16 +4514,10 @@ data:
       - major: 0
         minor: 9
         contract: v1beta1
-      - major: 0
-        minor: 10
-        contract: v1beta1
-      - major: 0
-        minor: 11
-        contract: v1beta1
 kind: ConfigMap
 metadata:
   creationTimestamp: null
-  name: v0.11.0
+  name: v0.9.0
   namespace: rke2-control-plane-system
   labels:
     provider-components: rke2-control-plane

rancher-turtles-chart/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: cluster-api-operator
   repository: https://kubernetes-sigs.github.io/cluster-api-operator
-  version: 0.16.0
+  version: 0.14.0
-digest: sha256:9b296be6ee446bff492e6736e084ce3734b07ea613791b77fd15d31c0f62dc70
+digest: sha256:9e9e851dbab3212c279efec06bcf0da147228ea1590470f3a8cbbb5806a250d4
-generated: "2025-01-30T10:14:58.692942399Z"
+generated: "2024-12-03T09:34:12.871417074Z"

rancher-turtles-chart/Chart.yaml

@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.16.0
+#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.14.1
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.16.0-%RELEASE%
+#!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
@@ -12,7 +12,7 @@ annotations:
   catalog.cattle.io/scope: management
   catalog.cattle.io/type: cluster-tool
 apiVersion: v2
-appVersion: 0.16.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.16.0"
+version: "%%CHART_MAJOR%%.0.0+up0.14.1"

rancher-turtles-chart/questions.yml

@@ -1,44 +1,78 @@
 namespace: rancher-turtles-system
 questions:
-  - variable: rancherTurtles.features.default
+- variable: rancherTurtles.features.default
-    default: "false"
+  default: "false"
-    description: "Customize install settings"
+  description: "Customize install settings"
-    label: Customize install settings
+  label: Customize install settings
+  type: boolean
+  show_subquestion_if: true
+  group: "Rancher Turtles Extra Settings"
+  subquestions:
+  - variable: cluster-api-operator.cert-manager.enabled
+    default: false
     type: boolean
+    description: "Flag to enable or disable installation of cert-manager. If set to false then you will need to install cert-manager manually"
+    label: "Enable Cert Manager"
+  - variable: rancherTurtles.features.cluster-api-operator.cleanup
+    default: true
+    description: "Specify that the CAPI Operator post-delete cleanup job will be performed"
+    type: boolean
+    label: Cleanup CAPI Operator installation
+    group: "CAPI Operator cleanup settings"
     show_subquestion_if: true
-    group: "Rancher Turtles Extra Settings"
     subquestions:
-      - variable: cluster-api-operator.cert-manager.enabled
+    - variable: rancherTurtles.features.cluster-api-operator.kubectlImage
-        default: false
+      default: "rancher/kubectl:v1.30.3"
-        type: boolean
+      description: "Specify the image to use when cleaning up the Cluster API Operator manifests"
-        description: "Flag to enable or disable installation of cert-manager. If set to false then you will need to install cert-manager manually"
+      type: string
-        label: "Enable Cert Manager"
+      label: Cleanup Image
-      - variable: rancherTurtles.cluster-api-operator.cleanup
+      group: "CAPI Operator cleanup settings"
-        default: true
+  - variable: rancherTurtles.features.rancher-webhook.cleanup
-        description: "Specify that the CAPI Operator post-delete cleanup job will be performed"
+    default: true
-        type: boolean
+    description: "Specify that the Rancher embedded cluster api webhooks should be removed"
-        label: Cleanup CAPI Operator installation
+    type: boolean
-        group: "CAPI Operator cleanup settings"
+    label: Cleanup Rancher Embedded CAPI Webhooks
-      - variable: cluster-api-operator.cluster-api.rke2.enabled
+    group: "Rancher webhook cleanup settings"
-        default: "true"
+    show_subquestion_if: true
-        description: "Flag to enable or disable installation of the RKE2 provider for Cluster API. By default this is enabled."
+    subquestions:
-        label: "Enable RKE2 Provider"
+    - variable: rancherTurtles.features.rancher-webhook.kubectlImage
-        type: boolean
+      default: "rancher/kubectl:v1.30.3"
-      - variable: rancherTurtles.features.addon-provider-fleet.enabled
+      description: "Specify the image to use when cleaning up the webhooks"
-        default: false
+      type: string
-        description: "[BETA] Enable Fleet Addon Provider functionality in Rancher Turtles"
+      label: Webhook Cleanup Image
-        type: boolean
+      group: "Rancher webhook cleanup settings"
-        label: Seamless integration with Fleet and CAPI
+  - variable: rancherTurtles.features.rancher-kubeconfigs.label
-        group: "Rancher Turtles Features Settings"
+    default: false
-      - variable: rancherTurtles.features.agent-tls-mode.enabled
+    description: "(Experimental) Specify that the kubeconfigs generated by Rancher should be automatically patched to contain the CAPI expected labels"
-        default: false
+    type: boolean
-        description: "[ALPHA] If enabled Turtles will use the agent-tls-mode setting to determine CA cert trust mode for importing clusters"
+    label: Label Rancher Kubeconfigs
-        type: boolean
+    group: "Rancher Turtles Features Settings"
-        label: Enable Agent TLS Mode
+  - variable: rancherTurtles.features.managementv3-cluster.enabled
-        group: "Rancher Turtles Features Settings"
+    default: true
-      - variable: rancherTurtles.kubectlImage
+    description: "Use v3/management cluster manifest for import, instead of v1/provisioning"
-        default: "registry.suse.com/edge/3.2/kubectl:1.30.3"
+    type: boolean
-        description: "Specify the image to use when running kubectl in jobs"
+    label: Use management v3 cluster manifest
-        type: string
+    group: "Rancher Turtles Features Settings"
-        label: Kubectl Image
+  - variable: rancherTurtles.features.managementv3-cluster-migration.enabled
-        group: "Rancher Turtles Features Settings"
+    default: false
+    description: "Automatically migrate between provisioning and management clusters on upgrade"
+    type: boolean
+    label: All imported clusters will use new cluster manifest, replacing old cluster manifest.
+    group: "Rancher Turtles Features Settings"
+  - variable: cluster-api-operator.cluster-api.rke2.enabled
+    default: "true"
+    description: "Flag to enable or disable installation of the RKE2 provider for Cluster API. By default this is enabled."
+    label: "Enable RKE2 Provider"
+    type: boolean
+  - variable: rancherTurtles.features.propagate-labels.enabled
+    default: false
+    description: "(Experimental) Specify that the labels from CAPI should be propagated to Rancher"
+    type: boolean
+    label: Propagate CAPI Labels
+    group: "Rancher Turtles Features Settings"
+  - variable: rancherTurtles.features.addon-provider-fleet.enabled
+    default: false
+    description: "Enable Fleet Addon Provider functionality in Rancher Turtles"
+    type: boolean
+    label: Seamless integration with Fleet and CAPI
+    group: "Rancher Turtles Features Settings"

rancher-turtles-chart/templates/addon-provider-fleet.yaml

@@ -35,17 +35,10 @@ data:
       cluster:
         patchResource: true
         setOwnerReferences: true
-        hostNetwork: true
         selector:
           matchLabels:
             cluster-api.cattle.io/rancher-auto-import: "true"
-          matchExpressions:
-            - key: cluster-api.cattle.io/disable-fleet-auto-import
-              operator: DoesNotExist
         namespaceSelector:
           matchLabels:
             cluster-api.cattle.io/rancher-auto-import: "true"
-          matchExpressions:
-            - key: cluster-api.cattle.io/disable-fleet-auto-import
-              operator: DoesNotExist
 {{- end }}

rancher-turtles-chart/templates/clusterctl-cm-cleanup-job.yaml

@@ -1,4 +1,4 @@
-{{- if index .Values "rancherTurtles" "rancherInstalled" }}
+{{- if index .Values "rancherTurtles" "features" "rancher-webhook" "cleanup" }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -55,7 +55,7 @@ spec:
       serviceAccountName: pre-upgrade-job
       containers:
         - name: rancher-clusterctl-configmap-cleanup
-          image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+          image: {{ index .Values "rancherTurtles" "features" "rancher-webhook" "kubectlImage" }}
           args:
           - delete
           - configmap

rancher-turtles-chart/templates/deployment.yaml

@@ -26,7 +26,7 @@ spec:
       containers:
       - args:
         - --leader-elect
-        - --feature-gates=addon-provider-fleet={{ index .Values "rancherTurtles" "features" "addon-provider-fleet" "enabled"}},agent-tls-mode={{ index .Values "rancherTurtles" "features" "agent-tls-mode" "enabled"}}
+        - --feature-gates=propagate-labels={{ index .Values "rancherTurtles" "features" "propagate-labels" "enabled"}},managementv3-cluster={{ index .Values "rancherTurtles" "features" "managementv3-cluster" "enabled"}},rancher-kube-secret-patch={{ index .Values "rancherTurtles" "features" "rancher-kubeconfigs" "label"}}
         {{- range .Values.rancherTurtles.managerArguments }}
         - {{ . }}
         {{- end }}  
@@ -67,10 +67,10 @@ spec:
         resources:
           limits:
             cpu: 500m
-            memory: 256Mi
+            memory: 128Mi
           requests:
             cpu: 10m
-            memory: 128Mi
+            memory: 64Mi
       serviceAccountName: rancher-turtles-manager
       terminationGracePeriodSeconds: 10
       tolerations:

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

@@ -22,7 +22,7 @@ metadata:
 spec:
   providers:
   - name: metal3
-    url: "https://github.com/rancher-sandbox/cluster-api-provider-metal3/releases/v1.9.2/infrastructure-components.yaml"
+    url: "https://github.com/metal3-io/cluster-api-provider-metal3/releases/v1.7.2/infrastructure-components.yaml"
     type: InfrastructureProvider
 ---
 apiVersion: turtles-capi.cattle.io/v1alpha1

rancher-turtles-chart/templates/post-delete-job.yaml

@@ -1,4 +1,4 @@
-{{- if index .Values "cluster-api-operator" "cleanup" }}
+{{- if index .Values "rancherTurtles" "features" "cluster-api-operator" "cleanup" }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -41,7 +41,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: post-delete-job
-    namespace: '{{ .Values.rancherTurtles.namespace }}'
+    namespace: rancher-turtles-system
 roleRef:
   kind: ClusterRole
   name: post-delete-job-delete-webhooks
@@ -62,7 +62,7 @@ spec:
       serviceAccountName: post-delete-job
       containers:
         - name: cluster-api-operator-mutatingwebhook-cleanup
-          image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+          image: {{ index .Values "rancherTurtles" "features" "cluster-api-operator" "kubectlImage" }}
           command: ["kubectl"]
           args:
           - delete
@@ -90,7 +90,7 @@ spec:
       serviceAccountName: post-delete-job
       containers:
         - name: cluster-api-operator-validatingwebhook-cleanup
-          image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+          image: {{ index .Values "rancherTurtles" "features" "cluster-api-operator" "kubectlImage" }}
           command: ["kubectl"]
           args:
           - delete
@@ -119,7 +119,7 @@ spec:
       restartPolicy: Never
       containers:
       - name: delete-capi-controller-manager
-        image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+        image: {{ index .Values "rancherTurtles" "features" "cluster-api-operator" "kubectlImage" }}
         command: ["kubectl"]
         args:
         - delete
@@ -128,7 +128,7 @@ spec:
         - {{ index .Values "cluster-api-operator" "cluster-api" "core" "namespace" }}
         - --ignore-not-found=true
       - name: delete-capi-kubeadm-bootstrap-controller-manager
-        image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+        image: {{ index .Values "rancherTurtles" "features" "cluster-api-operator" "kubectlImage" }}
         command: ["kubectl"]
         args:
         - delete
@@ -137,7 +137,7 @@ spec:
         - capi-kubeadm-bootstrap-system
         - --ignore-not-found=true
       - name: delete-capi-kubeadm-control-plane-controller-manager
-        image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+        image: {{ index .Values "rancherTurtles" "features" "cluster-api-operator" "kubectlImage" }}
         command: ["kubectl"]
         args:
         - delete
@@ -146,7 +146,7 @@ spec:
         - capi-kubeadm-control-plane-system
         - --ignore-not-found=true
       - name: delete-rke2-kubeadm-bootstrap-controller-manager
-        image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+        image: {{ index .Values "rancherTurtles" "features" "cluster-api-operator" "kubectlImage" }}
         command: ["kubectl"]
         args:
         - delete
@@ -155,7 +155,7 @@ spec:
         - {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "bootstrap" "namespace" }}
         - --ignore-not-found=true
       - name: delete-rke2-control-plane-controller-manager
-        image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+        image: {{ index .Values "rancherTurtles" "features" "cluster-api-operator" "kubectlImage" }}
         command: ["kubectl"]
         args:
         - delete

rancher-turtles-chart/templates/post-upgrade-job.yaml

@@ -1,9 +1,10 @@
+{{- if eq (index .Values "rancherTurtles" "features" "managementv3-cluster-migration" "enabled") true }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: post-upgrade-job
-  namespace: '{{ .Values.rancherTurtles.namespace }}'
+  namespace: rancher-turtles-system
   annotations:
     "helm.sh/hook": post-upgrade
     "helm.sh/hook-weight": "1"
@@ -23,6 +24,13 @@ rules:
   verbs:
   - list
   - delete
+- apiGroups:
+  - management.cattle.io
+  resources:
+  - clusters
+  verbs:
+  - list
+  - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -34,7 +42,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: post-upgrade-job
-    namespace: '{{ .Values.rancherTurtles.namespace }}'
+    namespace: rancher-turtles-system
 roleRef:
   kind: ClusterRole
   name: post-upgrade-job-delete-clusters
@@ -44,7 +52,6 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: post-upgrade-delete-clusters
-  namespace: '{{ .Values.rancherTurtles.namespace }}'
   annotations:
     "helm.sh/hook": post-upgrade
     "helm.sh/hook-weight": "2"
@@ -55,12 +62,17 @@ spec:
       serviceAccountName: post-upgrade-job
       containers:
         - name: post-upgrade-delete-clusters
-          image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+          image: {{ index .Values "rancherTurtles" "features" "rancher-webhook" "kubectlImage" }}
           args:
           - delete
+          {{- if eq (index .Values "rancherTurtles" "features" "managementv3-cluster" "enabled") true }}
           - clusters.provisioning.cattle.io
+          {{- else }}
+          - clusters.management.cattle.io
+          {{- end }}
           - --selector=cluster-api.cattle.io/owned
           - -A
           - --ignore-not-found=true
           - --wait
       restartPolicy: OnFailure
+{{- end }}

rancher-turtles-chart/templates/pre-delete-job.yaml

@@ -1,10 +1,10 @@
-{{- if index .Values "rancherTurtles" "rancherInstalled" }}
+{{- if index .Values "rancherTurtles" "features" "rancher-webhook" "cleanup" }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: pre-delete-job
-  namespace: '{{ .Values.rancherTurtles.namespace }}'
+  namespace: rancher-turtles-system
   annotations:
     "helm.sh/hook": pre-delete
     "helm.sh/hook-weight": "-2"
@@ -35,7 +35,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: pre-delete-job
-    namespace: '{{ .Values.rancherTurtles.namespace }}'
+    namespace: rancher-turtles-system
 roleRef:
   kind: ClusterRole
   name: pre-delete-job-delete-capiproviders
@@ -45,7 +45,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: rancher-capiprovider-cleanup
-  namespace: '{{ .Values.rancherTurtles.namespace }}'
+  namespace: rancher-turtles-system
   annotations:
     "helm.sh/hook": pre-delete
     "helm.sh/hook-weight": "-1"
@@ -56,7 +56,7 @@ spec:
       serviceAccountName: pre-delete-job
       containers:
         - name: rancher-capiprovider-cleanup
-          image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+          image: {{ index .Values "rancherTurtles" "features" "rancher-webhook" "kubectlImage" }}
           args:
           - delete
           - capiproviders

rancher-turtles-chart/templates/pre-install-job.yaml

@@ -1,3 +1,4 @@
+{{- if index .Values "rancherTurtles" "features" "embedded-capi" "disabled" }}
 {{- if index .Values "rancherTurtles" "rancherInstalled"}}
 ---
 apiVersion: management.cattle.io/v3
@@ -10,13 +11,14 @@ metadata:
 spec:
   value: false
 {{- end }}
-{{- if index .Values "rancherTurtles" "rancherInstalled" }}
+{{- end }}
+{{- if index .Values "rancherTurtles" "features" "rancher-webhook" "cleanup" }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: pre-install-job
-  namespace: '{{ .Values.rancherTurtles.namespace }}'
+  namespace: rancher-turtles-system
   annotations:
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "1"
@@ -47,7 +49,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: pre-install-job
-    namespace: '{{ .Values.rancherTurtles.namespace }}'
+    namespace: rancher-turtles-system
 roleRef:
   kind: ClusterRole
   name: pre-install-job-delete-webhooks
@@ -57,7 +59,6 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: rancher-mutatingwebhook-cleanup
-  namespace: '{{ .Values.rancherTurtles.namespace }}'
   annotations:
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "2"
@@ -68,7 +69,7 @@ spec:
       serviceAccountName: pre-install-job
       containers:
         - name: rancher-mutatingwebhook-cleanup
-          image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+          image: {{ index .Values "rancherTurtles" "features" "rancher-webhook" "kubectlImage" }}
           args:
           - delete
           - mutatingwebhookconfigurations.admissionregistration.k8s.io
@@ -80,7 +81,6 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: rancher-validatingwebhook-cleanup
-  namespace: '{{ .Values.rancherTurtles.namespace }}'
   annotations:
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "2"
@@ -91,7 +91,7 @@ spec:
       serviceAccountName: pre-install-job
       containers:
         - name: rancher-validatingwebhook-cleanup
-          image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+          image: {{ index .Values "rancherTurtles" "features" "rancher-webhook" "kubectlImage" }}
           args:
           - delete
           - validatingwebhookconfigurations.admissionregistration.k8s.io

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

@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     turtles-capi.cattle.io: etcd-restore
   name: etcdmachinesnapshots.turtles-capi.cattle.io
@@ -116,7 +116,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     turtles-capi.cattle.io: etcd-restore
   name: etcdsnapshotrestores.turtles-capi.cattle.io
@@ -195,20 +195,20 @@ spec:
                       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 be empty.
+                        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
+                        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.
+                      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.
+                        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
@@ -235,7 +235,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     turtles-capi.cattle.io: etcd-restore
   name: rke2etcdmachinesnapshotconfigs.turtles-capi.cattle.io
@@ -438,7 +438,29 @@ rules:
   - cluster.x-k8s.io
   resources:
   - clusters
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
   - clusters/status
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
   - machines
   verbs:
   - create
@@ -477,8 +499,6 @@ rules:
   - turtles-capi.cattle.io
   resources:
   - etcdmachinesnapshots
-  - etcdsnapshotrestores
-  - rke2etcdmachinesnapshotconfigs
   verbs:
   - create
   - delete
@@ -491,15 +511,63 @@ rules:
   - turtles-capi.cattle.io
   resources:
   - etcdmachinesnapshots/finalizers
-  - etcdsnapshotrestores/finalizers
-  - rke2etcdmachinesnapshotconfigs/finalizers
   verbs:
   - update
 - apiGroups:
   - turtles-capi.cattle.io
   resources:
   - etcdmachinesnapshots/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - turtles-capi.cattle.io
+  resources:
+  - etcdsnapshotrestores
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - turtles-capi.cattle.io
+  resources:
+  - etcdsnapshotrestores/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - turtles-capi.cattle.io
+  resources:
   - etcdsnapshotrestores/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - turtles-capi.cattle.io
+  resources:
+  - rke2etcdmachinesnapshotconfigs
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - turtles-capi.cattle.io
+  resources:
+  - rke2etcdmachinesnapshotconfigs/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - turtles-capi.cattle.io
+  resources:
   - rke2etcdmachinesnapshotconfigs/status
   verbs:
   - get

rancher-turtles-chart/values.yaml

@@ -1,24 +1,35 @@
 rancherTurtles:
   image: registry.rancher.com/rancher/rancher/turtles
-  imageVersion: v0.16.0
+  imageVersion: v0.14.1
   imagePullPolicy: IfNotPresent
   namespace: rancher-turtles-system
   managerArguments: []
   imagePullSecrets: []
-  rancherInstalled: false
+  rancherInstalled: true
-  kubectlImage: registry.suse.com/edge/3.2/kubectl:1.30.3
   features:
+    cluster-api-operator:
+      cleanup: true
+      kubectlImage: rancher/kubectl:v1.30.3
+    embedded-capi:
+      disabled: false
+    rancher-webhook:
+      cleanup: false
+      kubectlImage: rancher/kubectl:v1.30.3
+    rancher-kubeconfigs:
+      label: false
+    managementv3-cluster:
+      enabled: true
+    managementv3-cluster-migration:
+      enabled: false
+    propagate-labels:
+      enabled: false
     etcd-snapshot-restore:
       enabled: false
       image: registry.rancher.com/rancher/rancher/turtles
-      imageVersion: v0.16.0
+      imageVersion: v0.14.1
       imagePullPolicy: IfNotPresent
-    # beta feature, see documentation for more information on feature stages
     addon-provider-fleet:
       enabled: false
-    # alpha feature, see documentation for more information on feature stages
-    agent-tls-mode:
-      enabled: false
 cluster-api-operator:
   enabled: true
   cert-manager:
@@ -42,7 +53,6 @@ cluster-api-operator:
       - mountPath: /config
         name: clusterctl-config
         readOnly: true
-  cleanup: true
   cluster-api:
     enabled: true
     configSecret:
@@ -50,34 +60,30 @@ cluster-api-operator:
       defaultName: capi-env-variables
     core:
       namespace: capi-system
-      imageUrl: ""
       fetchConfig:
         url: ""
         selector: ""
     rke2:
       enabled: true
-      version: ""
       bootstrap:
         namespace: rke2-bootstrap-system
-        imageUrl: ""
         fetchConfig:
           url: ""
           selector: ""
       controlPlane:
         namespace: rke2-control-plane-system
-        imageUrl: ""
         fetchConfig:
           url: ""
           selector: ""
     metal3:
       enabled: true
-      version: "v1.9.2"
+      version: "v1.8.2"
       infrastructure:
         namespace: capm3-system
-        imageUrl: "registry.suse.com/rancher/cluster-api-provider-metal3:v1.9.2"
+        imageUrl: "registry.rancher.com/rancher/cluster-api-metal3-controller:v1.8.2"
         fetchConfig:
           url: ""
           selector: ""
       ipam:
         namespace: capm3-system
-        imageUrl: "registry.suse.com/rancher/ip-address-manager:v1.9.3"
+        imageUrl: "registry.rancher.com/rancher/cluster-api-metal3-ipam-controller:v1.8.1"

release-manifest-image/Dockerfile

@@ -1,4 +1,4 @@
-#!BuildTag: %%IMG_PREFIX%%release-manifest:3.3.0
+#!BuildTag: %%IMG_PREFIX%%release-manifest:3.2.2
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION
 
@@ -7,11 +7,11 @@ FROM registry.suse.com/bci/bci-micro:$SLE_VERSION
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SUSE Edge Release Manifest"
 LABEL org.opencontainers.image.description="Release Manifest containing information about a specific SUSE Edge release"
-LABEL org.opencontainers.image.version="3.3.0"
+LABEL org.opencontainers.image.version="3.2.2"
 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%%release-manifest:3.3.0"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%release-manifest:3.2.2"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

release-manifest-image/release_manifest.yaml

@@ -1,125 +1,124 @@
 apiVersion: lifecycle.suse.com/v1alpha1
 kind: ReleaseManifest
 metadata:
-  name: release-manifest-3-3-0
+  name: release-manifest-3-2-2
 spec:
-  releaseVersion: 3.3.0
+  releaseVersion: 3.2.2
   components:
     kubernetes:
       k3s:
-        version: v1.32.1+k3s1
+        version: v1.31.7+k3s1
         coreComponents:
-        - name: traefik-crd
+          - name: traefik-crd
-          version: 27.0.201+up27.0.2
+            version: 27.0.201+up27.0.2
-          type: HelmChart
+            type: HelmChart
-        - name: traefik
+          - name: traefik
-          version: 27.0.201+up27.0.2
+            version: 27.0.201+up27.0.2
-          type: HelmChart
+            type: HelmChart
-        - name: local-path-provisioner
-          containers:
           - name: local-path-provisioner
-            image: rancher/local-path-provisioner:v0.0.30
+            containers:
-          type: Deployment
+              - name: local-path-provisioner
-        - name: coredns
+                image: rancher/local-path-provisioner:v0.0.31
-          containers:
+            type: Deployment
           - name: coredns
-            image: rancher/mirrored-coredns-coredns:1.12.0
+            containers:
-          type: Deployment
+              - name: coredns
-        - name: metrics-server
+                image: rancher/mirrored-coredns-coredns:1.12.0
-          containers:
+            type: Deployment
           - name: metrics-server
-            image: rancher/mirrored-metrics-server:v0.7.2
+            containers:
-          type: Deployment
+              - name: metrics-server
+                image: rancher/mirrored-metrics-server:v0.7.2
+            type: Deployment
       rke2:
-        version: v1.32.1+rke2r1
+        version: v1.31.7+rke2r1
         coreComponents:
-        - name: rke2-cilium
+          - name: rke2-cilium
-          version: 1.16.501
+            version: 1.17.100
-          type: HelmChart
+            type: HelmChart
-        - name: rke2-canal
+          - name: rke2-canal
-          version: v3.29.1-build2025011000
+            version: v3.29.2-build2025030601
-          type: HelmChart
+            type: HelmChart
-        - name: rke2-calico-crd
+          - name: rke2-calico-crd
-          version: v3.29.101
+            version: v3.29.101
-          type: HelmChart
+            type: HelmChart
-        - name: rke2-calico
+          - name: rke2-calico
-          version: v3.29.101
+            version: v3.29.200
-          type: HelmChart
+            type: HelmChart
-        - name: rke2-coredns
+          - name: rke2-coredns
-          version: 1.36.102
+            version: 1.39.100
-          type: HelmChart
+            type: HelmChart
-        - name: rke2-ingress-nginx
+          - name: rke2-ingress-nginx
-          version: 4.12.003
+            version: 4.12.100
-          type: HelmChart
+            type: HelmChart
-        - name: rke2-metrics-server
+          - name: rke2-metrics-server
-          version: 3.12.200
+            version: 3.12.200
-          type: HelmChart
+            type: HelmChart
-        - name: rancher-vsphere-csi
+          - name: rancher-vsphere-csi
-          version: 3.3.1-rancher800
+            version: 3.3.1-rancher900
-          type: HelmChart
+            type: HelmChart
-        - name: rancher-vsphere-cpi
+          - name: rancher-vsphere-cpi
-          version: 1.10.000
+            version: 1.9.100
-          type: HelmChart
+            type: HelmChart
-        - name: harvester-cloud-provider
+          - name: harvester-cloud-provider
-          version: 0.2.900
+            version: 0.2.900
-          type: HelmChart
+            type: HelmChart
-        - name: harvester-csi-driver
+          - name: harvester-csi-driver
-          version: 0.1.2200
+            version: 0.1.2300
-          type: HelmChart
+            type: HelmChart
-        - name: rke2-snapshot-controller-crd
+          - name: rke2-snapshot-controller-crd
-          version: 4.0.002
+            version: 4.0.002
-          type: HelmChart
+            type: HelmChart
-        - name: rke2-snapshot-controller
+          - name: rke2-snapshot-controller
-          version: 4.0.002
+            version: 4.0.002
-          type: HelmChart
+            type: HelmChart
-        # Deprecated this empty chart addon can be removed in v1.34
+          - name: rke2-snapshot-validation-webhook
-        - name: rke2-snapshot-validation-webhook
+            version: 0.0.0
-          version: 0.0.0
+            type: HelmChart
-          type: HelmChart
     operatingSystem:
-      version: "6.1"
+      version: '6.0'
-      zypperID: "SL-Micro"
+      zypperID: SL-Micro
-      cpeScheme: "cpe:/o:suse:sl-micro:6.1"
+      cpeScheme: cpe:/o:suse:sl-micro:6.0
-      prettyName: "SUSE Linux Micro 6.1"
+      prettyName: SUSE Linux Micro 6.0
       supportedArchs:
-        - "x86_64"
+        - x86_64
-        - "aarch64"
+        - aarch64
     workloads:
       helm:
         - prettyName: Rancher
           releaseName: rancher
           chart: rancher
-          version: 2.11.0-alpha7
+          version: 2.10.3
-          repository: https://releases.rancher.com/server-charts/alpha
+          repository: https://charts.rancher.com/server-charts/prime
           values:
             postDelete:
               enabled: false
         - prettyName: Longhorn
           releaseName: longhorn
           chart: longhorn
-          version: 105.1.0+up1.7.2
+          version: 105.1.1+up1.7.3
           repository: https://charts.rancher.io
           dependencyCharts:
             - releaseName: longhorn-crd
               chart: longhorn-crd
-              version: 105.1.0+up1.7.2
+              version: 105.1.1+up1.7.3
               repository: https://charts.rancher.io
         - prettyName: MetalLB
           releaseName: metallb
-          chart: %%CHART_REPO%%/%%IMG_PREFIX%%metallb-chart
+          chart: '%%CHART_REPO%%/%%IMG_PREFIX%%metallb-chart'
-          version: %%CHART_MAJOR%%.0.0+up0.14.9
+          version: '%%CHART_MAJOR%%.0.1+up0.14.9'
         - prettyName: CDI
           releaseName: cdi
-          chart: %%CHART_REPO%%/%%IMG_PREFIX%%cdi-chart
+          chart: '%%CHART_REPO%%/%%IMG_PREFIX%%cdi-chart'
-          version: %%CHART_MAJOR%%.0.0+up0.4.0
+          version: '%%CHART_MAJOR%%.0.0+up0.4.0'
         - prettyName: KubeVirt
           releaseName: kubevirt
-          chart: %%CHART_REPO%%/%%IMG_PREFIX%%kubevirt-chart
+          chart: '%%CHART_REPO%%/%%IMG_PREFIX%%kubevirt-chart'
-          version: %%CHART_MAJOR%%.0.0+up0.4.0
+          version: '%%CHART_MAJOR%%.0.0+up0.4.0'
           addonCharts:
             - releaseName: kubevirt-dashboard-extension
-              chart: %%CHART_REPO%%/%%IMG_PREFIX%%kubevirt-dashboard-extension-chart
+              chart: '%%CHART_REPO%%/%%IMG_PREFIX%%kubevirt-dashboard-extension-chart'
-              version: %%CHART_MAJOR%%.0.0+up1.2.1
+              version: '%%CHART_MAJOR%%.0.0+up1.2.1'
         - prettyName: NeuVector
           releaseName: neuvector
           chart: neuvector
@@ -137,8 +136,8 @@ spec:
               version: 2.0.1
         - prettyName: EndpointCopierOperator
           releaseName: endpoint-copier-operator
-          chart: %%CHART_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator-chart
+          chart: '%%CHART_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator-chart'
-          version: %%CHART_MAJOR%%.0.0+up0.2.1
+          version: '%%CHART_MAJOR%%.0.0+up0.2.1'
         - prettyName: Elemental
           releaseName: elemental-operator
           chart: oci://registry.suse.com/rancher/elemental-operator-chart
@@ -154,25 +153,25 @@ spec:
               version: 3.0.0
         - prettyName: SRIOV
           releaseName: sriov-network-operator
-          chart: %%CHART_REPO%%/%%IMG_PREFIX%%sriov-network-operator-chart
+          chart: '%%CHART_REPO%%/%%IMG_PREFIX%%sriov-network-operator-chart'
-          version: %%CHART_MAJOR%%.0.0+up1.4.0
+          version: '%%CHART_MAJOR%%.0.0+up1.4.0'
           dependencyCharts:
             - releaseName: sriov-crd
-              chart: %%CHART_REPO%%/%%IMG_PREFIX%%sriov-crd-chart
+              chart: '%%CHART_REPO%%/%%IMG_PREFIX%%sriov-crd-chart'
-              version: %%CHART_MAJOR%%.0.0+up1.4.0
+              version: '%%CHART_MAJOR%%.0.0+up1.4.0'
         - prettyName: Akri
           releaseName: akri
-          chart: %%CHART_REPO%%/%%IMG_PREFIX%%akri-chart
+          chart: '%%CHART_REPO%%/%%IMG_PREFIX%%akri-chart'
-          version: %%CHART_MAJOR%%.0.0+up0.12.20
+          version: '%%CHART_MAJOR%%.0.0+up0.12.20'
           addonCharts:
             - releaseName: akri-dashboard-extension
-              chart: %%CHART_REPO%%/%%IMG_PREFIX%%akri-dashboard-extension-chart
+              chart: '%%CHART_REPO%%/%%IMG_PREFIX%%akri-dashboard-extension-chart'
-              version: %%CHART_MAJOR%%.0.0+up1.2.1
+              version: '%%CHART_MAJOR%%.0.0+up1.2.1'
         - prettyName: Metal3
           releaseName: metal3
-          chart: %%CHART_REPO%%/%%IMG_PREFIX%%metal3-chart
+          chart: '%%CHART_REPO%%/%%IMG_PREFIX%%metal3-chart'
-          version: %%CHART_MAJOR%%.0.0+up0.9.0
+          version: '%%CHART_MAJOR%%.0.1+up0.9.4'
         - prettyName: RancherTurtles
           releaseName: rancher-turtles
-          chart: %%CHART_REPO%%/%%IMG_PREFIX%%rancher-turtles-chart
+          chart: '%%CHART_REPO%%/%%IMG_PREFIX%%rancher-turtles-chart'
-          version: %%CHART_MAJOR%%.0.0+up0.14.1
+          version: '%%CHART_MAJOR%%.0.0+up0.14.1'