Merge pull request 'fix-release-manifests-appsco' (#374 ) from amorgante/Factory:fix-release-manifests-appsco into main

Reviewed-on: suse-edge/Factory#374 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>
change the suse-storage release manifest formatting
2026-01-29 15:20:59 +01:00 · 2026-01-29 15:13:51 +01:00 · 2026-01-29 15:08:48 +01:00 · 2026-01-20 16:09:55 +01:00 · 2026-01-20 17:06:51 +02:00 · 2026-01-19 16:25:22 +01:00
7 changed files with 92 additions and 71 deletions
--- a/.obs/wait_obs.py
+++ b/.obs/wait_obs.py
@@ -6,6 +6,7 @@ import sys

 from collections import Counter

+
 def get_buildstatus(project: str) -> ET.Element:
    for _ in range(5):
        try:
@@ -17,8 +18,17 @@ def get_buildstatus(project: str) -> ET.Element:
            continue
    print("Failed to get buildstatus from OBS")

-def do_wait(project:str, commit:str) -> ET.Element:
+
+def do_wait(project: str, commit: str) -> ET.Element:
    last_state = None
+    waiting_states = (
+        "blocked",
+        "scheduled",
+        "dispatching",
+        "building",
+        "signing",
+        "finished",
+    )
    while True:
        time.sleep(5)
        status = get_buildstatus(project)
@@ -33,17 +43,25 @@ def do_wait(project:str, commit:str) -> ET.Element:
        else:
            last_state = status.get("state")

-        scminfo = { e.text for e in status.findall(".//scminfo") }
+        scminfo = {e.text for e in status.findall(".//scminfo")}
        if len(scminfo) != 1 or scminfo.pop() != commit:
            print("Waiting for OBS to sync with SCM")
            continue

-        if not all([ e.get('state') == "published" and e.get('dirty') is None for e in status.findall("./result")]):
+        if not all(
+            [
+                e.get("state") == "published"  # Only consider if all packages are published
+                and e.get("dirty") is None  # Exclude states needing recalculation
+                and e.get("code") not in waiting_states  # Exclude transient/waiting states
+                for e in status.findall("./result")
+            ] + [ e.get("code") not in waiting_states for e in status.findall("./status") ]
+        ):
            print("Waiting for OBS to finish building")
            continue

        return status
-        
+
+
 def print_results(status: ET.Element) -> bool:
    results = {}
    failed = []
@@ -51,15 +69,15 @@ def print_results(status: ET.Element) -> bool:
        repo = results.get(e.get("repository"), {})
        repo[e.get("arch")] = e
        results[e.get("repository")] = repo
-    
+
    for repo in results.keys():
        print(f"{repo}:")
-        depth=1
+        depth = 1
        for arch in results[repo].keys():
            counts = Counter()
            if repo != "charts":
                print(f"\t{arch}:")
-                depth=2
+                depth = 2
            for package in results[repo][arch].findall("./status"):
                if package.get("code") in ["excluded", "disabled"]:
                    continue
@@ -70,9 +88,9 @@ def print_results(status: ET.Element) -> bool:
                    else:
                        failed.append(f"{package.get('package')} ({arch})")
                counts[package.get("code")] += 1
-            for (code, count) in counts.items():
-                print("\t"*depth, f"{code}: {count}")
-    
+            for code, count in counts.items():
+                print("\t" * depth, f"{code}: {count}")
+
    failed.sort()
    if failed:
        print("\nPackages failing: ")
@@ -80,6 +98,7 @@ def print_results(status: ET.Element) -> bool:
        print("\t", fail)
    return len(failed)

+
 def main():
    project = os.environ.get("OBS_PROJECT")
    sha = os.environ.get("GIT_SHA")
@@ -87,5 +106,6 @@ def main():
    status = do_wait(project, sha)
    sys.exit(print_results(status))

+
 if __name__ == "__main__":
    main()
--- a/release-manifest-image/release_images.yaml
+++ b/release-manifest-image/release_images.yaml
@@ -1,66 +1,68 @@
 images:
-  - name: quay.io/jetstack/cert-manager-cainjector:v1.18.2
-  - name: quay.io/jetstack/cert-manager-cainjector:v1.18.2
-  - name: quay.io/jetstack/cert-manager-controller:v1.18.2
-  - name: quay.io/jetstack/cert-manager-webhook:v1.18.2
-  - name: registry.k8s.io/e2e-test-images/agnhost:2.39
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%akri-agent:v0.12.20
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%akri-controller:v0.12.20
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%akri-webhook-configuration:v0.12.20
  - name: %%IMG_REPO%%/%%IMG_PREFIX%%baremetal-operator:0.11.2.0
  - name: %%IMG_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator:0.3.0
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%ib-sriov-cni:v1.3.0
  - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.10
  - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic:32.0.0.1
  - name: %%IMG_REPO%%/%%IMG_PREFIX%%metallb-controller:v0.15.2
  - name: %%IMG_REPO%%/%%IMG_PREFIX%%metallb-speaker:v0.15.2
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%upgrade-controller:0.1.1
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%sriov-network-manager:v1.6.0
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%sriov-network-config-daemon:v1.6.0
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%sriov-network-webhook:v1.6.0
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%sriov-cni:v2.10.0
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%ib-sriov-cni:v1.3.0
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%sriov-network-device-plugin:v3.10.0
  - name: %%IMG_REPO%%/%%IMG_PREFIX%%network-resources-injector:v1.8.0
  - name: %%IMG_REPO%%/%%IMG_PREFIX%%node-feature-discovery:v0.18.2
-  - name: registry.rancher.com/rancher/fleet-agent:v0.13.1
-  - name: registry.rancher.com/rancher/fleet:v0.13.1
-  - name: registry.rancher.com/rancher/hardened-cluster-autoscaler:v1.10.2-build20250611
-  - name: registry.rancher.com/rancher/hardened-cni-plugins:v1.7.1-build20250611
-  - name: registry.rancher.com/rancher/hardened-coredns:v1.12.2-build20250611
-  - name: registry.rancher.com/rancher/hardened-etcd:v3.5.21-k3s1-build20250612
-  - name: registry.rancher.com/rancher/hardened-k8s-metrics-server:v0.8.0-build20250704
-  - name: registry.rancher.com/rancher/hardened-kubernetes:v1.33.3-rke2r1-build20250716
-  - name: registry.rancher.com/rancher/hardened-multus-cni:v4.2.1-build20250627
-  - name: registry.rancher.com/rancher/hardened-node-feature-discovery:v0.15.7-build20250425
-  - name: registry.rancher.com/rancher/klipper-helm:v0.9.8-build20250709
-  - name: registry.rancher.com/rancher/mirrored-cilium-cilium:v1.17.6
-  - name: registry.rancher.com/rancher/mirrored-cilium-operator-generic:v1.17.6
-  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-attacher:v4.9.0-20250709
-  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-node-driver-registrar:v2.14.0-20250709
-  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-provisioner:v5.3.0-20250709
-  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-resizer:v1.14.0-20250709
-  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-snapshotter:v8.3.0-20250709
-  - name: registry.rancher.com/rancher/mirrored-longhornio-livenessprobe:v2.16.0-20250709
-  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-engine:v1.9.2
-  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-instance-manager:v1.9.2
-  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-manager:v1.9.2
-  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-share-manager:v1.9.2
-  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-ui:v1.9.2
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%sriov-cni:v2.10.0
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%sriov-network-config-daemon:v1.6.0
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%sriov-network-device-plugin:v3.10.0
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%sriov-network-manager:v1.6.0
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%sriov-network-webhook:v1.6.0
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%upgrade-controller:0.1.2
+  - name: dp.apps.rancher.io/containers/kubernetes-csi-external-attacher:4.10.0-8.8
+  - name: dp.apps.rancher.io/containers/kubernetes-csi-external-provisioner:5.3.0-8.8
+  - name: dp.apps.rancher.io/containers/kubernetes-csi-external-resizer:1.14.0-8.8
+  - name: dp.apps.rancher.io/containers/kubernetes-csi-external-snapshotter:8.4.0-8.9
+  - name: dp.apps.rancher.io/containers/kubernetes-csi-livenessprobe:2.17.0-8.8
+  - name: dp.apps.rancher.io/containers/kubernetes-csi-node-driver-registrar:2.15.0-8.8
+  - name: dp.apps.rancher.io/containers/longhorn-engine:1.10.1-1.16
+  - name: dp.apps.rancher.io/containers/longhorn-instance-manager:1.10.1-1.17
+  - name: dp.apps.rancher.io/containers/longhorn-manager:1.10.1-1.9
+  - name: dp.apps.rancher.io/containers/longhorn-share-manager:1.10.1-1.8
+  - name: dp.apps.rancher.io/containers/longhorn-ui:1.10.1-1.8
+  - name: quay.io/jetstack/cert-manager-cainjector:v1.19.2
+  - name: quay.io/jetstack/cert-manager-controller:v1.19.2
+  - name: quay.io/jetstack/cert-manager-webhook:v1.19.2
+  - name: registry.k8s.io/e2e-test-images/agnhost:2.39
+  - name: registry.rancher.com/rancher/cluster-api-controller:v1.10.6
+  - name: registry.rancher.com/rancher/fleet-agent:v0.14.1
+  - name: registry.rancher.com/rancher/fleet:v0.14.1
+  - name: registry.rancher.com/rancher/hardened-cluster-autoscaler:v1.10.2-build20251015
+  - name: registry.rancher.com/rancher/hardened-cni-plugins:v1.8.0-build20251014
+  - name: registry.rancher.com/rancher/hardened-coredns:v1.13.1-build20251015
+  - name: registry.rancher.com/rancher/hardened-etcd:v3.6.5-k3s1-build20251017
+  - name: registry.rancher.com/rancher/hardened-k8s-metrics-server:v0.8.0-build20251015
+  - name: registry.rancher.com/rancher/hardened-kubernetes:v1.34.2-rke2r1-build20251112
+  - name: registry.rancher.com/rancher/hardened-multus-cni:v4.2.3-build20251031
+  - name: registry.rancher.com/rancher/ip-address-manager:v1.10.4
+  - name: registry.rancher.com/rancher/klipper-helm:v0.9.10-build20251111
+  - name: registry.rancher.com/rancher/mirrored-cilium-cilium:v1.18.3
+  - name: registry.rancher.com/rancher/mirrored-cilium-operator-generic:v1.18.3
  - name: registry.rancher.com/rancher/mirrored-sig-storage-snapshot-controller:v8.2.0
  - name: registry.rancher.com/rancher/neuvector-compliance-config:1.0.9
  - name: registry.rancher.com/rancher/neuvector-controller:5.4.8
  - name: registry.rancher.com/rancher/neuvector-enforcer:5.4.8
-  - name: registry.rancher.com/rancher/nginx-ingress-controller:v1.12.4-hardened2
-  - name: registry.rancher.com/rancher/rancher-webhook:v0.8.1
-  - name: registry.rancher.com/rancher/rancher/turtles:v0.25.1
+  - name: registry.rancher.com/rancher/nginx-ingress-controller:v1.13.4-hardened1
+  - name: registry.rancher.com/rancher/rancher-webhook:v0.9.1
  - name: registry.rancher.com/rancher/rancher:v2.13.1
-  - name: registry.rancher.com/rancher/rke2-cloud-provider:v1.33.1-0.20250516163953-99d91538b132-build20250612
-  - name: registry.rancher.com/rancher/scc-operator:v0.1.1
-  - name: registry.rancher.com/rancher/system-upgrade-controller:v0.16.0
+  - name: registry.rancher.com/rancher/rke2-cloud-provider:v1.34.2-0.20251010190833-cf0d35a732d1-build20251017
+  - name: registry.rancher.com/rancher/scc-operator:v0.3.1
+  - name: registry.rancher.com/rancher/shell:v0.6.1
+  - name: registry.rancher.com/rancher/system-upgrade-controller:v0.17.0
+  - name: registry.rancher.com/rancher/turtles:v0.25.1
  - name: registry.suse.com/rancher/cluster-api-addon-provider-fleet:v0.12.0
-  - name: registry.suse.com/rancher/cluster-api-controller:v1.10.6
  - name: registry.suse.com/rancher/cluster-api-provider-metal3:v1.10.4
  - name: registry.suse.com/rancher/cluster-api-provider-rke2-bootstrap:v0.21.1
  - name: registry.suse.com/rancher/cluster-api-provider-rke2-controlplane:v0.21.1
-  - name: registry.suse.com/rancher/elemental-operator:1.7.3
-  - name: registry.suse.com/rancher/ip-address-manager:v1.10.4
+  - name: registry.suse.com/rancher/elemental-operator:1.8.0
  - name: registry.suse.com/suse/sles/15.7/cdi-apiserver:1.62.0-150700.9.3.1
  - name: registry.suse.com/suse/sles/15.7/cdi-controller:1.62.0-150700.9.3.1
  - name: registry.suse.com/suse/sles/15.7/cdi-operator:1.62.0-150700.9.3.1
--- a/release-manifest-image/release_manifest.yaml
+++ b/release-manifest-image/release_manifest.yaml
@@ -92,9 +92,8 @@ spec:
              enabled: false
        - prettyName: Longhorn
          releaseName: longhorn
-          chart: suse-storage
+          chart: 'oci://dp.apps.rancher.io/charts/suse-storage'
          version: 1.10.1
-          repository: oci://dp.apps.rancher.io/charts
        - prettyName: MetalLB
          releaseName: metallb
          chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metallb'
@@ -133,11 +132,11 @@ spec:
        - prettyName: Elemental
          releaseName: elemental-operator
          chart: oci://registry.suse.com/rancher/elemental-operator-chart
-          version: 1.7.3
+          version: 1.8.0
          dependencyCharts:
            - releaseName: elemental-operator-crds
              chart: oci://registry.suse.com/rancher/elemental-operator-crds-chart
-              version: 1.7.3
+              version: 1.8.0
          addonCharts:
            - releaseName: elemental
              chart: elemental
--- a/upgrade-controller-chart/Chart.yaml
+++ b/upgrade-controller-chart/Chart.yaml
@@ -1,13 +1,13 @@
-#!BuildTag: %%CHART_PREFIX%%upgrade-controller:%%CHART_MAJOR%%.0.2_up0.1.2
-#!BuildTag: %%CHART_PREFIX%%upgrade-controller:%%CHART_MAJOR%%.0.2_up0.1.2-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%upgrade-controller:%%CHART_MAJOR%%.0.3_up0.1.3
+#!BuildTag: %%CHART_PREFIX%%upgrade-controller:%%CHART_MAJOR%%.0.3_up0.1.3-%RELEASE%
 apiVersion: v2
-appVersion: 0.1.2
+appVersion: 0.1.3
 dependencies:
 - condition: crds.enabled
  name: lifecycle-crds
  repository: file://./charts/lifecycle-crds
-  version: 0.1.2
+  version: 0.1.3
 description: A Helm chart for Upgrade Controller
 name: upgrade-controller
 type: application
-version: "%%CHART_MAJOR%%.0.2+up0.1.2"
+version: "%%CHART_MAJOR%%.0.3+up0.1.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.2
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.2-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.3
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.3-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro

@@ -15,11 +15,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.2"
+LABEL org.opencontainers.image.version="0.1.3"
 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.2-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%upgrade-controller:0.1.3-%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
@@ -5,9 +5,9 @@
    <param name="versionformat">@PARENT_TAG@</param>
    <param name="scm">git</param>
    <param name="exclude">.git</param>
-    <param name="revision">v0.1.2</param>
+    <param name="revision">v0.1.3</param>
    <!-- Uncomment and set this For Pre-Release Version -->
-    <!-- <param name="version">0.1.2~rc1</param> -->
+    <!-- <param name="version">0.1.3~rc2</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.2
+Version:        0.1.3
 Release:        0
 Summary:        Upgrade Controller
 License:        Apache-2.0
Author	SHA256	Message	Date
Alberto Morgante Medina	f2d89578ee	Merge pull request 'fix-release-manifests-appsco' (#374 ) from amorgante/Factory:fix-release-manifests-appsco into main Reviewed-on: suse-edge/Factory#374 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>	2026-01-29 15:20:59 +01:00
alknopfler	b3ac01257c	change the suse-storage release manifest formatting	2026-01-29 15:13:51 +01:00
alknopfler	f23f988f66	fix merge conflicts with upstream	2026-01-29 15:08:48 +01:00
Denislav Prodanov	d3f8968339	Merge pull request '[3.5.0] - test UC 0.1.3 rc1' (#365 ) from dprodanov/Factory:uc-0.1.3-rc1 into main Reviewed-on: suse-edge/Factory#365	2026-01-20 16:09:55 +01:00
dprodanov4	805ec0a403	test rc2	2026-01-20 17:06:51 +02:00
Nicolas Belouin	9c97656992	Merge pull request 'Make wait_obs script more reliable' (#370 ) from nbelouin/Factory:improve_wait_obs into main Reviewed-on: suse-edge/Factory#370 Reviewed-by: Steven Hardy <steven.hardy@noreply.src.opensuse.org>	2026-01-19 16:25:22 +01:00
Nicolas Belouin	cee3c89e46	Merge pull request 'Update release images with 3.5 pre release run' (#369 ) from nbelouin/Factory:update_release_images into main Reviewed-on: suse-edge/Factory#369 Reviewed-by: Steven Hardy <steven.hardy@noreply.src.opensuse.org>	2026-01-19 16:24:33 +01:00
Nicolas Belouin	99a05ea424	Update release images with 3.5 pre release run Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2026-01-19 13:42:36 +01:00
Nicolas Belouin	0ae774cf9d	Make wait_obs script more reliable Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2026-01-19 13:16:09 +01:00
dbw7	ccc1c66636	change to official tag	2026-01-19 10:43:37 +01:00
dbw7	90e12f7065	changes to EIB for v1.3.2-rc0	2026-01-19 10:43:37 +01:00
Steven Hardy	368609ca5c	release-manifest: bump elemental-operator to 1.8.0 The SCC elemental-register for SLM 6.2 is 1.8.0 so we should align the operator version	2026-01-16 12:05:56 +00:00
dprodanov4	ed52d4c7a4	[3.5.0] - test UC 0.1.3 rc1	2026-01-16 13:51:56 +02:00
Alberto Morgante Medina	f497cf5996	add release images file to the release container	2025-07-22 09:11:55 +02:00