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

Reviewed-on: #50
Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>

.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/workflows.yml

@@ -4,209 +4,209 @@ staging_build:
   steps:
   - branch_package:
       source_package: endpoint-copier-operator
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: endpoint-copier-operator-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: endpoint-copier-operator-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-agent-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-controller-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-debug-echo-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-onvif-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-opcua-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-udev-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-webhook-configuration-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: obs-service-set_version
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: cosign
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: frr-k8s
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kubectl
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: upgrade-controller
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: nm-configurator
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kube-rbac-proxy
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: edge-image-builder
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: metallb
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: hauler
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: baremetal-operator
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: cdi-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: metallb-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: sriov-crd-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: upgrade-controller-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: edge-image-builder-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: ironic-ipa-downloader-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: upgrade-controller-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: metal3-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: baremetal-operator-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: sriov-network-operator-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: metallb-controller-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: metallb-speaker-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: ironic-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: cri-tools
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: crudini
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: fakeroot
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: ipcalc
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: autoconf
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: rancher-turtles-airgap-resources-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: rancher-turtles-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kube-rbac-proxy-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: ironic-ipa-ramdisk
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kubevirt-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kiwi-builder-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kubevirt-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: release-manifest-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: frr-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kubectl-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging

release-manifest-image/release_manifest.yaml

@@ -8,73 +8,8 @@ spec:
     kubernetes:
       k3s:
         version: v1.31.2+k3s1
-        coreComponents:
-        - name: traefik-crd
-          version: 27.0.201+up27.0.2
-          type: HelmChart
-        - name: traefik
-          version: 27.0.201+up27.0.2
-          type: HelmChart
-        - name: local-path-provisioner
-          containers:
-          - name: local-path-provisioner
-            image: rancher/local-path-provisioner:v0.0.30
-          type: Deployment
-        - name: coredns
-          containers:
-          - name: coredns
-            image: rancher/mirrored-coredns-coredns:1.11.3
-          type: Deployment
-        - name: metrics-server
-          containers:
-          - name: metrics-server
-            image: rancher/mirrored-metrics-server:v0.7.2
-          type: Deployment
       rke2:
         version: v1.31.2+rke2r1
-        coreComponents:
-        - name: rke2-cilium
-          version: 1.16.201
-          type: HelmChart
-        - name: rke2-canal
-          version: v3.28.2-build2024101601
-          type: HelmChart
-        - name: rke2-calico-crd
-          version: v3.28.200
-          type: HelmChart
-        - name: rke2-calico
-          version: v3.28.200
-          type: HelmChart
-        - name: rke2-coredns
-          version: 1.33.002
-          type: HelmChart
-        - name: rke2-ingress-nginx
-          version: 4.10.501
-          type: HelmChart
-        - name: rke2-metrics-server
-          version: 3.12.004
-          type: HelmChart
-        - name: rancher-vsphere-csi
-          version: 3.3.1-rancher100
-          type: HelmChart
-        - name: rancher-vsphere-cpi
-          version: 1.9.000
-          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"
@@ -143,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

upgrade-controller-chart/Chart.yaml

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

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

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

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

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

upgrade-controller-chart/templates/clusterrole.yaml

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

upgrade-controller-image/Dockerfile

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

upgrade-controller/_service

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

upgrade-controller/upgrade-controller.spec

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