Fix service file for frr-k8s-image

Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>
Merge pull request 'Import missing package: frr-k8s-image' (#67 ) from nbelouin/Factory:import-frr-k8s-image into main
2025-01-17 09:44:56 +01:00 · 2025-01-17 09:31:28 +01:00 · 2025-01-17 09:31:10 +01:00 · 2025-01-17 09:24:32 +01:00 · 2025-01-16 15:47:33 +01:00 · 2025-01-16 15:35:46 +01:00
18 changed files with 324 additions and 126 deletions
--- a/.obs/common.py
+++ b/.obs/common.py
@ -1,3 +1,3 @@
-PROJECT = "isv:SUSE:Edge:3.2"
+PROJECT = "isv:SUSE:Edge:Factory"
 REPOSITORY = "https://src.opensuse.org/suse-edge/Factory"
-BRANCH = "3.2"
+BRANCH = "main"
--- a/.obs/workflows.yml
+++ b/.obs/workflows.yml
@ -4,209 +4,213 @@ staging_build:
  steps:
  - branch_package:
      source_package: endpoint-copier-operator
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: endpoint-copier-operator-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: endpoint-copier-operator-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: akri
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: akri-agent-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: akri-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: akri-controller-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: akri-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: akri-debug-echo-discovery-handler-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: akri-onvif-discovery-handler-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: akri-opcua-discovery-handler-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: akri-udev-discovery-handler-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: akri-webhook-configuration-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: obs-service-set_version
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: cosign
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: frr-k8s
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: kubectl
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: upgrade-controller
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: nm-configurator
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: kube-rbac-proxy
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: edge-image-builder
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: metallb
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: hauler
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: baremetal-operator
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: cdi-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: metallb-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: sriov-crd-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: upgrade-controller-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: edge-image-builder-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: ironic-ipa-downloader-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: upgrade-controller-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: metal3-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: baremetal-operator-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: sriov-network-operator-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: metallb-controller-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: metallb-speaker-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: ironic-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: cri-tools
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: crudini
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: fakeroot
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: ipcalc
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: autoconf
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: rancher-turtles-airgap-resources-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: rancher-turtles-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: kube-rbac-proxy-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: ironic-ipa-ramdisk
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: kubevirt-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: kiwi-builder-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: kubevirt-chart
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: release-manifest-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: frr-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
  - branch_package:
      source_package: kubectl-image
-      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:3.2:Staging
+      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
--- a/akri-dashboard-extension-chart/Chart.yaml
+++ b/akri-dashboard-extension-chart/Chart.yaml
@ -1,3 +1,4 @@
+#!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%
 annotations:
--- a/frr-k8s-image/Dockerfile
+++ b/frr-k8s-image/Dockerfile
@ -0,0 +1,33 @@
+# 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
@ -0,0 +1,19 @@
+<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-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,3 +1,4 @@
+#!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%
 annotations:
--- 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 %img_repo)</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_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,9 +7,74 @@ spec:
  components:
    kubernetes:
      k3s:
-        version: v1.31.2+k3s1
+        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
      rke2:
-        version: v1.31.2+rke2r1
+        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
    operatingSystem:
      version: "6.0"
      zypperID: "SL-Micro"
@ -23,8 +88,11 @@ spec:
        - prettyName: Rancher
          releaseName: rancher
          chart: rancher
-          version: v2.10.0
-          repository: https://releases.rancher.com/server-charts/stable
+          version: 2.10.1
+          repository: https://charts.rancher.com/server-charts/prime
+          values:
+            postDelete:
+              enabled: false
        - prettyName: Longhorn
          releaseName: longhorn
          chart: longhorn
@ -78,6 +146,11 @@ 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
--- 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.0
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.0-%RELEASE%
+#!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%
 apiVersion: v2
-appVersion: 0.1.0
+appVersion: 0.1.1
 dependencies:
 - condition: crds.enabled
  name: lifecycle-crds
  repository: file://./charts/lifecycle-crds
-  version: 0.1.0
+  version: 0.1.1
 description: A Helm chart for Upgrade Controller
 name: upgrade-controller
 type: application
-version: "%%CHART_MAJOR%%.0.0+up0.1.0"
+version: "%%CHART_MAJOR%%.0.0+up0.1.1"
--- a/upgrade-controller-chart/_service
+++ b/upgrade-controller-chart/_service
@ -6,6 +6,8 @@
    <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>
@ -15,4 +17,3 @@
    <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.0
+appVersion: 0.1.1
 description: A Helm chart containing SUSE Lifecycle CRDs
 name: lifecycle-crds
 type: application
-version: 0.1.0
+version: 0.1.1
--- 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,6 +43,35 @@ 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:
@ -50,6 +79,35 @@ 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,6 +29,14 @@ 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: %%IMG_REPO%%/%%IMG_PREFIX%%release-manifest
+    image: %%MANIFEST_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.0
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.1
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.1-%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.0"
+LABEL org.opencontainers.image.version="0.1.1"
 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.0-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%upgrade-controller:0.1.1-%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.0</param>
+    <param name="revision">v0.1.1</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.0
+Version:        0.1.1
 Release:        0
 Summary:        Upgrade Controller
 License:        Apache-2.0