Merge remote-tracking branch 'origin' into testing

Reviewed-on: suse-edge/Factory#392

.obs/common.py

@@ -1,3 +1,3 @@
-PROJECT = "isv:SUSE:Edge:3.5"
+PROJECT = "isv:SUSE:Edge:Factory"
 REPOSITORY = "https://src.opensuse.org/suse-edge/Factory"
-BRANCH = "3.5"
+BRANCH = "main"

.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()

hauler/_service

@@ -4,7 +4,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="scm">git</param>
     <param name="exclude">.get</param>
-    <param name="revision">v1.2.5</param>
+    <param name="revision">v1.4.1</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="changesgenerate">enable</param>
   </service>

hauler/hauler.spec

@@ -18,13 +18,14 @@
 %define project github.com/hauler-dev/hauler
 
 Name:           hauler
-Version:        1.2.5
+Version:        1.4.1
 Release:        0
 Summary:        Airgap Swiss Army Knife
 License:        Apache-2.0
 URL:            https://github.com/hauler-dev/hauler
 Source:         hauler-%{version}.tar
 Source1:        vendor.tar.gz
+BuildRequires:  golang(API) = 1.25
 BuildRequires:  golang-packaging
 
 %description

rancher-turtles-providers-chart/Chart.yaml

@@ -1,5 +1,5 @@
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles-providers:%%CHART_MAJOR%%.0.5_up0.25.4
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles-providers:%%CHART_MAJOR%%.0.5_up0.25.4-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles-providers:%%CHART_MAJOR%%.0.4_up0.25.1
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles-providers:%%CHART_MAJOR%%.0.4_up0.25.1-%RELEASE%
 annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: Rancher Turtles Providers for SUSE Edge
@@ -10,7 +10,7 @@ annotations:
   catalog.cattle.io/scope: management
   catalog.cattle.io/type: cluster-tool
 apiVersion: v2
-appVersion: 0.25.4
+appVersion: 0.25.1
 description: This chart installs the Rancher Turtles providers for SUSE Edge.
 home: https://turtles.docs.rancher.com/turtles/stable/en/overview/certified.html
 icon: https://raw.githubusercontent.com/rancher/turtles/main/logos/capi.svg
@@ -21,4 +21,4 @@ keywords:
 - provisioning
 - provider
 name: rancher-turtles-providers
-version: "%%CHART_MAJOR%%.0.5+up0.25.4"
+version: "%%CHART_MAJOR%%.0.4+up0.25.1"

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

@@ -1,9 +1,12 @@
 {{- if index .Values "providers" "addonFleet" "enabled" }}
+{{- $namespace := index .Values "providers" "addonFleet" "namespace" }}
+{{- if not (lookup "v1" "Namespace" "" $namespace) }}
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ index .Values "providers" "addonFleet" "namespace" }}
+{{- end }}
 ---
 apiVersion: v1
 kind: ConfigMap

rancher-turtles-providers-chart/templates/bootstrap-rke2.yaml

@@ -1,9 +1,12 @@
 {{- if index .Values "providers" "bootstrapRKE2" "enabled" }}
+{{- $namespace := index .Values "providers" "bootstrapRKE2" "namespace" }}
+{{- if not (lookup "v1" "Namespace" "" $namespace) }}
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ index .Values "providers" "bootstrapRKE2" "namespace" }}
+{{- end }}
 ---
 apiVersion: turtles-capi.cattle.io/v1alpha1
 kind: CAPIProvider

rancher-turtles-providers-chart/templates/controlplane-rke2.yaml

@@ -1,9 +1,12 @@
 {{- if index .Values "providers" "controlplaneRKE2" "enabled" }}
+{{- $namespace := index .Values "providers" "controlplaneRKE2" "namespace" }}
+{{- if not (lookup "v1" "Namespace" "" $namespace) }}
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ index .Values "providers" "controlplaneRKE2" "namespace" }}
+{{- end }}
 ---
 apiVersion: turtles-capi.cattle.io/v1alpha1
 kind: CAPIProvider

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

@@ -1,9 +1,12 @@
 {{- if index .Values "providers" "infrastructureMetal3" "enabled" }}
+{{- $namespace := index .Values "providers" "infrastructureMetal3" "namespace" }}
+{{- if not (lookup "v1" "Namespace" "" $namespace) }}
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ index .Values "providers" "infrastructureMetal3" "namespace" }}
+{{- end }}
 ---
 apiVersion: turtles-capi.cattle.io/v1alpha1
 kind: CAPIProvider

rancher-turtles-providers-chart/templates/ipam-metal3.yaml

@@ -1,9 +1,12 @@
 {{- if index .Values "providers" "ipamMetal3" "enabled" }}
+{{- $ipamnamespace := index .Values "providers" "ipamMetal3" "namespace" }}
+{{- if not (lookup "v1" "Namespace" "" $ipamnamespace) }}
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ index .Values "providers" "ipamMetal3" "namespace" }}
+{{- end }}
 ---
 apiVersion: turtles-capi.cattle.io/v1alpha1
 kind: CAPIProvider

release-manifest-image/Dockerfile

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

release-manifest-image/_service

@@ -18,5 +18,16 @@
     <param name="var">CHART_REPO</param>
     <param name="eval">CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
     <param name="var">CHART_MAJOR</param>
+</service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">tooling_manifest.yaml</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="var">IMG_REPO</param>
+    <param name="eval">KIWI_VERSION=$(rpm --macros=/root/.rpmmacros -E %kiwi_version)</param>
+    <param name="var">KIWI_VERSION</param>
+    <param name="eval">EIB_VERSION=$(rpm --macros=/root/.rpmmacros -E %eib_version)</param>
+    <param name="var">EIB_VERSION</param>
   </service>
 </services>

release-manifest-image/release_images.yaml

@@ -57,7 +57,7 @@ images:
   - 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.4
+  - 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-provider-metal3:v1.10.4
   - name: registry.suse.com/rancher/cluster-api-provider-rke2-bootstrap:v0.21.1

release-manifest-image/release_manifest.yaml

@@ -1,61 +1,61 @@
 apiVersion: lifecycle.suse.com/v1alpha1
 kind: ReleaseManifest
 metadata:
-  name: release-manifest-3-5-1
+  name: release-manifest-3-6-0
 spec:
-  releaseVersion: 3.5.1
+  releaseVersion: 3.6.0
   components:
     kubernetes:
       k3s:
-        version: v1.34.4+k3s1
+        version: v1.34.2+k3s1
         coreComponents:
           - name: traefik-crd
-            version: 38.0.201+up38.0.2
+            version: 37.1.1+up37.1.0
             type: HelmChart
           - name: traefik
-            version: 38.0.201+up38.0.2
+            version: 37.1.1+up37.1.0
             type: HelmChart
           - name: local-path-provisioner
             containers:
               - name: local-path-provisioner
-                image: rancher/local-path-provisioner:v0.0.34
+                image: rancher/local-path-provisioner:v0.0.32
             type: Deployment
           - name: coredns
             containers:
               - name: coredns
-                image: rancher/mirrored-coredns-coredns:1.14.1
+                image: rancher/mirrored-coredns-coredns:1.13.1
             type: Deployment
           - name: metrics-server
             containers:
               - name: metrics-server
-                image: rancher/mirrored-metrics-server:v0.8.1
+                image: rancher/mirrored-metrics-server:v0.8.0
             type: Deployment
       rke2:
-        version: v1.34.4+rke2r1
+        version: v1.34.2+rke2r1
         coreComponents:
           - name: rke2-cilium
-            version: 1.19.001
+            version: 1.18.300
             type: HelmChart
           - name: rke2-canal
-            version: v3.31.3-build2026020600
+            version: v3.30.3-build2025101500
             type: HelmChart
           - name: rke2-calico-crd
-            version: v3.31.300
+            version: v3.30.401
             type: HelmChart
           - name: rke2-calico
-            version: v3.31.300
+            version: v3.30.401
             type: HelmChart
           - name: rke2-coredns
-            version: 1.45.201
+            version: 1.44.300
             type: HelmChart
           - name: rke2-ingress-nginx
-            version: 4.14.302
+            version: 4.13.400
             type: HelmChart
           - name: rke2-metrics-server
-            version: 3.13.007
+            version: 3.13.002
             type: HelmChart
           - name: rancher-vsphere-csi
-            version: 3.5.0-rancher200
+            version: 3.5.0-rancher100
             type: HelmChart
           - name: rancher-vsphere-cpi
             version: 1.12.100
@@ -67,16 +67,10 @@ spec:
             version: 0.1.2500
             type: HelmChart
           - name: rke2-snapshot-controller-crd
-            version: 4.2.001
+            version: 4.0.003
             type: HelmChart
           - name: rke2-snapshot-controller
-            version: 4.2.001
-            type: HelmChart
-          - name: rke2-traefik-crd
-            version: 39.0.000
-            type: HelmChart
-          - name: rke2-traefik
-            version: 39.0.000
+            version: 4.0.003
             type: HelmChart
     operatingSystem:
       version: '6.2'
@@ -91,7 +85,7 @@ spec:
         - prettyName: Rancher
           releaseName: rancher
           chart: rancher
-          version: 2.13.3
+          version: 2.13.1
           repository: https://charts.rancher.com/server-charts/prime
           values:
             postDelete:
@@ -99,7 +93,7 @@ spec:
         - prettyName: Longhorn
           releaseName: longhorn
           chart: oci://dp.apps.rancher.io/charts/suse-storage
-          version: 1.10.2
+          version: 1.10.1
         - prettyName: MetalLB
           releaseName: metallb
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metallb'
@@ -119,12 +113,12 @@ spec:
         - prettyName: NeuVector
           releaseName: neuvector
           chart: neuvector
-          version: 108.0.2+up2.8.11
+          version: 108.0.1+up2.8.10
           repository: https://charts.rancher.io
           dependencyCharts:
             - releaseName: neuvector-crd
               chart: neuvector-crd
-              version: 108.0.2+up2.8.11
+              version: 108.0.1+up2.8.10
               repository: https://charts.rancher.io
           addonCharts:
             - releaseName: neuvector-ui-ext
@@ -138,11 +132,11 @@ spec:
         - prettyName: Elemental
           releaseName: elemental-operator
           chart: oci://registry.suse.com/rancher/elemental-operator-chart
-          version: 1.8.1
+          version: 1.8.0
           dependencyCharts:
             - releaseName: elemental-operator-crds
               chart: oci://registry.suse.com/rancher/elemental-operator-crds-chart
-              version: 1.8.1
+              version: 1.8.0
           addonCharts:
             - releaseName: elemental
               chart: elemental
@@ -171,7 +165,11 @@ spec:
         - prettyName: RancherTurtlesProviders
           releaseName: rancher-turtles-providers
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles-providers'
-          version: '%%CHART_MAJOR%%.0.5+up0.25.4'
+          version: '%%CHART_MAJOR%%.0.4+up0.25.1'
+        - prettyName: Upgrade Controller
+          releaseName: upgrade-controller
+          chart: '%%CHART_REPO%%/%%CHART_PREFIX%%upgrade-controller'
+          version: '%%CHART_MAJOR%%.0.3+up0.1.3'
         - prettyName: CertManager
           releaseName: cert-manager
           chart: cert-manager

release-manifest-image/tooling_manifest.yaml

@@ -0,0 +1,31 @@
+kiwi:
+  version: "10.2.29.1"
+  image: "%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:10.2.29.1"
+
+eib:
+  version: "1.3.2"
+  image: "%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.3.2"
+
+baseImages:
+  iso:
+    x86_64:
+      default: "SL-Micro.x86_64-6.2-Default-SelfInstall-GM.install.iso"
+      security: "SL-Micro.x86_64-6.2-Default-SelfInstall-GM.install.iso"
+    aarch64:
+      default: "SL-Micro.aarch64-6.2-Default-SelfInstall-GM.install.iso"
+  raw:
+    x86_64:
+      default: "SL-Micro.x86_64-6.2-Default-GM.raw"
+      telco:   "SL-Micro.x86_64-6.2-Base-RT-GM.raw"
+    aarch64:
+      default: "SL-Micro.aarch64-6.2-Default-GM.raw"
+      telco:   "SL-Micro.aarch64-6.2-Base-RT-GM.raw"
+
+# Optional: Kiwi base image names (per arch) for convenience.
+kiwiBaseImages:
+  iso:
+    x86_64: "SL-Micro.x86_64-6.2.install.iso"
+    aarch64: "SL-Micro.aarch64-6.2.install.iso"
+  raw:
+    x86_64: "SL-Micro.x86_64-6.2.raw"
+    aarch64: "SL-Micro.aarch64-6.2.raw"