From 13085b864285a7c6638bdb9d9eed77ee869a20f20f69ab59d14c0cca51c0d6c6 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Fri, 27 Feb 2026 14:38:04 +0000 Subject: [PATCH] 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 --- rancher-turtles-providers-chart/Chart.yaml | 8 ++++---- .../templates/addon-fleet.yaml | 3 --- .../templates/bootstrap-rke2.yaml | 3 --- .../templates/controlplane-rke2.yaml | 3 --- .../templates/infrastructure-metal3.yaml | 3 --- .../templates/ipam-metal3.yaml | 3 --- release-manifest-image/release_images.yaml | 2 +- release-manifest-image/release_manifest.yaml | 2 +- 8 files changed, 6 insertions(+), 21 deletions(-) diff --git a/rancher-turtles-providers-chart/Chart.yaml b/rancher-turtles-providers-chart/Chart.yaml index 9975d5a..026b9a3 100644 --- a/rancher-turtles-providers-chart/Chart.yaml +++ b/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" diff --git a/rancher-turtles-providers-chart/templates/addon-fleet.yaml b/rancher-turtles-providers-chart/templates/addon-fleet.yaml index f787ce6..7e1c735 100644 --- a/rancher-turtles-providers-chart/templates/addon-fleet.yaml +++ b/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 diff --git a/rancher-turtles-providers-chart/templates/bootstrap-rke2.yaml b/rancher-turtles-providers-chart/templates/bootstrap-rke2.yaml index ba36f94..883488f 100644 --- a/rancher-turtles-providers-chart/templates/bootstrap-rke2.yaml +++ b/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 diff --git a/rancher-turtles-providers-chart/templates/controlplane-rke2.yaml b/rancher-turtles-providers-chart/templates/controlplane-rke2.yaml index 9764082..ae44670 100644 --- a/rancher-turtles-providers-chart/templates/controlplane-rke2.yaml +++ b/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 diff --git a/rancher-turtles-providers-chart/templates/infrastructure-metal3.yaml b/rancher-turtles-providers-chart/templates/infrastructure-metal3.yaml index aa7ab10..1d76f04 100644 --- a/rancher-turtles-providers-chart/templates/infrastructure-metal3.yaml +++ b/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 diff --git a/rancher-turtles-providers-chart/templates/ipam-metal3.yaml b/rancher-turtles-providers-chart/templates/ipam-metal3.yaml index a87703c..cdb3802 100644 --- a/rancher-turtles-providers-chart/templates/ipam-metal3.yaml +++ b/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 diff --git a/release-manifest-image/release_images.yaml b/release-manifest-image/release_images.yaml index 1e7672e..8bab901 100644 --- a/release-manifest-image/release_images.yaml +++ b/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 diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index b746dde..da0f131 100644 --- a/release-manifest-image/release_manifest.yaml +++ b/release-manifest-image/release_manifest.yaml @@ -165,7 +165,7 @@ spec: - 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 -- 2.51.1