rancher-turtles-providers: Align with 0.25.4

Aligns with the 0.25.4 version included for Rancher 2.13.3

This doesn't require any changes to the provider versions, but the
namespace conditionals have been removed due to reports this can cause
undesired namespace removal on upgrade.

This may complicate the migration from 3.4 but that will be handled via
documentation to align with https://github.com/rancher/turtles-product-docs/pull/145

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

metal3-chart/Chart.yaml

@@ -1,5 +1,5 @@
-#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.22_up0.13.1
-#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.22_up0.13.1-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.23_up0.13.1
+#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.23_up0.13.1-%RELEASE%
 apiVersion: v2
 appVersion: 0.13.0
 dependencies:
@@ -15,7 +15,7 @@ dependencies:
   condition: global.enable_mariadb
   name: mariadb
   repository: file://./charts/mariadb
-  version: 0.6.2
+  version: 0.6.3
 - alias: metal3-media
   condition: global.enable_metal3_media_server
   name: media
@@ -25,4 +25,4 @@ description: A Helm chart that installs all of the dependencies needed for Metal
 icon: https://github.com/cncf/artwork/raw/master/projects/metal3/icon/color/metal3-icon-color.svg
 name: metal3
 type: application
-version: "%%CHART_MAJOR%%.0.22+up0.13.1"
+version: "%%CHART_MAJOR%%.0.23+up0.13.1"

metal3-chart/charts/mariadb/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: "11.8"
 description: A Helm chart for MariaDB, used by Metal3
 name: mariadb
 type: application
-version: 0.6.2
+version: 0.6.3

metal3-chart/charts/mariadb/templates/deployment.yaml

@@ -20,7 +20,7 @@ spec:
       labels:
         {{- include "mariadb.selectorLabels" . | nindent 8 }}
     spec:
-      {{- $volmounts := toYaml .Values.volumeMounts | trim | nindent 12 }}
+      {{- $volmounts := toYaml .Values.volumeMounts | trim | nindent 10 }}
       {{- $volumes := toYaml .Values.volumes | trim | nindent 8 }}
       serviceAccountName: {{ include "mariadb.serviceAccountName" . }}
       securityContext:
@@ -103,11 +103,11 @@ spec:
           successThreshold: 1
           timeoutSeconds: 10
         volumeMounts:
-            - name: mariadb-conf
-              mountPath: /etc/mysql/conf.d
-            - name: mariadb-run
-              mountPath: /run/mysql
-            {{- $volmounts }}
+          - name: mariadb-conf
+            mountPath: /etc/mysql/conf.d
+          - name: mariadb-run
+            mountPath: /run/mysql
+          {{- $volmounts }}
       {{- with .Values.global.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

rancher-turtles-providers-chart/Chart.yaml

@@ -1,5 +1,5 @@
-#!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%
+#!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%
 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.1
+appVersion: 0.25.4
 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.4+up0.25.1"
+version: "%%CHART_MAJOR%%.0.5+up0.25.4"

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

@@ -1,12 +1,9 @@
 {{- 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,12 +1,9 @@
 {{- 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,12 +1,9 @@
 {{- 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,12 +1,9 @@
 {{- 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,12 +1,9 @@
 {{- 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.0
+#!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.0"
+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.0"
+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"

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.1
+  - name: registry.rancher.com/rancher/turtles:v0.25.4
   - 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,9 +1,9 @@
 apiVersion: lifecycle.suse.com/v1alpha1
 kind: ReleaseManifest
 metadata:
-  name: release-manifest-3-5-0
+  name: release-manifest-3-6-0
 spec:
-  releaseVersion: 3.5.0
+  releaseVersion: 3.6.0
   components:
     kubernetes:
       k3s:
@@ -92,7 +92,7 @@ spec:
               enabled: false
         - prettyName: Longhorn
           releaseName: longhorn
-          chart: 'oci://dp.apps.rancher.io/charts/suse-storage'
+          chart: oci://dp.apps.rancher.io/charts/suse-storage
           version: 1.10.1
         - prettyName: MetalLB
           releaseName: metallb
@@ -161,11 +161,11 @@ spec:
         - prettyName: Metal3
           releaseName: metal3
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metal3'
-          version: '%%CHART_MAJOR%%.0.22+up0.13.1'
+          version: '%%CHART_MAJOR%%.0.23+up0.13.1'
         - prettyName: RancherTurtlesProviders
           releaseName: rancher-turtles-providers
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles-providers'
-          version: '%%CHART_MAJOR%%.0.4+up0.25.1'
+          version: '%%CHART_MAJOR%%.0.5+up0.25.4'
         - prettyName: CertManager
           releaseName: cert-manager
           chart: cert-manager