release-manifest: Update rancher-turtles chart

Fix the rancher-turtles-chart version to align with #44 (cherry picked from commit fbd596290a)
Remove CAPM3/IPAM images
2024-12-05 17:46:29 +00:00 · 2024-12-05 17:45:54 +00:00 · 2024-12-05 17:43:56 +00:00 · 2024-12-05 17:43:43 +00:00 · 2024-12-04 16:16:35 +01:00 · 2024-12-04 17:12:03 +02:00
40 changed files with 228 additions and 595 deletions
--- a/.gitea/workflows/sync_config.yaml
+++ b/.gitea/workflows/sync_config.yaml
@@ -1,33 +0,0 @@
-name: Synchronize Project Config
-on:
-  push:
-    branches:
-      - "main"
-      - "3.*"
-    paths:
-      - "_config"
-      - ".gitea/workflows/sync_config.yaml"
-
-jobs:
-  sync-prjconf:
-    runs-on: tumbleweed
-    steps:
-      - run: |
-          mkdir -p ~/.config/osc
-          cat >~/.config/osc/oscrc <<EOF
-          [general]
-          apiurl = https://api.opensuse.org
-
-          [https://api.opensuse.org]
-          user=${{ vars.OBS_USERNAME }}
-          pass=${{ secrets.OBS_PASSWORD }}
-          EOF
-    # Waiting on PR to get merged for support in upstream action/checkout action
-      - uses: 'https://github.com/yangskyboxlabs/action-checkout@sha256'
-        with:
-          object-format: 'sha256'
-      - run: |
-          PROJECT="$(grep PROJECT .obs/common.py | sed 's/PROJECT = "\(.*\)"/\1/')"
-          if [ "$(osc meta prjconf "${PROJECT}" | sha256sum)" = "$(cat _config | sha256sum)" ] ; then
-            osc meta prjconf "${PROJECT}" -F _config
-          fi
--- a/.obs/common.py
+++ b/.obs/common.py
@@ -1,3 +1,3 @@
-PROJECT = "isv:SUSE:Edge:Factory"
+PROJECT = "isv:SUSE:Edge:3.2"
 REPOSITORY = "https://src.opensuse.org/suse-edge/Factory"
-BRANCH = "main"
+BRANCH = "3.2"
--- a/.obs/workflows.yml
+++ b/.obs/workflows.yml
@@ -4,213 +4,209 @@ staging_build:
  steps:
  - branch_package:
      source_package: endpoint-copier-operator
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: endpoint-copier-operator-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: endpoint-copier-operator-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-agent-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-controller-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-debug-echo-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-onvif-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-opcua-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-udev-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-webhook-configuration-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: obs-service-set_version
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cosign
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: frr-k8s
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubectl
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: upgrade-controller
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: nm-configurator
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kube-rbac-proxy
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: edge-image-builder
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: hauler
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: baremetal-operator
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cdi-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: sriov-crd-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: upgrade-controller-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: edge-image-builder-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ironic-ipa-downloader-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: upgrade-controller-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metal3-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: baremetal-operator-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: sriov-network-operator-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb-controller-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb-speaker-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ironic-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cri-tools
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: crudini
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: fakeroot
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ipcalc
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: autoconf
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: rancher-turtles-airgap-resources-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: rancher-turtles-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kube-rbac-proxy-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ironic-ipa-ramdisk
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubevirt-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kiwi-builder-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubevirt-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: release-manifest-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: frr-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubectl-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
-  - branch_package:
-      source_package: frr-k8s-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
--- a/121
+++ b/121
@@ -1,121 +0,0 @@
-Prefer: -libqpid-proton10 -python311-urllib3_1
-
-Macros:
-%__python3 /usr/bin/python3.11
-%registry_url %(echo %{vendor} | cut -d '/' -f 3 | sed 's/build/registry/')
-:Macros
-
-%if "%{sub %{lower %_project} 1 14}" != "isv:suse:edge:" || "%{sub %_project 15 21}" == "Factory"
-    # Here we are in Factory like project so set chart major version to 999
-Macros:
-%chart_major 999
-:Macros
-%else
-    # Here we are in version branch, so set the image prefix and chart major accordingly
-Macros:
-%project_branch %(echo %{_project} | cut -d ':' -f 4)
-%img_prefix %{project_branch}/
-%chart_major %(echo %{project_branch} | awk '{split($1,a,"."); print a[1]*100 + a[2]}')
-:Macros
-%endif
-
-%if %{sub %_project 1 3} == ISV
-Macros:
-%img_repo registry.suse.com/edge
-%chart_repo oci://registry.suse.com/edge
-%manifest_repo registry.suse.com/edge
-%support_level l3
-:Macros
-%else
-Macros:
-%img_repo registry.opensuse.org/isv/suse/edge/containers/images
-%manifest_repo registry.opensuse.org/isv/suse/edge/containers/images
-%chart_repo oci://registry.opensuse.org/isv/suse/edge/containers/charts
-%support_level techpreview
-:Macros
-%endif
-
-%if "%_repository" == "charts" || "%_repository" == "test_manifest_images"
-Macros:
-%img_repo %(echo %{registry_url}:%{_project}:images | tr ":" "/" | tr '[:upper:]' '[:lower:]')
-%manifest_repo %(echo %{registry_url}:%{_project}:test_manifest_images | tr ":" "/" | tr '[:upper:]' '[:lower:]')
-%chart_repo oci://%(echo %{registry_url}:%{_project}:charts | tr ":" "/" | tr '[:upper:]' '[:lower:]')
-:Macros
-%endif
-
-# Missing deps for testsuite
-BuildFlags: excludebuild:autoconf:el
-BuildFlags: excludebuild:autoconf:testsuite
-
-# Only build manifest embedding images here
-%if "%_repository" == "test_manifest_images"
-BuildFlags: onlybuild:edge-image-builder-image
-BuildFlags: onlybuild:release-manifest-image
-  # Exclude the images selected by the following section
-  # as the standard repository is a dependency
-  %ifarch aarch64
-    BuildFlags: excludebuild:endpoint-copier-operator-image
-    BuildFlags: excludebuild:metallb-controller-image
-    BuildFlags: excludebuild:metallb-speaker-image
-    BuildFlags: excludebuild:baremetal-operator-image
-    BuildFlags: excludebuild:ironic-ipa-downloader-image
-    BuildFlags: excludebuild:ironic-image
-    BuildFlags: excludebuild:kube-rbac-proxy-image
-  %endif
-%else
-# Only a subset of stack is arm64 ready
-  %ifarch aarch64
-    BuildFlags: onlybuild:ca-certificates-suse
-    BuildFlags: onlybuild:cosign
-    BuildFlags: onlybuild:edge-image-builder
-    BuildFlags: onlybuild:edge-image-builder-image
-    BuildFlags: onlybuild:endpoint-copier-operator
-    BuildFlags: onlybuild:endpoint-copier-operator-image
-    BuildFlags: onlybuild:hauler
-    BuildFlags: onlybuild:metallb
-    BuildFlags: onlybuild:metallb-controller-image
-    BuildFlags: onlybuild:metallb-speaker-image
-    BuildFlags: onlybuild:nm-configurator
-    BuildFlags: onlybuild:baremetal-operator
-    BuildFlags: onlybuild:baremetal-operator-image
-    BuildFlags: onlybuild:ironic-ipa-ramdisk
-    BuildFlags: onlybuild:ironic-ipa-downloader-image
-    BuildFlags: onlybuild:ironic-image
-    BuildFlags: onlybuild:kube-rbac-proxy
-    BuildFlags: onlybuild:kube-rbac-proxy-image
-  %endif
-%endif
-
-%if "%_repository" == "images" || "%_repository" == "test_manifest_images"
-    Prefer: container:sles15-image
-    Type: docker
-    Repotype: none
-    Patterntype: none
-    BuildEngine: podman
-    Prefer: sles-release
-    BuildFlags: dockerarg:SLE_VERSION=15.6
-
-    # Publish multi-arch container images only once all archs have been built
-    PublishFlags: archsync
-%endif
-
-%if "%_repository" == "charts" || "%_repository" == "phantomcharts" || "%_repository" == "releasecharts"
-    Type: helm
-    Repotype: helm
-    Patterntype: none
-    Required: perl-YAML-LibYAML
-%endif
-
-%if "%_repository" == "standard"
-    # for build openstack-ironic-image
-    BuildFlags: allowrootforbuild
-%endif
-
-# Enable reproducible builds
-# https://en.opensuse.org/openSUSE:Reproducible_Builds\#With_OBS
-Macros:
-%source_date_epoch_from_changelog Y
-%clamp_mtime_to_source_date_epoch Y
-%use_source_date_epoch_as_buildtime Y
-%_buildhost reproducible
-:Macros
--- a/akri-dashboard-extension-chart/Chart.yaml
+++ b/akri-dashboard-extension-chart/Chart.yaml
@@ -1,6 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0
-#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.1
-#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.0
+#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.0-%RELEASE%
 annotations:
  catalog.cattle.io/certified: rancher
  catalog.cattle.io/display-name: Akri
@@ -11,11 +10,11 @@ annotations:
  catalog.cattle.io/rancher-version: ">= 2.10.0-0"
  catalog.cattle.io/scope: management
  catalog.cattle.io/ui-component: plugins
-  catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
+  catalog.cattle.io/ui-extensions-version: ">= 3.0.0"
 apiVersion: v2
-appVersion: 1.2.1
+appVersion: 1.2.0
 description: "SUSE Edge: Akri extension for Rancher Dashboard"
 icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/akri/icon/color/akri-icon-color.svg
 name: akri-dashboard-extension
 type: application
-version: "%%CHART_MAJOR%%.0.0+up1.2.1"
+version: "%%CHART_MAJOR%%.0.0+up1.2.0"
--- a/akri-dashboard-extension-chart/templates/cr.yaml
+++ b/akri-dashboard-extension-chart/templates/cr.yaml
@@ -8,7 +8,7 @@ spec:
  plugin:
    name: {{ include "extension-server.fullname" . }}
    version: {{ (semver (default .Chart.AppVersion .Values.plugin.versionOverride)).Original }}
-    endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/akri-dashboard-extension/1.2.1
+    endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/akri-dashboard-extension/1.2.0
    noCache: {{ .Values.plugin.noCache }}
    noAuth: {{ .Values.plugin.noAuth }}
    metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}
--- a/akri-dashboard-extension-chart/values.yaml
+++ b/akri-dashboard-extension-chart/values.yaml
@@ -8,5 +8,5 @@ plugin:
  metadata:
    catalog.cattle.io/display-name: Akri
    catalog.cattle.io/rancher-version: ">= 2.10.0-0"
-    catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
+    catalog.cattle.io/ui-extensions-version: ">= 3.0.0"
    catalog.cattle.io/kube-version: ">= v1.26.0-0"
--- a/frr-k8s-image/Dockerfile
+++ b/frr-k8s-image/Dockerfile
@@ -1,33 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%frr-k8s:v%%frr-k8s_version%%
-#!BuildTag: %%IMG_PREFIX%%frr-k8s:v%%frr-k8s_version%%-%RELEASE%
-#!BuildVersion: 15.6
-ARG SLE_VERSION
-FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
-
-FROM registry.suse.com/bci/bci-base:$SLE_VERSION AS base
-COPY --from=micro / /installroot/
-RUN zypper --installroot /installroot --non-interactive install --no-recommends frr-k8s; zypper -n clean; rm -rf /var/log/*
-
-FROM micro AS final
-# Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=com.suse.application.endpoint-copier-operator
-LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
-LABEL org.opencontainers.image.title="SLE frr-k8s Container Image"
-LABEL org.opencontainers.image.description="frr-k8s based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="%%frr-k8s_version%%"
-LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
-LABEL org.opencontainers.image.created="%BUILDTIME%"
-LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%frr-k8s:v%%frr-k8s_version%%-%RELEASE%"
-LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
-LABEL com.suse.eula="SUSE Combined EULA February 2024"
-LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
-LABEL com.suse.image-type="application"
-LABEL com.suse.release-stage="released"
-# endlabelprefix
-
-#Install frr-k8s
-COPY --from=base /installroot /
-ENTRYPOINT ["/frr-k8s"]
--- a/frr-k8s-image/_service
+++ b/frr-k8s-image/_service
@@ -1,19 +0,0 @@
-<services>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service mode="buildtime" name="docker_label_helper"/>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="regex">%%frr-k8s_version%%</param>
-    <param name="package">frr-k8s</param>
-    <param name="parse-version">patch</param>
-  </service>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
-    <param name="var">IMG_PREFIX</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
-    <param name="var">IMG_REPO</param>
-    <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
-    <param name="var">SUPPORT_LEVEL</param>
-  </service>
-</services>
--- a/ironic-image/Dockerfile
+++ b/ironic-image/Dockerfile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.2
-#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.2-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.0
+#!BuildTag: %%IMG_PREFIX%%ironic:26.1.2.0-%RELEASE%
 #!BuildVersion: 15.6

 ARG SLE_VERSION
@@ -8,14 +8,7 @@ FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro

 FROM registry.suse.com/bci/bci-base:$SLE_VERSION AS base

-#!ArchExclusiveLine: x86_64
-RUN if [ "$(uname -m)" = "x86_64" ];then \
-      zypper -n  in --no-recommends gcc git make xz-devel shim dosfstools mtools glibc-extra grub2-x86_64-efi grub2; zypper -n clean; rm -rf /var/log/*; \
-    fi
-#!ArchExclusiveLine: aarch64
-RUN if [ "$(uname -m)" = "aarch64" ];then \
-      zypper -n rm kubic-locale-archive-2.31-10.36.noarch openssl-1_1-1.1.1l-150500.17.37.1.aarch64; zypper -n in --no-recommends gcc git make xz-devel openssl-3 mokutil shim dosfstools mtools glibc glibc-extra grub2 grub2-arm64-efi; zypper -n clean; rm -rf /var/log/* ;\
-    fi
+RUN set -euo pipefail; zypper -n  in --no-recommends gcc git make xz-devel shim dosfstools mtools glibc-extra grub2-x86_64-efi grub2; zypper -n clean; rm -rf /var/log/*
 WORKDIR /tmp
 COPY prepare-efi.sh /bin/
 RUN set -euo pipefail; chmod +x /bin/prepare-efi.sh
@@ -23,16 +16,8 @@ RUN /bin/prepare-efi.sh

 COPY --from=micro / /installroot/
 RUN sed -i -e 's%^# rpm.install.excludedocs = no.*%rpm.install.excludedocs = yes%g' /etc/zypp/zypp.conf
+RUN zypper --installroot /installroot --non-interactive install --no-recommends python311-devel python311 python311-pip python-dracclient python311-sushy-oem-idrac python311-proliantutils python311-sushy python3-ironicclient git curl sles-release tar gzip vim gawk dnsmasq dosfstools apache2 inotify-tools ipcalc ipmitool iproute2 procps qemu-tools sqlite3 util-linux xorriso tftp syslinux ipxe-bootimgs crudini openstack-ironic

-#!ArchExclusiveLine: x86_64
-RUN if [ "$(uname -m)" = "x86_64" ];then \
-      zypper --installroot /installroot --non-interactive install --no-recommends syslinux python311-devel python311 python311-pip python-dracclient python311-sushy-oem-idrac python311-proliantutils python311-sushy python3-ironicclient git curl sles-release tar gzip vim gawk dnsmasq dosfstools apache2 apache2-mod_wsgi inotify-tools ipcalc ipmitool iproute2 procps qemu-tools sqlite3 util-linux xorriso tftp ipxe-bootimgs python311-sushy-tools crudini openstack-ironic openstack-ironic-inspector-api; \
-    fi
-#!ArchExclusiveLine: aarch64
-RUN if [ "$(uname -m)" = "aarch64" ];then \
-      zypper --installroot /installroot --non-interactive install --no-recommends python311-devel python311 python311-pip python-dracclient python311-sushy-oem-idrac python311-proliantutils python311-sushy python3-ironicclient git curl sles-release tar gzip vim gawk dnsmasq dosfstools apache2 apache2-mod_wsgi inotify-tools ipcalc ipmitool iproute2 procps qemu-tools sqlite3 util-linux xorriso tftp ipxe-bootimgs python311-sushy-tools crudini openstack-ironic openstack-ironic-inspector-api; \
-    fi
-    
 # DATABASE
 RUN mkdir -p /installroot/var/lib/ironic && \
  /installroot/usr/bin/sqlite3 /installroot/var/lib/ironic/ironic.sqlite "pragma journal_mode=wal" && \
@@ -46,8 +31,8 @@ LABEL org.opencontainers.image.description="Openstack Ironic based on the SLE Ba
 LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opencontainers.image.version="26.1.2.2"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.2-%RELEASE%"
+LABEL org.opencontainers.image.version="26.1.2.0"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.0-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
@@ -79,15 +64,7 @@ RUN mkdir -p $GRUB_DIR

 # IRONIC #
 RUN cp /usr/share/ipxe/undionly.kpxe /tftpboot/undionly.kpxe
-#!ArchExclusiveLine: x86_64
-RUN if [ "$(uname -m)" = "x86_64" ];then \
-      cp /usr/share/ipxe/ipxe-x86_64.efi /tftpboot/ipxe.efi ;\
-    fi
-#!ArchExclusiveLine: x86_64
-RUN if [ "$(uname -m)" = "aarch64" ]; then\ 
-     cp /usr/share/ipxe/snp-arm64.efi /tftpboot/ipxe.efi; cp /usr/share/ipxe/snp-arm64.efi /tftpboot/snp-arm64.efi; cp /usr/share/ipxe/snp-arm64.efi /tftpboot/snp.efi ;\
-    fi
-    
+RUN cp /usr/share/ipxe/ipxe-x86_64.efi /tftpboot/ipxe.efi
 COPY --from=base /tmp/esp.img /tmp/uefi_esp.img

 COPY ironic.conf.j2 /etc/ironic/
--- a/ironic-image/prepare-efi.sh
+++ b/ironic-image/prepare-efi.sh
@@ -6,37 +6,22 @@ ARCH=$(uname -m)
 DEST=${2:-/tmp/esp.img}
 OS=${1:-sles}

-if [ $ARCH = "aarch64" ]; then
-  BOOTEFI=BOOTAA64.EFI
-  GRUBEFI=grubaa64.efi
-else
-  BOOTEFI=BOOTX64.efi
-  GRUBEFI=grubx64.efi
-fi
+BOOTEFI=BOOTX64.efi
+GRUBEFI=grubx64.efi

 dd bs=1024 count=6400 if=/dev/zero of=$DEST
 mkfs.msdos -F 12 -n 'ESP_IMAGE' $DEST

 mkdir -p /boot/efi/EFI/BOOT
+cp -L /usr/lib64/efi/shim.efi /boot/efi/EFI/BOOT/$BOOTEFI
 mkdir -p /boot/efi/EFI/$OS
-if [ $ARCH = "aarch64" ]; then
-  cp -L /usr/share/efi/aarch64/shim.efi /boot/efi/EFI/BOOT/$BOOTEFI
-  cp -L /usr/share/efi/aarch64/grub.efi /boot/efi/EFI/BOOT/grub.efi
-  cp /usr/share/grub2/arm64-efi/grub.efi /boot/efi/EFI/$OS/grubaa64.efi
-else
-  cp -L /usr/lib64/efi/shim.efi /boot/efi/EFI/BOOT/$BOOTEFI
-  #cp /usr/share/grub2/x86_64-efi/grub.efi /boot/efi/EFI/$OS/$GRUBEFI
-  cp /usr/share/grub2/x86_64-efi/grub.efi /boot/efi/EFI/$OS/grub.efi
-fi
+#cp /usr/share/grub2/x86_64-efi/grub.efi /boot/efi/EFI/$OS/$GRUBEFI
+cp /usr/share/grub2/x86_64-efi/grub.efi /boot/efi/EFI/$OS/grub.efi

 mmd -i $DEST EFI
 mmd -i $DEST EFI/BOOT
 mcopy -i $DEST -v /boot/efi/EFI/BOOT/$BOOTEFI ::EFI/BOOT
-if [ $ARCH = "aarch64" ]; then
-  mcopy -i $DEST -v /boot/efi/EFI/BOOT/grub.efi ::EFI/BOOT
-  mcopy -i $DEST -v /boot/efi/EFI/$OS/$GRUBEFI ::EFI/BOOT
-else
-  mcopy -i $DEST -v /boot/efi/EFI/$OS/grub.efi ::EFI/BOOT
-fi 
+#mcopy -i $DEST -v /boot/efi/EFI/$OS/$GRUBEFI ::EFI/BOOT
+mcopy -i $DEST -v /boot/efi/EFI/$OS/grub.efi ::EFI/BOOT
 mdir -i $DEST ::EFI/BOOT;

--- a/ironic-image/runlogwatch.sh
+++ b/ironic-image/runlogwatch.sh
@@ -3,14 +3,6 @@
 # Ramdisk logs path
 LOG_DIR="/shared/log/ironic/deploy"

-# The ironic container creates the directory, wait for
-# it to exist before running inotifywait or it can fail causing
-# a spurious restart
-while [ ! -d "${LOG_DIR}" ]; do
-  echo "Waiting for ${LOG_DIR}"
-  sleep 5
-done
-
 inotifywait -m "${LOG_DIR}" -e close_write |
    while read -r path _action file; do
        echo "************ Contents of ${path}/${file} ramdisk log file bundle **************"
--- a/ironic-ipa-downloader-image/Dockerfile
+++ b/ironic-ipa-downloader-image/Dockerfile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.1
-#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.0
+#!BuildTag: %%IMG_PREFIX%%ironic-ipa-downloader:3.0.0-%RELEASE%
 #!BuildVersion: 15.6
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
@@ -8,14 +8,7 @@ FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
 FROM registry.suse.com/bci/bci-base:$SLE_VERSION AS base
 COPY --from=micro / /installroot/
 RUN sed -i -e 's%^# rpm.install.excludedocs = no.*%rpm.install.excludedocs = yes%g' /etc/zypp/zypp.conf
-#!ArchExclusiveLine: x86_64
-RUN if [ "$(uname -m)" = "x86_64" ];then \
-  zypper --installroot /installroot --non-interactive install --no-recommends ironic-ipa-ramdisk-x86_64 python311-devel python311 python311-pip tar gawk git curl xz fakeroot shadow sed cpio; zypper -n clean; rm -rf /var/log/*; \
-  fi
-#!ArchExclusiveLine: aarch64
-RUN if [ "$(uname -m)" = "aarch64" ];then \
-  zypper --installroot /installroot --non-interactive install --no-recommends ironic-ipa-ramdisk-aarch64 python311-devel python311 python311-pip tar gawk git curl xz fakeroot shadow sed cpio; zypper -n clean; rm -rf /var/log/*; \
-  fi
+RUN zypper --installroot /installroot --non-interactive install --no-recommends ironic-ipa-ramdisk-x86_64 python311-devel python311 python311-pip tar gawk git curl xz fakeroot shadow sed cpio; zypper -n clean; rm -rf /var/log/*
 #RUN zypper --installroot /installroot --non-interactive install --no-recommends sles-release;
 RUN cp /usr/bin/getopt /installroot/

@@ -26,11 +19,11 @@ FROM micro AS final
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE Based Ironic IPA Downloader Container Image"
 LABEL org.opencontainers.image.description="ironic-ipa-downloader based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="3.0.1"
+LABEL org.opencontainers.image.version="3.0.0"
 LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.1-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.0-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/ironic-ipa-downloader-image/_service
+++ b/ironic-ipa-downloader-image/_service
@@ -1,6 +1,12 @@
 <services>
  <service mode="buildtime" name="kiwi_metainfo_helper"/>
  <service mode="buildtime" name="docker_label_helper"/>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%ironic-ipa-ramdisk-x86_64_version%%</param>
+    <param name="package">ironic-ipa-ramdisk-x86_64</param>
+    <param name="parse-version">patch</param>
+  </service>
  <service name="replace_using_env" mode="buildtime">
    <param name="file">Dockerfile</param>
    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
--- a/ironic-ipa-downloader-image/get-resource.sh
+++ b/ironic-ipa-downloader-image/get-resource.sh
@@ -8,10 +8,10 @@ export no_proxy=${no_proxy:-$NO_PROXY}

 # Which image should we use
 if [ -z "${IPA_BASEURI}" ]; then
-  # SLES BASED IPA - ironic-ipa-ramdisk-x86_64 package
+  # SLES BASED IPA - openstack-ironic-image-x86_64 package
  mkdir -p /shared/html/images
  cp /tmp/initrd.xz /shared/html/images/ironic-python-agent.initramfs
-  cp /tmp/openstack-ironic-image*.kernel /shared/html/images/ironic-python-agent.kernel
+  cp /tmp/openstack-ironic-image*.x86_64*.kernel /shared/html/images/ironic-python-agent.kernel
 else
  FILENAME=ironic-python-agent
  FILENAME_EXT=.tar
@@ -68,4 +68,4 @@ if [ -d "/tmp/ironic-certificates" ]; then
  mkdir -p etc/ironic-python-agent.d/ca-certs
  cp /tmp/ironic-certificates/* etc/ironic-python-agent.d/ca-certs/
  find . | fakeroot -i ../initrd.fakeroot cpio -o -H newc | xz --check=crc32 --x86 --lzma2 --fast > /shared/html/images/ironic-python-agent.initramfs
-fi
+fi
--- a/ironic-ipa-ramdisk/ironic-ipa-ramdisk.kiwi
+++ b/ironic-ipa-ramdisk/ironic-ipa-ramdisk.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="7.4" name="openstack-ironic-image-301">
+<image schemaversion="7.4" name="openstack-ironic-image-201">
    <description type="system">
        <author>Cloud developers</author>
        <contact>cloud-devel@suse.de</contact>
@@ -116,9 +116,8 @@
        <package name="vim"/>
        <package name="grub2"/>
        <package name="grub2-x86_64-efi" arch="x86_64"/>
-        <package name="grub2-arm64-efi" arch="aarch64"/>
-        <package name="grub2-i386-pc" arch="x86_64"/>
-        <package name="syslinux" arch="x86_64"/>
+        <package name="grub2-i386-pc"/>
+        <package name="syslinux"/>
        <package name="lvm2"/>
        <package name="plymouth"/>
        <package name="fontconfig"/>
@@ -136,10 +135,12 @@
        <package name="openstack-ironic-python-agent"/>
        <package name="hdparm"/>
        <package name="qemu-tools"/>
-        <package name="python311-proliantutils"/>
+        <package name="python311-proliantutils" arch="x86_64"/>
        <package name="lshw"/>
-        <package name="dmidecode"/>
-        <package name="efibootmgr"/>
+        <package name="dmidecode" arch="aarch64"/>
+        <package name="dmidecode" arch="x86_64"/>
+        <package name="efibootmgr" arch="aarch64" />
+        <package name="efibootmgr" arch="x86_64" />
        <package name="gptfdisk"/>
        <package name="open-iscsi"/>
        <package name="hwinfo"/>
@@ -156,6 +157,7 @@
    </packages>

    <packages type="kis">
+        <package name="gfxboot-branding-SLE"/>
        <package name="dracut-kiwi-oem-repart"/>
        <package name="dracut-kiwi-oem-dump"/>
    </packages> 
--- a/ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec
+++ b/ironic-ipa-ramdisk/ironic-ipa-ramdisk.spec
@@ -19,7 +19,7 @@


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

--- a/ironic-ipa-ramdisk/root.tar.bz2
+++ b/ironic-ipa-ramdisk/root.tar.bz2
--- a/kubevirt-dashboard-extension-chart/Chart.yaml
+++ b/kubevirt-dashboard-extension-chart/Chart.yaml
@@ -1,6 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0
-#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.1
-#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.0
+#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.0-%RELEASE%
 annotations:
  catalog.cattle.io/certified: rancher
  catalog.cattle.io/display-name: KubeVirt
@@ -11,11 +10,11 @@ annotations:
  catalog.cattle.io/rancher-version: '>= 2.10.0-0'
  catalog.cattle.io/scope: management
  catalog.cattle.io/ui-component: plugins
-  catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
+  catalog.cattle.io/ui-extensions-version: '>= 3.0.0'
 apiVersion: v2
-appVersion: 1.2.1
+appVersion: 1.2.0
 description: 'SUSE Edge: KubeVirt extension for Rancher Dashboard'
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/kubevirt/icon/color/kubevirt-icon-color.svg
 name: kubevirt-dashboard-extension
 type: application
-version: "%%CHART_MAJOR%%.0.0+up1.2.1"
+version: "%%CHART_MAJOR%%.0.0+up1.2.0"
--- a/kubevirt-dashboard-extension-chart/templates/cr.yaml
+++ b/kubevirt-dashboard-extension-chart/templates/cr.yaml
@@ -8,7 +8,7 @@ spec:
  plugin:
    name: {{ include "extension-server.fullname" . }}
    version: {{ (semver (default .Chart.AppVersion .Values.plugin.versionOverride)).Original }}
-    endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/kubevirt-dashboard-extension/1.2.1
+    endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/kubevirt-dashboard-extension/1.2.0
    noCache: {{ .Values.plugin.noCache }}
    noAuth: {{ .Values.plugin.noAuth }}
    metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}
--- a/kubevirt-dashboard-extension-chart/values.yaml
+++ b/kubevirt-dashboard-extension-chart/values.yaml
@@ -8,5 +8,5 @@ plugin:
  metadata:
    catalog.cattle.io/display-name: KubeVirt
    catalog.cattle.io/rancher-version: ">= 2.10.0-0"
-    catalog.cattle.io/ui-extensions-version: ">= 3.0.0 < 4.0.0"
+    catalog.cattle.io/ui-extensions-version: ">= 3.0.0"
    catalog.cattle.io/kube-version: ">= v1.26.0-0"
--- a/metal3-chart/Chart.yaml
+++ b/metal3-chart/Chart.yaml
@@ -1,16 +1,16 @@
-#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.2
-#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.2-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.0
+#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.0-%RELEASE%
 apiVersion: v2
-appVersion: 0.9.2
+appVersion: 0.9.0
 dependencies:
 - alias: metal3-baremetal-operator
  name: baremetal-operator
  repository: file://./charts/baremetal-operator
-  version: 0.6.1
+  version: 0.6.0
 - alias: metal3-ironic
  name: ironic
  repository: file://./charts/ironic
-  version: 0.9.1
+  version: 0.8.0
 - alias: metal3-mariadb
  condition: global.enable_mariadb
  name: mariadb
@@ -20,9 +20,9 @@ dependencies:
  condition: global.enable_metal3_media_server
  name: media
  repository: file://./charts/media
-  version: 0.6.1
+  version: 0.6.0
 description: A Helm chart that installs all of the dependencies needed for Metal3
 icon: https://github.com/cncf/artwork/raw/master/projects/metal3/icon/color/metal3-icon-color.svg
 name: metal3
 type: application
-version: "%%CHART_MAJOR%%.0.0+up0.9.2"
+version: "%%CHART_MAJOR%%.0.0+up0.9.0"
--- a/metal3-chart/charts/baremetal-operator/Chart.yaml
+++ b/metal3-chart/charts/baremetal-operator/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: 0.8.0
 description: A Helm chart for baremetal-operator, used by Metal3
 name: baremetal-operator
 type: application
-version: 0.6.1
+version: 0.6.0
--- a/metal3-chart/charts/baremetal-operator/templates/tests/test-connection.yaml
+++ b/metal3-chart/charts/baremetal-operator/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "baremetal-operator.fullname" . }}-test-connection"
+  labels:
+    {{- include "baremetal-operator.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['{{ include "baremetal-operator.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
--- a/metal3-chart/charts/ironic/Chart.yaml
+++ b/metal3-chart/charts/ironic/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: 26.1.2
 description: A Helm chart for Ironic, used by Metal3
 name: ironic
 type: application
-version: 0.9.1
+version: 0.8.0
--- a/metal3-chart/charts/ironic/values.yaml
+++ b/metal3-chart/charts/ironic/values.yaml
@@ -56,11 +56,11 @@ images:
  ironic:
    repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic
    pullPolicy: IfNotPresent
-    tag: 26.1.2.2
+    tag: 26.1.2.0
  ironicIPADownloader:
    repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic-ipa-downloader
    pullPolicy: IfNotPresent
-    tag: 3.0.1
+    tag: 3.0.0

 nameOverride: ""
 fullnameOverride: ""
--- a/metal3-chart/charts/media/Chart.yaml
+++ b/metal3-chart/charts/media/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: 1.16.0
 description: A Helm chart for Media, used by Metal3
 name: media
 type: application
-version: 0.6.1
+version: 0.6.0
--- a/metal3-chart/charts/media/templates/tests/test-connection.yaml
+++ b/metal3-chart/charts/media/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "media.fullname" . }}-test-connection"
+  labels:
+    {{- include "media.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['{{ include "media.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
--- a/metal3-chart/charts/media/values.yaml
+++ b/metal3-chart/charts/media/values.yaml
@@ -24,7 +24,7 @@ replicaCount: 1
 image:
  repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic
  pullPolicy: IfNotPresent
-  tag: 26.1.2.2
+  tag: 26.1.2.0

 imagePullSecrets: []
 nameOverride: ""
--- a/release-manifest-image/_service
+++ b/release-manifest-image/_service
@@ -4,7 +4,7 @@
    <param name="file">Dockerfile</param>
    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
    <param name="var">IMG_PREFIX</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
    <param name="var">IMG_REPO</param>
    <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
    <param name="var">SUPPORT_LEVEL</param>
--- a/release-manifest-image/release_manifest.yaml
+++ b/release-manifest-image/release_manifest.yaml
@@ -7,74 +7,9 @@ spec:
  components:
    kubernetes:
      k3s:
-        version: v1.31.3+k3s1
-        coreComponents:
-        - name: traefik-crd
-          version: 27.0.201+up27.0.2
-          type: HelmChart
-        - name: traefik
-          version: 27.0.201+up27.0.2
-          type: HelmChart
-        - name: local-path-provisioner
-          containers:
-          - name: local-path-provisioner
-            image: rancher/local-path-provisioner:v0.0.30
-          type: Deployment
-        - name: coredns
-          containers:
-          - name: coredns
-            image: rancher/mirrored-coredns-coredns:1.11.3
-          type: Deployment
-        - name: metrics-server
-          containers:
-          - name: metrics-server
-            image: rancher/mirrored-metrics-server:v0.7.2
-          type: Deployment
+        version: v1.31.2+k3s1
      rke2:
-        version: v1.31.3+rke2r1
-        coreComponents:
-        - name: rke2-cilium
-          version: 1.16.303
-          type: HelmChart
-        - name: rke2-canal
-          version: v3.29.0-build2024110400
-          type: HelmChart
-        - name: rke2-calico-crd
-          version: v3.29.000
-          type: HelmChart
-        - name: rke2-calico
-          version: v3.29.000
-          type: HelmChart
-        - name: rke2-coredns
-          version: 1.33.005
-          type: HelmChart
-        - name: rke2-ingress-nginx
-          version: 4.10.502
-          type: HelmChart
-        - name: rke2-metrics-server
-          version: 3.12.004
-          type: HelmChart
-        - name: rancher-vsphere-csi
-          version: 3.3.1-rancher700
-          type: HelmChart
-        - name: rancher-vsphere-cpi
-          version: 1.9.100
-          type: HelmChart
-        - name: harvester-cloud-provider
-          version: 0.2.600
-          type: HelmChart
-        - name: harvester-csi-driver
-          version: 0.1.2000
-          type: HelmChart
-        - name: rke2-snapshot-controller-crd
-          version: 3.0.601
-          type: HelmChart
-        - name: rke2-snapshot-controller
-          version: 3.0.601
-          type: HelmChart
-        - name: rke2-snapshot-validation-webhook
-          version: 1.9.001
-          type: HelmChart
+        version: v1.31.2+rke2r1
    operatingSystem:
      version: "6.0"
      zypperID: "SL-Micro"
@@ -88,11 +23,8 @@ spec:
        - prettyName: Rancher
          releaseName: rancher
          chart: rancher
-          version: 2.10.1
-          repository: https://charts.rancher.com/server-charts/prime
-          values:
-            postDelete:
-              enabled: false
+          version: v2.10.0
+          repository: https://releases.rancher.com/server-charts/stable
        - prettyName: Longhorn
          releaseName: longhorn
          chart: longhorn
@@ -118,7 +50,7 @@ spec:
          addonCharts:
            - releaseName: kubevirt-dashboard-extension
              chart: %%CHART_REPO%%/%%IMG_PREFIX%%kubevirt-dashboard-extension-chart
-              version: %%CHART_MAJOR%%.0.0+up1.2.1
+              version: %%CHART_MAJOR%%.0.0+up1.2.0
        - prettyName: NeuVector
          releaseName: neuvector
          chart: neuvector
@@ -146,11 +78,6 @@ spec:
            - releaseName: elemental-operator-crds
              chart: oci://registry.suse.com/rancher/elemental-operator-crds-chart
              version: 1.6.5
-          addonCharts:
-            - releaseName: elemental
-              chart: elemental
-              repository: https://github.com/rancher/ui-plugin-charts/raw/main
-              version: 3.0.0
        - prettyName: SRIOV
          releaseName: sriov-network-operator
          chart: %%CHART_REPO%%/%%IMG_PREFIX%%sriov-network-operator-chart
@@ -166,7 +93,7 @@ spec:
          addonCharts:
            - releaseName: akri-dashboard-extension
              chart: %%CHART_REPO%%/%%IMG_PREFIX%%akri-dashboard-extension-chart
-              version: %%CHART_MAJOR%%.0.0+up1.2.1
+              version: %%CHART_MAJOR%%.0.0+up1.1.0
        - prettyName: Metal3
          releaseName: metal3
          chart: %%CHART_REPO%%/%%IMG_PREFIX%%metal3-chart
--- a/upgrade-controller-chart/Chart.yaml
+++ b/upgrade-controller-chart/Chart.yaml
@@ -1,13 +1,13 @@
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.1
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.0
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.0-%RELEASE%
 apiVersion: v2
-appVersion: 0.1.1
+appVersion: 0.1.0
 dependencies:
 - condition: crds.enabled
  name: lifecycle-crds
  repository: file://./charts/lifecycle-crds
-  version: 0.1.1
+  version: 0.1.0
 description: A Helm chart for Upgrade Controller
 name: upgrade-controller
 type: application
-version: "%%CHART_MAJOR%%.0.0+up0.1.1"
+version: "%%CHART_MAJOR%%.0.0+up0.1.0"
--- a/upgrade-controller-chart/_service
+++ b/upgrade-controller-chart/_service
@@ -6,8 +6,6 @@
    <param name="var">IMG_PREFIX</param>
    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
    <param name="var">IMG_REPO</param>
-    <param name="eval">MANIFEST_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
-    <param name="var">MANIFEST_REPO</param>
  </service>
  <service name="replace_using_env" mode="buildtime">
    <param name="file">Chart.yaml</param>
@@ -17,3 +15,4 @@
    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
+
--- a/upgrade-controller-chart/charts/lifecycle-crds/Chart.yaml
+++ b/upgrade-controller-chart/charts/lifecycle-crds/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 0.1.1
+appVersion: 0.1.0
 description: A Helm chart containing SUSE Lifecycle CRDs
 name: lifecycle-crds
 type: application
-version: 0.1.1
+version: 0.1.0
--- a/upgrade-controller-chart/charts/lifecycle-crds/templates/release-manifest-crd.yaml
+++ b/upgrade-controller-chart/charts/lifecycle-crds/templates/release-manifest-crd.yaml
@@ -43,35 +43,6 @@ spec:
                      properties:
                        k3s:
                          properties:
-                            coreComponents:
-                              items:
-                                properties:
-                                  containers:
-                                    items:
-                                      properties:
-                                        image:
-                                          type: string
-                                        name:
-                                          type: string
-                                      required:
-                                        - image
-                                        - name
-                                      type: object
-                                    type: array
-                                  name:
-                                    type: string
-                                  type:
-                                    enum:
-                                      - HelmChart
-                                      - Deployment
-                                    type: string
-                                  version:
-                                    type: string
-                                required:
-                                  - name
-                                  - type
-                                type: object
-                              type: array
                            version:
                              type: string
                          required:
@@ -79,35 +50,6 @@ spec:
                          type: object
                        rke2:
                          properties:
-                            coreComponents:
-                              items:
-                                properties:
-                                  containers:
-                                    items:
-                                      properties:
-                                        image:
-                                          type: string
-                                        name:
-                                          type: string
-                                      required:
-                                        - image
-                                        - name
-                                      type: object
-                                    type: array
-                                  name:
-                                    type: string
-                                  type:
-                                    enum:
-                                      - HelmChart
-                                      - Deployment
-                                    type: string
-                                  version:
-                                    type: string
-                                required:
-                                  - name
-                                  - type
-                                type: object
-                              type: array
                            version:
                              type: string
                          required:
--- a/upgrade-controller-chart/templates/clusterrole.yaml
+++ b/upgrade-controller-chart/templates/clusterrole.yaml
@@ -29,14 +29,6 @@ rules:
  - customresourcedefinitions
  verbs:
  - get
- apiGroups:
-  - apps
-  resources:
-  - deployments
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
  - batch
  resources:
--- a/upgrade-controller-chart/values.yaml
+++ b/upgrade-controller-chart/values.yaml
@@ -12,7 +12,7 @@ image:

 env:
  releaseManifest:
-    image: %%MANIFEST_REPO%%/%%IMG_PREFIX%%release-manifest
+    image: %%IMG_REPO%%/%%IMG_PREFIX%%release-manifest
  kubectl:
    image: %%IMG_REPO%%/%%IMG_PREFIX%%kubectl
    version: 1.30.3
--- a/upgrade-controller-image/Dockerfile
+++ b/upgrade-controller-image/Dockerfile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.1
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.0
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.0-%RELEASE%
 #!BuildVersion: 15.6
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
@@ -16,11 +16,11 @@ FROM micro AS final
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE Edge Upgrade Controller Container Image"
 LABEL org.opencontainers.image.description="Edge Update Controller Image based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="0.1.1"
+LABEL org.opencontainers.image.version="0.1.0"
 LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%upgrade-controller:0.1.1-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%upgrade-controller:0.1.0-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/upgrade-controller/_service
+++ b/upgrade-controller/_service
@@ -4,7 +4,7 @@
    <param name="versionformat">@PARENT_TAG@</param>
    <param name="scm">git</param>
    <param name="exclude">.git</param>
-    <param name="revision">v0.1.1</param>
+    <param name="revision">v0.1.0</param>
    <param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>
    <param name="versionrewrite-replacement">\1.\2.\3</param>
    <param name="changesgenerate">enable</param>
--- a/upgrade-controller/upgrade-controller.spec
+++ b/upgrade-controller/upgrade-controller.spec
@@ -17,7 +17,7 @@


 Name:           upgrade-controller
-Version:        0.1.1
+Version:        0.1.0
 Release:        0
 Summary:        Upgrade Controller
 License:        Apache-2.0
Author	SHA256	Message	Date
Steven Hardy	dfa68ba86e	release-manifest: Update rancher-turtles chart Fix the rancher-turtles-chart version to align with #44 (cherry picked from commit `fbd596290a`)	2024-12-05 17:46:29 +00:00
Steven Hardy	075e2a209c	Remove CAPM3/IPAM images These are now provided by the rancher registry since #44 Conflicts: .obs/workflows.yml (cherry picked from commit `ec6c4745ea`)	2024-12-05 17:45:54 +00:00
Steven Hardy	2928b2076e	rancher-turtles-airgap-resources-chart: Update to 0.14.1 upstream release Aligns with https://github.com/suse-edge/charts/pull/174 which rebases to 0.14.1, which is marked as compatible with Rancher 2.10 (cherry picked from commit `856ec2ac8e`)	2024-12-05 17:43:56 +00:00
Steven Hardy	39338dd6ac	rancher-turtles-chart: Update to 0.14.1 upstream release Aligns with https://github.com/suse-edge/charts/pull/174 which rebases to 0.14.1, which is marked as compatible with Rancher 2.10 (cherry picked from commit `7721c66ab0`)	2024-12-05 17:43:43 +00:00
Denislav Prodanov	dfc8bb30d9	Merge pull request 'backport into 3.2 fixed versions in eib artifacts' (#43 ) from dprodanov/Factory:eib-3.2 into 3.2 Reviewed-on: suse-edge/Factory#43 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>	2024-12-04 16:16:35 +01:00
Denislav Prodanov	33f56e8b23	fixed versions in eib artifacts	2024-12-04 17:12:03 +02:00
Steven Hardy	744d04b40a	kiwi-builder-image: Align with OBS latest version Aligns with the latest fixes in isv:SUSE:Edge:KiwiBuilder/kiwi-builder-10 (cherry picked from commit `8a93aae7c5`)	2024-12-04 12:25:44 +00:00
Denislav Prodanov	5e098df843	Merge pull request 'updated longhorn and neuvector to latest 105 charts' (#39 ) from dprodanov/Factory:upstream-3.2 into 3.2 Reviewed-on: suse-edge/Factory#39 Reviewed-by: Ivo Petrov <ipetrov117@noreply.src.opensuse.org>	2024-11-28 16:23:41 +01:00
Denislav Prodanov	7555048917	updated longhorn and neuvector to latest 105 charts	2024-11-28 17:16:25 +02:00
Denislav Prodanov	e92a50d110	Merge pull request '[3.2 backport] rancher-turtles: Fix issue in 0.4.0 chart' (#37 ) from steven.hardy/Factory:turtles_fix_3.2 into 3.2 Reviewed-on: suse-edge/Factory#37 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org> Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2024-11-27 14:08:45 +01:00
Steven Hardy	da2ad77951	rancher-turtles: Fix issue in 0.4.0 chart The previous import was based on a pre-merge copy of the following PR - an issue was discovered during SV validation which required an additional change to ensure CRDs are created before creating the ClusterctlConfig CR https://github.com/suse-edge/charts/pull/166 (cherry picked from commit `636493adba`)	2024-11-27 11:16:59 +00:00
Denislav Prodanov	be4fae4b18	3.2 branching	2024-11-25 15:59:33 +02:00