Merge remote-tracking branch 'origin' into testing

edge-image-builder-image/Dockerfile

@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.3
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.3-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.2
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.2-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-base:$SLE_VERSION
 MAINTAINER SUSE LLC (https://www.suse.com/)
@@ -14,11 +14,11 @@ RUN zypper --non-interactive install --no-recommends edge-image-builder qemu-x86
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE edge-image-builder Container Image"
 LABEL org.opencontainers.image.description="edge-image-builder based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="1.3.3"
+LABEL org.opencontainers.image.version="1.3.2"
 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%%edge-image-builder:1.3.3-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.3.2-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

edge-image-builder/_service

@@ -3,15 +3,17 @@
     <param name="url">https://github.com/suse-edge/edge-image-builder.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="revision">v1.3.3</param>
+    <param name="revision">v1.3.2</param>
     <!-- Uncomment and set this For Pre-Release Version -->
-    <!-- <param name="version">1.3.3~rc1</param> -->
+    <!-- <param name="version">1.3.2~rc0</param> -->
     <!-- End Here -->
-    <!-- Uncomment and set this for regular version -->
+
+    <!-- Uncomment and this for regular version -->
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>
     <param name="versionrewrite-replacement">\1.\2.\3</param>
     <!-- End Here -->
+
     <param name="changesgenerate">enable</param>
   </service>
   <service mode="buildtime" name="tar">

edge-image-builder/edge-image-builder.spec

@@ -17,7 +17,7 @@
 
 
 Name:           edge-image-builder
-Version:        1.3.3
+Version:        1.3.2
 Release:        0
 Summary:        Edge Image Builder
 License:        Apache-2.0

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

@@ -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

@@ -165,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"