Merge pull request 'metal3: Introduce TLS variables for ironic vmedia server' (#281) from nbelouin/Factory:ironic-tls-cipher into main

Reviewed-on: suse-edge/Factory#281
Reviewed-by: Marco Chiappero <mchiappero@noreply.src.opensuse.org>
Reviewed-by: Steven Hardy <steven.hardy@noreply.src.opensuse.org>

_config

@@ -75,6 +75,8 @@ BuildFlags: onlybuild:release-manifest-image
     BuildFlags: excludebuild:kube-rbac-proxy-image
     BuildFlags: excludebuild:metallb-controller-image
     BuildFlags: excludebuild:metallb-speaker-image
+    BuildFlags: excludebuild:nessie-image
+    BuildFlags: excludebuild:suse-edge-components-versions-image
   %endif
 %else
 # Only a subset of stack is arm64 ready
@@ -103,8 +105,22 @@ BuildFlags: onlybuild:release-manifest-image
     BuildFlags: onlybuild:metallb
     BuildFlags: onlybuild:metallb-controller-image
     BuildFlags: onlybuild:metallb-speaker-image
+    BuildFlags: onlybuild:nessie
+    BuildFlags: onlybuild:nessie-image
     BuildFlags: onlybuild:nm-configurator
+    BuildFlags: onlybuild:python-annotated-types
+    BuildFlags: onlybuild:python-executing
+    BuildFlags: onlybuild:python-flit-core
+    BuildFlags: onlybuild:python-inline-snapshot
+    BuildFlags: onlybuild:python-pydantic
+    BuildFlags: onlybuild:python-pydantic-core
+    BuildFlags: onlybuild:python-pyhelm3
+    BuildFlags: onlybuild:python-rich
+    BuildFlags: onlybuild:python-suse-edge-components-versions
+    BuildFlags: onlybuild:python-typing-inspection
+    BuildFlags: onlybuild:python-typing_extensions
     BuildFlags: onlybuild:shim-noarch
+    BuildFlags: onlybuild:suse-edge-components-versions-image
   %endif
 %endif
 
@@ -155,6 +171,8 @@ BuildFlags: onlybuild:release-manifest-image
       BuildFlags: excludebuild:kube-rbac-proxy-image
       BuildFlags: excludebuild:metallb-controller-image
       BuildFlags: excludebuild:metallb-speaker-image
+      BuildFlags: excludebuild:nessie-image
+      BuildFlags: excludebuild:suse-edge-components-versions-image
     %endif
 
 %else

edge-image-builder-image/Dockerfile

@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.0-rc0
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.0
-#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.0-rc0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.0-%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.0-rc0"
+LABEL org.opencontainers.image.version="1.3.0"
 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.0-rc0-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.3.0-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

edge-image-builder-image/artifacts.yaml

@@ -1,7 +1,7 @@
 metallb:
   chart: metallb
   repository: "%%CHART_REPO%%/%%CHART_PREFIX%%"
-  version: "%%CHART_MAJOR%%.0.0+up0.14.9"
+  version: "%%CHART_MAJOR%%.0.1+up0.15.2"
 endpoint-copier-operator:
   chart: endpoint-copier-operator
   repository: "%%CHART_REPO%%/%%CHART_PREFIX%%"

edge-image-builder/_service

@@ -3,11 +3,11 @@
     <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.0-rc0</param>
+    <param name="revision">v1.3.0</param>
     <!-- Uncomment and set this For Pre-Release Version -->
-    <param name="version">1.3.0~rc0</param>
+    <!-- <param name="version">1.3.0</param> -->
     <!-- Uncomment and this for regular version -->
-    <!-- <param name="versionformat">%h</param> -->
+    <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>
     <param name="versionrewrite-replacement">\1.\2.\3</param>
     <param name="changesgenerate">enable</param>

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

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

frr-image/Dockerfile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
-#!BuildTag: %%IMG_PREFIX%%frr:8.5.6
+#!BuildTag: %%IMG_PREFIX%%frr:10.2.1
-#!BuildTag: %%IMG_PREFIX%%frr:8.5.6-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%frr:10.2.1-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
 
@@ -14,11 +14,11 @@ FROM micro AS final
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="FRR Container Image"
 LABEL org.opencontainers.image.description="frr based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="8.5.6"
+LABEL org.opencontainers.image.version="10.2.1"
 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%%frr:8.5.6-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%frr:10.2.1-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

frr-k8s/_service

@@ -2,7 +2,7 @@
  <service name="obs_scm">
     <param name="url">https://github.com/metallb/frr-k8s</param>
     <param name="scm">git</param>
-    <param name="revision">v0.0.16</param>
+    <param name="revision">v0.0.20</param>
     <param name="version">_auto_</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="changesgenerate">enable</param>

frr-k8s/frr-k8s.spec

@@ -17,14 +17,14 @@
 
 
 Name:           frr-k8s
-Version:        0.0.16
+Version:        0.0.20
-Release:        0.0.16
+Release:        0.0.20
 Summary:        A kubernetes based daemonset that exposes a subset of the FRR API in a kubernetes compliant manner.
 License:        Apache-2.0
 URL:            https://github.com/metallb/frr-k8s
 Source:         frr-k8s-%{version}.tar
 Source1:        vendor.tar.gz
-BuildRequires:  golang(API) = 1.22
+BuildRequires:  golang(API) = 1.24
 ExcludeArch:    s390
 ExcludeArch:    %{ix86}
 

ironic-image/Dockerfile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%ironic:29.0.4.3
+#!BuildTag: %%IMG_PREFIX%%ironic:29.0.4.4
-#!BuildTag: %%IMG_PREFIX%%ironic:29.0.4.3-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%ironic:29.0.4.4-%RELEASE%
 
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
@@ -41,8 +41,8 @@ LABEL org.opencontainers.image.description="Openstack Ironic based on the SLE Ba
 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.opencontainers.image.version="29.0.4.3"
+LABEL org.opencontainers.image.version="29.0.4.4"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:29.0.4.3-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ironic:29.0.4.4-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"

ironic-image/ironic-config/apache2-vmedia.conf.j2

@@ -11,6 +11,19 @@ Listen [::]:{{ env.VMEDIA_TLS_PORT }}
     SSLCertificateFile {{ env.IRONIC_VMEDIA_CERT_FILE }}
     SSLCertificateKeyFile {{ env.IRONIC_VMEDIA_KEY_FILE }}
 
+    {% if "IRONIC_VMEDIA_TLS_12_CIPHERS" in env and env.IRONIC_VMEDIA_TLS_12_CIPHERS %}
+    SSLCipherSuite {{ env.IRONIC_VMEDIA_TLS_12_CIPHERS }}
+    {% endif %}
+    {% if "IRONIC_VMEDIA_TLS_13_CIPHERS" in env and env.IRONIC_VMEDIA_TLS_13_CIPHERS %}
+    SSLCipherSuite TLSv1.3 {{ env.IRONIC_VMEDIA_TLS_13_CIPHERS }}
+    {% endif %}
+    {% if "IRONIC_VMEDIA_CURVES" in env and env.IRONIC_VMEDIA_CURVES %}
+    SSLOpenSSLConfCmd Curves {{ env.IRONIC_VMEDIA_CURVES }}
+    {% endif %}
+    {% if env.IRONIC_VMEDIA_TLS_ENFORCE_SERVER_CIPHER_ORDER | lower == "true" %}
+    SSLHonorCipherOrder on
+    {% endif %}
+
     <Directory "/shared/html/">
         Options Indexes FollowSymLinks
         AllowOverride None

kube-rbac-proxy/_service

@@ -2,7 +2,7 @@
  <service name="obs_scm">
     <param name="url">https://github.com/brancz/kube-rbac-proxy</param>
     <param name="scm">git</param>
-    <param name="revision">v0.18.1</param>
+    <param name="revision">v0.19.1</param>
     <param name="version">_auto_</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="changesgenerate">enable</param>

kube-rbac-proxy/kube-rbac-proxy.spec

@@ -17,14 +17,14 @@
 
 
 Name:           kube-rbac-proxy
-Version:        0.18.1
+Version:        0.19.1
-Release:        0.18.1
+Release:        0.19.1
 Summary:        The kube-rbac-proxy is a small HTTP proxy for a single upstream
 License:        Apache-2.0
 URL:            https://github.com/brancz/kube-rbac-proxy
 Source:         kube-rbac-proxy-%{version}.tar
 Source1:        vendor.tar.gz
-BuildRequires:  golang(API) = 1.23
+BuildRequires:  golang(API) = 1.24
 ExcludeArch:    s390
 ExcludeArch:    %{ix86}
 

metal3-chart/Chart.yaml

@@ -1,7 +1,7 @@
-#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.16_up0.12.6
+#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.18_up0.12.8
-#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.16_up0.12.6-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.18_up0.12.8-%RELEASE%
 apiVersion: v2
-appVersion: 0.12.6
+appVersion: 0.12.8
 dependencies:
 - alias: metal3-baremetal-operator
   name: baremetal-operator
@@ -10,7 +10,7 @@ dependencies:
 - alias: metal3-ironic
   name: ironic
   repository: file://./charts/ironic
-  version: 0.11.4
+  version: 0.11.5
 - alias: metal3-mariadb
   condition: global.enable_mariadb
   name: mariadb
@@ -20,9 +20,9 @@ dependencies:
   condition: global.enable_metal3_media_server
   name: media
   repository: file://./charts/media
-  version: 0.6.6
+  version: 0.7.1
 description: A Helm chart that installs all of the dependencies needed for Metal3
 icon: https://github.com/cncf/artwork/raw/master/projects/metal3/icon/color/metal3-icon-color.svg
 name: metal3
 type: application
-version: "%%CHART_MAJOR%%.0.16+up0.12.6"
+version: "%%CHART_MAJOR%%.0.18+up0.12.8"

metal3-chart/charts/ironic/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: 29.0.4
 description: A Helm chart for Ironic, used by Metal3
 name: ironic
 type: application
-version: 0.11.4
+version: 0.11.5

metal3-chart/charts/ironic/templates/configmap.yaml

@@ -52,3 +52,6 @@ data:
   {{- else }}
   IRONIC_USE_MARIADB: "false"
   {{- end }}
+  {{- with .Values.ironicExtraEnv -}}
+  {{ toYaml . | nindent 2 }}  
+  {{- end -}}

metal3-chart/charts/ironic/values.yaml

@@ -64,7 +64,7 @@ images:
   ironic:
     repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic
     pullPolicy: IfNotPresent
-    tag: 29.0.4.3
+    tag: 29.0.4.4
   ironicIPADownloader:
     repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic-ipa-downloader
     pullPolicy: IfNotPresent
@@ -138,6 +138,8 @@ baremetaloperator:
 debug:
   ironicRamdiskSshKey: ""
 
+ironicExtraEnv: {}
+
 tlscerts:
   cacert: ""
   key: ""

metal3-chart/charts/media/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 1.16.0
+appVersion: 1.21.0
 description: A Helm chart for Media, used by Metal3
 name: media
 type: application
-version: 0.6.6
+version: 0.7.1

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

@@ -34,13 +34,9 @@ spec:
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          command:
-          - /usr/sbin/httpd
-          args:
-          - -DFOREGROUND
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http

metal3-chart/charts/media/values.yaml

@@ -22,9 +22,9 @@ global:
 replicaCount: 1
 
 image:
-  repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic
+  repository: registry.suse.com/suse/nginx
   pullPolicy: IfNotPresent
-  tag: 29.0.4.2
+  tag: 1.21
 
 imagePullSecrets: []
 nameOverride: ""
@@ -42,8 +42,8 @@ serviceAccount:
 podAnnotations: {}
 
 podSecurityContext:
-  runAsUser: 10475
+  runAsUser: 486
-  fsGroup: 10475
+  fsGroup: 499
 
 securityContext:
   allowPrivilegeEscalation: false
@@ -102,11 +102,16 @@ volumes:
   - name: assets
     persistentVolumeClaim:
       claimName: media
+  - name: run
+    emptyDir:
+      sizeLimit: 10Mi
 
 # volume mounts
 volumeMounts:
   - mountPath: /srv/www/htdocs
     name: assets
+  - mountPath: /run
+    name: run
 
 # media volume settings
 mediaVolume:

metallb-chart/Chart.yaml

@@ -1,17 +1,17 @@
-#!BuildTag: %%CHART_PREFIX%%metallb:%%CHART_MAJOR%%.0.0_up0.14.9
+#!BuildTag: %%CHART_PREFIX%%metallb:%%CHART_MAJOR%%.0.1_up0.15.2
-#!BuildTag: %%CHART_PREFIX%%metallb:%%CHART_MAJOR%%.0.0_up0.14.9-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%metallb:%%CHART_MAJOR%%.0.1_up0.15.2-%RELEASE%
 apiVersion: v2
-appVersion: v0.14.9
+appVersion: v0.15.2
 dependencies:
 - condition: crds.enabled
   name: crds
   repository: file://./charts/crds
-  version: 0.14.9
+  version: 0.15.2
 - alias: metallb-frr-k8s
   condition: frrk8s.enabled
   name: frr-k8s
   repository: file://./charts/frr-k8s
-  version: 0.0.16
+  version: 0.0.20
 description: A network load-balancer implementation for Kubernetes using standard
   routing protocols
 home: https://metallb.universe.tf
@@ -21,4 +21,4 @@ name: metallb
 sources:
 - https://github.com/metallb/metallb
 type: application
-version: "%%CHART_MAJOR%%.0.0+up0.14.9"
+version: "%%CHART_MAJOR%%.0.1+up0.15.2"

metallb-chart/README.md

@@ -1,6 +1,6 @@
 # metallb
 
-![Version: 0.14.9](https://img.shields.io/badge/Version-0.14.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.14.9](https://img.shields.io/badge/AppVersion-v0.14.9-informational?style=flat-square)
+![Version: 0.15.2](https://img.shields.io/badge/Version-0.15.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.15.2](https://img.shields.io/badge/AppVersion-v0.15.2-informational?style=flat-square)
 
 A network load-balancer implementation for Kubernetes using standard routing protocols
 
@@ -16,8 +16,8 @@ Kubernetes: `>= 1.19.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-|  | crds | 0.14.9 |
+|  | crds | 0.15.2 |
-| https://metallb.github.io/frr-k8s | frr-k8s | 0.0.16 |
+| https://metallb.github.io/frr-k8s | frr-k8s | 0.0.20 |
 
 ## Values
 
@@ -99,7 +99,7 @@ Kubernetes: `>= 1.19.0-0`
 | prometheus.rbacPrometheus | bool | `true` |  |
 | prometheus.rbacProxy.pullPolicy | string | `nil` |  |
 | prometheus.rbacProxy.repository | string | `"registry.opensuse.org/isv/suse/edge/metallb/images/kube-rbac-proxy"` |  |
-| prometheus.rbacProxy.tag | string | `"v0.18.0"` |  |
+| prometheus.rbacProxy.tag | string | `"v0.19.1"` |  |
 | prometheus.scrapeAnnotations | bool | `false` |  |
 | prometheus.serviceAccount | string | `""` |  |
 | prometheus.serviceMonitor.controller.additionalLabels | object | `{}` |  |
@@ -122,7 +122,7 @@ Kubernetes: `>= 1.19.0-0`
 | speaker.frr.enabled | bool | `true` |  |
 | speaker.frr.image.pullPolicy | string | `nil` |  |
 | speaker.frr.image.repository | string | `"registry.opensuse.org/isv/suse/edge/metallb/images/frr"` |  |
-| speaker.frr.image.tag | string | `"8.5.6"` |  |
+| speaker.frr.image.tag | string | `"10.2.1"` |  |
 | speaker.frr.metricsPort | int | `7473` |  |
 | speaker.frr.resources | object | `{}` |  |
 | speaker.frrMetrics.resources | object | `{}` |  |

metallb-chart/charts/crds/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: v0.14.9
+appVersion: v0.15.2
 description: MetalLB CRDs
 home: https://metallb.universe.tf
 icon: https://metallb.universe.tf/images/logo/metallb-white.png
@@ -7,4 +7,4 @@ name: crds
 sources:
 - https://github.com/metallb/metallb
 type: application
-version: 0.14.9
+version: 0.15.2

metallb-chart/charts/crds/templates/crds.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: bfdprofiles.metallb.io
 spec:
   group: metallb.io
@@ -123,7 +123,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: bgpadvertisements.metallb.io
 spec:
   group: metallb.io
@@ -329,7 +329,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: bgppeers.metallb.io
 spec:
   conversion:
@@ -526,7 +526,15 @@ spec:
                       rule: duration(self).getMilliseconds() % 1000 == 0
                 disableMP:
                   default: false
-                  description: To set if we want to disable MP BGP that will separate IPv4 and IPv6 route exchanges into distinct BGP sessions.
+                  description: |-
+                    To set if we want to disable MP BGP that will separate IPv4 and IPv6 route exchanges into distinct BGP sessions.
+                    Deprecated: DisableMP is deprecated in favor of dualStackAddressFamily.
+                  type: boolean
+                dualStackAddressFamily:
+                  default: false
+                  description: |-
+                    To set if we want to enable the neighbor not only for the ipfamily related to its session,
+                    but also the other one. This allows to advertise/receive IPv4 prefixes over IPv6 sessions and vice versa.
                   type: boolean
                 dynamicASN:
                   description: |-
@@ -555,6 +563,14 @@ spec:
                 holdTime:
                   description: Requested BGP hold time, per RFC4271.
                   type: string
+                interface:
+                  description: |-
+                    Interface is the node interface over which the unnumbered BGP peering will
+                    be established. No API validation takes place as that string value
+                    represents an interface name on the host and if user provides an invalid
+                    value, only the actual BGP session will not be established.
+                    Address and Interface are mutually exclusive and one of them must be specified.
+                  type: string
                 keepaliveTime:
                   description: Requested BGP keepalive time, per RFC4271.
                   type: string
@@ -649,7 +665,7 @@ spec:
                   default: 179
                   description: Port to dial when establishing the session.
                   maximum: 16384
-                  minimum: 0
+                  minimum: 1
                   type: integer
                 routerID:
                   description: BGP router ID to advertise to the peer
@@ -664,7 +680,6 @@ spec:
                   type: string
               required:
                 - myASN
-                - peerAddress
               type: object
             status:
               description: BGPPeerStatus defines the observed state of Peer.
@@ -679,7 +694,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: communities.metallb.io
 spec:
   group: metallb.io
@@ -744,7 +759,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: ipaddresspools.metallb.io
 spec:
   group: metallb.io
@@ -941,6 +956,28 @@ spec:
               type: object
             status:
               description: IPAddressPoolStatus defines the observed state of IPAddressPool.
+              properties:
+                assignedIPv4:
+                  description: AssignedIPv4 is the number of assigned IPv4 addresses.
+                  format: int64
+                  type: integer
+                assignedIPv6:
+                  description: AssignedIPv6 is the number of assigned IPv6 addresses.
+                  format: int64
+                  type: integer
+                availableIPv4:
+                  description: AvailableIPv4 is the number of available IPv4 addresses.
+                  format: int64
+                  type: integer
+                availableIPv6:
+                  description: AvailableIPv6 is the number of available IPv6 addresses.
+                  format: int64
+                  type: integer
+              required:
+                - assignedIPv4
+                - assignedIPv6
+                - availableIPv4
+                - availableIPv6
               type: object
           required:
             - spec
@@ -954,7 +991,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: l2advertisements.metallb.io
 spec:
   group: metallb.io
@@ -1134,7 +1171,92 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.17.2
+  name: servicebgpstatuses.metallb.io
+spec:
+  group: metallb.io
+  names:
+    kind: ServiceBGPStatus
+    listKind: ServiceBGPStatusList
+    plural: servicebgpstatuses
+    singular: servicebgpstatus
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns:
+        - jsonPath: .status.node
+          name: Node
+          type: string
+        - jsonPath: .status.serviceName
+          name: Service Name
+          type: string
+        - jsonPath: .status.serviceNamespace
+          name: Service Namespace
+          type: string
+      name: v1beta1
+      schema:
+        openAPIV3Schema:
+          description: ServiceBGPStatus exposes the BGP peers a service is configured to be advertised to, per relevant node.
+          properties:
+            apiVersion:
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+              type: string
+            kind:
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: ServiceBGPStatusSpec defines the desired state of ServiceBGPStatus.
+              type: object
+            status:
+              description: MetalLBServiceBGPStatus defines the observed state of ServiceBGPStatus.
+              properties:
+                node:
+                  description: Node indicates the node announcing the service.
+                  type: string
+                  x-kubernetes-validations:
+                    - message: Value is immutable
+                      rule: self == oldSelf
+                peers:
+                  description: |-
+                    Peers indicate the BGP peers for which the service is configured to be advertised to.
+                    The service being actually advertised to a given peer depends on the session state and is not indicated here.
+                  items:
+                    type: string
+                  type: array
+                serviceName:
+                  description: ServiceName indicates the service this status represents.
+                  type: string
+                  x-kubernetes-validations:
+                    - message: Value is immutable
+                      rule: self == oldSelf
+                serviceNamespace:
+                  description: ServiceNamespace indicates the namespace of the service.
+                  type: string
+                  x-kubernetes-validations:
+                    - message: Value is immutable
+                      rule: self == oldSelf
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: servicel2statuses.metallb.io
 spec:
   group: metallb.io

metallb-chart/charts/frr-k8s/Chart.yaml

@@ -1,10 +1,10 @@
 apiVersion: v2
-appVersion: v0.0.16
+appVersion: v0.0.20
 dependencies:
 - condition: crds.enabled
   name: crds
   repository: file://./charts/crds
-  version: 0.0.16
+  version: 0.0.20
 description: A cloud native wrapper of FRR
 home: https://metallb.universe.tf
 icon: https://metallb.universe.tf/images/logo/metallb-white.png
@@ -13,4 +13,4 @@ name: frr-k8s
 sources:
 - https://github.com/metallb/frr-k8s
 type: application
-version: 0.0.16
+version: 0.0.20

metallb-chart/charts/frr-k8s/README.md

@@ -1,6 +1,6 @@
 # frr-k8s
 
-![Version: 0.0.16](https://img.shields.io/badge/Version-0.0.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.16](https://img.shields.io/badge/AppVersion-v0.0.16-informational?style=flat-square)
+![Version: 0.0.20](https://img.shields.io/badge/Version-0.0.20-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.20](https://img.shields.io/badge/AppVersion-v0.0.20-informational?style=flat-square)
 
 A cloud native wrapper of FRR
 
@@ -16,7 +16,7 @@ Kubernetes: `>= 1.19.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-|  | crds | 0.0.16 |
+|  | crds | 0.0.20 |
 
 ## Values
 
@@ -30,7 +30,7 @@ Kubernetes: `>= 1.19.0-0`
 | frrk8s.frr.acceptIncomingBGPConnections | bool | `false` |  |
 | frrk8s.frr.image.pullPolicy | string | `nil` |  |
 | frrk8s.frr.image.repository | string | `"registry.opensuse.org/isv/suse/edge/metallb/images/frr"` |  |
-| frrk8s.frr.image.tag | string | `"8.5.6"` |  |
+| frrk8s.frr.image.tag | string | `"10.2.1"` |  |
 | frrk8s.frr.metricsBindAddress | string | `"127.0.0.1"` |  |
 | frrk8s.frr.metricsPort | int | `7573` |  |
 | frrk8s.frr.resources | object | `{}` |  |
@@ -78,7 +78,7 @@ Kubernetes: `>= 1.19.0-0`
 | prometheus.rbacPrometheus | bool | `false` |  |
 | prometheus.rbacProxy.pullPolicy | string | `nil` |  |
 | prometheus.rbacProxy.repository | string | `"registry.opensuse.org/isv/suse/edge/metallb/images/kube-rbac-proxy"` |  |
-| prometheus.rbacProxy.tag | string | `"v0.18.0"` |  |
+| prometheus.rbacProxy.tag | string | `"v0.19.1"` |  |
 | prometheus.scrapeAnnotations | bool | `false` |  |
 | prometheus.secureMetricsPort | int | `9140` |  |
 | prometheus.serviceAccount | string | `""` |  |

metallb-chart/charts/frr-k8s/charts/crds/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: v0.0.16
+appVersion: v0.0.20
 description: FRR K8s CRDs
 home: https://metallb.universe.tf
 icon: https://metallb.universe.tf/images/logo/metallb-white.png
@@ -7,4 +7,4 @@ name: crds
 sources:
 - https://github.com/metallb/frr-k8s
 type: application
-version: 0.0.16
+version: 0.0.20

metallb-chart/charts/frr-k8s/values.yaml

@@ -98,7 +98,7 @@ frrk8s:
   tolerateMaster: true
   image:
     repository: "registry.opensuse.org/isv/suse/edge/metallb/images/frr-k8s"
-    tag: "v0.0.16"
+    tag: "v0.0.20"
     pullPolicy: IfNotPresent
   ## @param controller.updateStrategy.type FRR-K8s controller daemonset strategy type
   ## ref: https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/
@@ -161,7 +161,7 @@ frrk8s:
   frr:
     image:
       repository: "registry.opensuse.org/isv/suse/edge/metallb/images/frr"
-      tag: "8.5.6"
+      tag: "10.2.1"
       pullPolicy: IfNotPresent
     metricsBindAddress: 127.0.0.1
     metricsPort: 7573

metallb-chart/templates/rbac.yaml

@@ -110,6 +110,9 @@ rules:
 - apiGroups: ["metallb.io"]
   resources: ["communities"]
   verbs: ["get", "list", "watch"]
+- apiGroups: ["metallb.io"]
+  resources: ["servicebgpstatuses","servicebgpstatuses/status"]
+  verbs: ["*"]
 {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -138,6 +141,9 @@ rules:
 - apiGroups: ["metallb.io"]
   resources: ["ipaddresspools"]
   verbs: ["get", "list", "watch"]
+- apiGroups: ["metallb.io"]
+  resources: ["ipaddresspools/status"]
+  verbs: ["update"]
 - apiGroups: ["metallb.io"]
   resources: ["bgppeers"]
   verbs: ["get", "list"]

metallb-chart/values.yaml

@@ -59,7 +59,7 @@ prometheus:
   # the image to be used for the kuberbacproxy container
   rbacProxy:
     repository: "%%IMG_REPO%%/%%IMG_PREFIX%%kube-rbac-proxy"
-    tag: "0.18.1"
+    tag: "0.19.1"
     pullPolicy: IfNotPresent
 
   # Prometheus Operator PodMonitors
@@ -201,7 +201,7 @@ controller:
   # webhookMode: enabled
   image:
     repository: "%%IMG_REPO%%/%%IMG_PREFIX%%metallb-controller"
-    tag: "v0.14.9"
+    tag: "v0.15.2"
     pullPolicy: IfNotPresent
   ## @param controller.updateStrategy.type Metallb controller deployment strategy type.
   ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
@@ -282,7 +282,7 @@ speaker:
 
   image:
     repository: "%%IMG_REPO%%/%%IMG_PREFIX%%metallb-speaker"
-    tag: "v0.14.9"
+    tag: "v0.15.2"
     pullPolicy: IfNotPresent
   ## @param speaker.updateStrategy.type Speaker daemonset strategy type
   ## ref: https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/
@@ -346,7 +346,7 @@ speaker:
     enabled: false
     image:
       repository: "%%IMG_REPO%%/%%IMG_PREFIX%%frr"
-      tag: "8.5.6"
+      tag: "10.2.1"
       pullPolicy: IfNotPresent
     metricsPort: 7473
     resources: {}

metallb/_service

@@ -2,7 +2,7 @@
  <service name="obs_scm">
     <param name="url">https://github.com/metallb/metallb</param>
     <param name="scm">git</param>
-    <param name="revision">v0.14.9</param>
+    <param name="revision">v0.15.2</param>
     <param name="version">_auto_</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="changesgenerate">enable</param>

metallb/metallb.spec

@@ -17,14 +17,14 @@
 
 
 Name:           metallb
-Version:        0.14.9
+Version:        0.15.2
-Release:        0.14.9
+Release:        0.15.2
 Summary:        Load Balancer for bare metal Kubernetes clusters
 License:        Apache-2.0
 URL:            https://github.com/metallb/metallb
 Source:         %{name}-%{version}.tar
 Source1:        vendor.tar.gz
-BuildRequires:  golang(API) = 1.22
+BuildRequires:  golang(API) = 1.24
 ExcludeArch:    s390
 ExcludeArch:    %{ix86}
 

python-suse-edge-components-versions/python-suse-edge-components-versions.spec

@@ -20,7 +20,7 @@
 %endif
 
 Name:           python-suse-edge-components-versions
-Version:        0.1.1
+Version:        0.2.1
 Release:        0%{?dist}
 Summary:        A tool to gather and display component versions for SUSE Edge products.
 License:        Apache-2.0
@@ -73,9 +73,9 @@ cd components-versions
 mv %{buildroot}%{_bindir}/components-versions %{buildroot}%{_bindir}/suse-edge-components-versions
 %python_clone -a %{buildroot}%{_bindir}/suse-edge-components-versions
 cd ..
-# Move the json files to /usr/share/suse-edge-components-versions instead
+# Move the yaml files to /usr/share/suse-edge-components-versions instead
 mkdir -p %{buildroot}/usr/share/suse-edge-components-versions/
-mv %{buildroot}%{python_sitelib}/components_versions/data/*.json %{buildroot}/usr/share/suse-edge-components-versions/
+mv %{buildroot}%{python_sitelib}/components_versions/data/*.yaml %{buildroot}/usr/share/suse-edge-components-versions/
 rmdir %{buildroot}%{python_sitelib}/components_versions/data/
 
 %post
@@ -92,7 +92,7 @@ rmdir %{buildroot}%{python_sitelib}/components_versions/data/
 %{python_sitelib}/suse_edge_components_versions-%{version}*.dist-info
 # Include the main executable with its new name.
 %python_alternative %{_bindir}/suse-edge-components-versions
-# Include the json files
+# Include the yaml files
 /usr/share/suse-edge-components-versions/
 
 %changelog

rancher-turtles-airgap-resources-chart/Chart.yaml

@@ -1,10 +1,10 @@
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.5_up0.21.0
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.6_up0.24.0
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.5_up0.21.0-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.6_up0.24.0-%RELEASE%
 apiVersion: v2
-appVersion: 0.21.0
+appVersion: 0.24.0
 description: Rancher Turtles utility chart for airgap scenarios
 home: https://github.com/rancher/turtles/
 icon: https://raw.githubusercontent.com/rancher/turtles/main/logos/capi.svg
 name: rancher-turtles-airgap-resources
 type: application
-version: "%%CHART_MAJOR%%.0.5+up0.21.0"
+version: "%%CHART_MAJOR%%.0.6+up0.24.0"

rancher-turtles-airgap-resources-chart/README.md

@@ -23,6 +23,9 @@ cluster-api-operator:
       infrastructure:
         fetchConfig:
           selector: "{\"matchLabels\": {\"provider-components\": \"metal3\"}}"
+      ipam:
+        fetchConfig:
+          selector: "{\"matchLabels\": {\"provider-components\": \"metal3ipam\"}}"
     fleet:
       addon:
         fetchConfig:

rancher-turtles-airgap-resources-chart/templates/airgap-cm-fleet-addon.yaml

@@ -813,7 +813,7 @@ data:
             control-plane: controller-manager
         spec:
           containers:
-          - image: ghcr.io/rancher-sandbox/cluster-api-addon-provider-fleet:v0.11.0
+          - image: ghcr.io/rancher/cluster-api-addon-provider-fleet:v0.11.0
             imagePullPolicy: IfNotPresent
             name: manager
             ports:
@@ -835,7 +835,7 @@ data:
                 memory: 100Mi
           - args:
             - --helm-install
-            image: ghcr.io/rancher-sandbox/cluster-api-addon-provider-fleet:v0.11.0
+            image: ghcr.io/rancher/cluster-api-addon-provider-fleet:v0.11.0
             name: helm-manager
             resources:
               limits:

rancher-turtles-airgap-resources-chart/templates/airgap-cm-rke2-bootstrap.yaml

@@ -1,3 +1,4 @@
+{{- if not (lookup "v1" "Namespace" "" "rke2-bootstrap-system") }}
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -6,6 +7,7 @@ metadata:
     control-plane: controller-manager
   name: rke2-bootstrap-system
 ---
+{{- end }}
 apiVersion: v1
 data:
   components: |
@@ -564,27 +566,32 @@ data:
                       properties:
                         lastTransitionTime:
                           description: |-
-                            Last time the condition transitioned from one status to another.
+                            lastTransitionTime is the last time the condition transitioned from one status to another.
                             This should be when the underlying condition changed. If that is not known, then using the time when
                             the API field changed is acceptable.
                           format: date-time
                           type: string
                         message:
                           description: |-
-                            A human readable message indicating details about the transition.
+                            message is a human readable message indicating details about the transition.
                             This field may be empty.
+                          maxLength: 10240
+                          minLength: 1
                           type: string
                         reason:
                           description: |-
-                            The reason for the condition's last transition in CamelCase.
+                            reason is the reason for the condition's last transition in CamelCase.
                             The specific API may choose whether or not this field is considered a guaranteed API.
                             This field may be empty.
+                          maxLength: 256
+                          minLength: 1
                           type: string
                         severity:
                           description: |-
                             severity provides an explicit classification of Reason code, so the users or machines can immediately
                             understand the current situation and act accordingly.
                             The Severity field MUST be set only when Status=False.
+                          maxLength: 32
                           type: string
                         status:
                           description: status of the condition, one of True, False, Unknown.
@@ -594,6 +601,8 @@ data:
                             type of condition in CamelCase or in foo.example.com/CamelCase.
                             Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
                             can be useful (see .node.status.conditions), the ability to deconflict is important.
+                          maxLength: 256
+                          minLength: 1
                           type: string
                       required:
                       - lastTransitionTime
@@ -943,25 +952,42 @@ data:
                           description: ContentFrom is a referenced source of content to
                             populate the file.
                           properties:
-                            secret:
+                            configMap:
-                              description: SecretFileSource represents a secret that should
+                              description: ConfigMapFileSource represents a config map
-                                populate this file.
+                                that should populate this file.
                               properties:
                                 key:
-                                  description: Key is the key in the secret's data map
+                                  description: Key is the key in the secret or config
-                                    for this value.
+                                    map's data map for this value.
                                   type: string
                                 name:
-                                  description: Name of the secret in the RKE2BootstrapConfig's
+                                  description: Name of the secret/configmap in the RKE2BootstrapConfig's
                                     namespace to use.
                                   type: string
                               required:
                               - key
                               - name
                               type: object
+                            secret:
+                              description: SecretFileSource represents a secret that should
+                                populate this file.
+                              properties:
+                                key:
+                                  description: Key is the key in the secret or config
+                                    map's data map for this value.
+                                  type: string
+                                name:
+                                  description: Name of the secret/configmap in the RKE2BootstrapConfig's
+                                    namespace to use.
+                                  type: string
                               required:
-                          - secret
+                              - key
+                              - name
                               type: object
+                          type: object
+                          x-kubernetes-validations:
+                          - message: Only configMap or secret can be populated at once
+                            rule: '!(has(self.secret) && has(self.configMap))'
                         encoding:
                           description: Encoding specifies the encoding of the file contents.
                           enum:
@@ -1153,27 +1179,32 @@ data:
                       properties:
                         lastTransitionTime:
                           description: |-
-                            Last time the condition transitioned from one status to another.
+                            lastTransitionTime is the last time the condition transitioned from one status to another.
                             This should be when the underlying condition changed. If that is not known, then using the time when
                             the API field changed is acceptable.
                           format: date-time
                           type: string
                         message:
                           description: |-
-                            A human readable message indicating details about the transition.
+                            message is a human readable message indicating details about the transition.
                             This field may be empty.
+                          maxLength: 10240
+                          minLength: 1
                           type: string
                         reason:
                           description: |-
-                            The reason for the condition's last transition in CamelCase.
+                            reason is the reason for the condition's last transition in CamelCase.
                             The specific API may choose whether or not this field is considered a guaranteed API.
                             This field may be empty.
+                          maxLength: 256
+                          minLength: 1
                           type: string
                         severity:
                           description: |-
                             severity provides an explicit classification of Reason code, so the users or machines can immediately
                             understand the current situation and act accordingly.
                             The Severity field MUST be set only when Status=False.
+                          maxLength: 32
                           type: string
                         status:
                           description: status of the condition, one of True, False, Unknown.
@@ -1183,6 +1214,8 @@ data:
                             type of condition in CamelCase or in foo.example.com/CamelCase.
                             Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
                             can be useful (see .node.status.conditions), the ability to deconflict is important.
+                          maxLength: 256
+                          minLength: 1
                           type: string
                       required:
                       - lastTransitionTime
@@ -2124,25 +2157,43 @@ data:
                                   description: ContentFrom is a referenced source of content
                                     to populate the file.
                                   properties:
-                                    secret:
+                                    configMap:
-                                      description: SecretFileSource represents a secret
+                                      description: ConfigMapFileSource represents a config
-                                        that should populate this file.
+                                        map that should populate this file.
                                       properties:
                                         key:
-                                          description: Key is the key in the secret's
+                                          description: Key is the key in the secret or
-                                            data map for this value.
+                                            config map's data map for this value.
                                           type: string
                                         name:
-                                          description: Name of the secret in the RKE2BootstrapConfig's
+                                          description: Name of the secret/configmap in
-                                            namespace to use.
+                                            the RKE2BootstrapConfig's namespace to use.
                                           type: string
                                       required:
                                       - key
                                       - name
                                       type: object
+                                    secret:
+                                      description: SecretFileSource represents a secret
+                                        that should populate this file.
+                                      properties:
+                                        key:
+                                          description: Key is the key in the secret or
+                                            config map's data map for this value.
+                                          type: string
+                                        name:
+                                          description: Name of the secret/configmap in
+                                            the RKE2BootstrapConfig's namespace to use.
+                                          type: string
                                       required:
-                                  - secret
+                                      - key
+                                      - name
                                       type: object
+                                  type: object
+                                  x-kubernetes-validations:
+                                  - message: Only configMap or secret can be populated
+                                      at once
+                                    rule: '!(has(self.secret) && has(self.configMap))'
                                 encoding:
                                   description: Encoding specifies the encoding of the
                                     file contents.
@@ -2537,7 +2588,7 @@ data:
             - --concurrency=${CONCURRENCY_NUMBER:=10}
             command:
             - /manager
-            image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.18.0
+            image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.20.1
             imagePullPolicy: IfNotPresent
             livenessProbe:
               httpGet:
@@ -2778,10 +2829,16 @@ data:
       - major: 0
         minor: 18
         contract: v1beta1
+      - major: 0
+        minor: 19
+        contract: v1beta1
+      - major: 0
+        minor: 20
+        contract: v1beta1
 kind: ConfigMap
 metadata:
   creationTimestamp: null
-  name: v0.18.0
+  name: v0.20.1
   namespace: rke2-bootstrap-system
   labels:
     provider-components: rke2-bootstrap

rancher-turtles-airgap-resources-chart/templates/airgap-cm-rke2-control-plane.yaml

@@ -1,3 +1,4 @@
+{{- if not (lookup "v1" "Namespace" "" "rke2-control-plane-system") }}
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -6,6 +7,7 @@ metadata:
     control-plane: controller-manager
   name: rke2-control-plane-system
 ---
+{{- end }}
 apiVersion: v1
 data:
   components: |
@@ -1177,27 +1179,32 @@ data:
                       properties:
                         lastTransitionTime:
                           description: |-
-                            Last time the condition transitioned from one status to another.
+                            lastTransitionTime is the last time the condition transitioned from one status to another.
                             This should be when the underlying condition changed. If that is not known, then using the time when
                             the API field changed is acceptable.
                           format: date-time
                           type: string
                         message:
                           description: |-
-                            A human readable message indicating details about the transition.
+                            message is a human readable message indicating details about the transition.
                             This field may be empty.
+                          maxLength: 10240
+                          minLength: 1
                           type: string
                         reason:
                           description: |-
-                            The reason for the condition's last transition in CamelCase.
+                            reason is the reason for the condition's last transition in CamelCase.
                             The specific API may choose whether or not this field is considered a guaranteed API.
                             This field may be empty.
+                          maxLength: 256
+                          minLength: 1
                           type: string
                         severity:
                           description: |-
                             severity provides an explicit classification of Reason code, so the users or machines can immediately
                             understand the current situation and act accordingly.
                             The Severity field MUST be set only when Status=False.
+                          maxLength: 32
                           type: string
                         status:
                           description: status of the condition, one of True, False, Unknown.
@@ -1207,6 +1214,8 @@ data:
                             type of condition in CamelCase or in foo.example.com/CamelCase.
                             Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
                             can be useful (see .node.status.conditions), the ability to deconflict is important.
+                          maxLength: 256
+                          minLength: 1
                           type: string
                       required:
                       - lastTransitionTime
@@ -1582,25 +1591,42 @@ data:
                           description: ContentFrom is a referenced source of content to
                             populate the file.
                           properties:
-                            secret:
+                            configMap:
-                              description: SecretFileSource represents a secret that should
+                              description: ConfigMapFileSource represents a config map
-                                populate this file.
+                                that should populate this file.
                               properties:
                                 key:
-                                  description: Key is the key in the secret's data map
+                                  description: Key is the key in the secret or config
-                                    for this value.
+                                    map's data map for this value.
                                   type: string
                                 name:
-                                  description: Name of the secret in the RKE2BootstrapConfig's
+                                  description: Name of the secret/configmap in the RKE2BootstrapConfig's
                                     namespace to use.
                                   type: string
                               required:
                               - key
                               - name
                               type: object
+                            secret:
+                              description: SecretFileSource represents a secret that should
+                                populate this file.
+                              properties:
+                                key:
+                                  description: Key is the key in the secret or config
+                                    map's data map for this value.
+                                  type: string
+                                name:
+                                  description: Name of the secret/configmap in the RKE2BootstrapConfig's
+                                    namespace to use.
+                                  type: string
                               required:
-                          - secret
+                              - key
+                              - name
                               type: object
+                          type: object
+                          x-kubernetes-validations:
+                          - message: Only configMap or secret can be populated at once
+                            rule: '!(has(self.secret) && has(self.configMap))'
                         encoding:
                           description: Encoding specifies the encoding of the file contents.
                           enum:
@@ -1741,7 +1767,7 @@ data:
                             additionalProperties:
                               type: string
                             description: |-
-                              Map of string keys and values that can be used to organize and categorize
+                              labels is a map of string keys and values that can be used to organize and categorize
                               (scope and select) objects. May match selectors of replication controllers
                               and services.
                               More info: http://kubernetes.io/docs/user-guide/labels
@@ -2603,27 +2629,32 @@ data:
                       properties:
                         lastTransitionTime:
                           description: |-
-                            Last time the condition transitioned from one status to another.
+                            lastTransitionTime is the last time the condition transitioned from one status to another.
                             This should be when the underlying condition changed. If that is not known, then using the time when
                             the API field changed is acceptable.
                           format: date-time
                           type: string
                         message:
                           description: |-
-                            A human readable message indicating details about the transition.
+                            message is a human readable message indicating details about the transition.
                             This field may be empty.
+                          maxLength: 10240
+                          minLength: 1
                           type: string
                         reason:
                           description: |-
-                            The reason for the condition's last transition in CamelCase.
+                            reason is the reason for the condition's last transition in CamelCase.
                             The specific API may choose whether or not this field is considered a guaranteed API.
                             This field may be empty.
+                          maxLength: 256
+                          minLength: 1
                           type: string
                         severity:
                           description: |-
                             severity provides an explicit classification of Reason code, so the users or machines can immediately
                             understand the current situation and act accordingly.
                             The Severity field MUST be set only when Status=False.
+                          maxLength: 32
                           type: string
                         status:
                           description: status of the condition, one of True, False, Unknown.
@@ -2633,6 +2664,8 @@ data:
                             type of condition in CamelCase or in foo.example.com/CamelCase.
                             Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
                             can be useful (see .node.status.conditions), the ability to deconflict is important.
+                          maxLength: 256
+                          minLength: 1
                           type: string
                       required:
                       - lastTransitionTime
@@ -3130,25 +3163,43 @@ data:
                                   description: ContentFrom is a referenced source of content
                                     to populate the file.
                                   properties:
-                                    secret:
+                                    configMap:
-                                      description: SecretFileSource represents a secret
+                                      description: ConfigMapFileSource represents a config
-                                        that should populate this file.
+                                        map that should populate this file.
                                       properties:
                                         key:
-                                          description: Key is the key in the secret's
+                                          description: Key is the key in the secret or
-                                            data map for this value.
+                                            config map's data map for this value.
                                           type: string
                                         name:
-                                          description: Name of the secret in the RKE2BootstrapConfig's
+                                          description: Name of the secret/configmap in
-                                            namespace to use.
+                                            the RKE2BootstrapConfig's namespace to use.
                                           type: string
                                       required:
                                       - key
                                       - name
                                       type: object
+                                    secret:
+                                      description: SecretFileSource represents a secret
+                                        that should populate this file.
+                                      properties:
+                                        key:
+                                          description: Key is the key in the secret or
+                                            config map's data map for this value.
+                                          type: string
+                                        name:
+                                          description: Name of the secret/configmap in
+                                            the RKE2BootstrapConfig's namespace to use.
+                                          type: string
                                       required:
-                                  - secret
+                                      - key
+                                      - name
                                       type: object
+                                  type: object
+                                  x-kubernetes-validations:
+                                  - message: Only configMap or secret can be populated
+                                      at once
+                                    rule: '!(has(self.secret) && has(self.configMap))'
                                 encoding:
                                   description: Encoding specifies the encoding of the
                                     file contents.
@@ -3291,7 +3342,7 @@ data:
                                     additionalProperties:
                                       type: string
                                     description: |-
-                                      Map of string keys and values that can be used to organize and categorize
+                                      labels is a map of string keys and values that can be used to organize and categorize
                                       (scope and select) objects. May match selectors of replication controllers
                                       and services.
                                       More info: http://kubernetes.io/docs/user-guide/labels
@@ -4181,27 +4232,32 @@ data:
                       properties:
                         lastTransitionTime:
                           description: |-
-                            Last time the condition transitioned from one status to another.
+                            lastTransitionTime is the last time the condition transitioned from one status to another.
                             This should be when the underlying condition changed. If that is not known, then using the time when
                             the API field changed is acceptable.
                           format: date-time
                           type: string
                         message:
                           description: |-
-                            A human readable message indicating details about the transition.
+                            message is a human readable message indicating details about the transition.
                             This field may be empty.
+                          maxLength: 10240
+                          minLength: 1
                           type: string
                         reason:
                           description: |-
-                            The reason for the condition's last transition in CamelCase.
+                            reason is the reason for the condition's last transition in CamelCase.
                             The specific API may choose whether or not this field is considered a guaranteed API.
                             This field may be empty.
+                          maxLength: 256
+                          minLength: 1
                           type: string
                         severity:
                           description: |-
                             severity provides an explicit classification of Reason code, so the users or machines can immediately
                             understand the current situation and act accordingly.
                             The Severity field MUST be set only when Status=False.
+                          maxLength: 32
                           type: string
                         status:
                           description: status of the condition, one of True, False, Unknown.
@@ -4211,6 +4267,8 @@ data:
                             type of condition in CamelCase or in foo.example.com/CamelCase.
                             Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
                             can be useful (see .node.status.conditions), the ability to deconflict is important.
+                          maxLength: 256
+                          minLength: 1
                           type: string
                       required:
                       - lastTransitionTime
@@ -4559,7 +4617,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.uid
-            image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.18.0
+            image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.20.1
             imagePullPolicy: IfNotPresent
             livenessProbe:
               httpGet:
@@ -4807,10 +4865,16 @@ data:
       - major: 0
         minor: 18
         contract: v1beta1
+      - major: 0
+        minor: 19
+        contract: v1beta1
+      - major: 0
+        minor: 20
+        contract: v1beta1
 kind: ConfigMap
 metadata:
   creationTimestamp: null
-  name: v0.18.0
+  name: v0.20.1
   namespace: rke2-control-plane-system
   labels:
     provider-components: rke2-control-plane

rancher-turtles-chart/Chart.yaml

@@ -1,5 +1,5 @@
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.5_up0.21.0
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.6_up0.24.0
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.5_up0.21.0-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.6_up0.24.0-%RELEASE%
 annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: Rancher Turtles - the Cluster API Extension
@@ -7,17 +7,12 @@ annotations:
   catalog.cattle.io/namespace: rancher-turtles-system
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux
-  catalog.cattle.io/rancher-version: '>= 2.11.0-1'
+  catalog.cattle.io/rancher-version: '>= 2.12.1-0 < 2.13.0-0'
   catalog.cattle.io/release-name: rancher-turtles
   catalog.cattle.io/scope: management
   catalog.cattle.io/type: cluster-tool
 apiVersion: v2
-appVersion: 0.21.0
+appVersion: 0.24.0
-dependencies:
-- condition: cluster-api-operator.enabled
-  name: cluster-api-operator
-  repository: file://./charts/cluster-api-operator
-  version: 0.18.1
 description: Rancher Turtles is an extension to Rancher that brings full Cluster API
   integration to Rancher.
 home: https://github.com/rancher/turtles/
@@ -29,4 +24,4 @@ keywords:
 - provisioning
 name: rancher-turtles
 type: application
-version: "%%CHART_MAJOR%%.0.5+up0.21.0"
+version: "%%CHART_MAJOR%%.0.6+up0.24.0"

rancher-turtles-chart/README.md

@@ -1,5 +1,5 @@
 # Rancher Turtles Chart
 
-This chart installs the Rancher Turtles operator and optionally the Cluster API Operator using Helm.
+This chart installs Rancher Turtles using Helm.
 
 Checkout the [documentation](https://turtles.docs.rancher.com) for further information.

rancher-turtles-chart/RELEASE_NOTES.md

@@ -1,6 +1,42 @@
-## Changes since examples/v0.21.0
+## Highlights
----
-## :chart_with_upwards_trend: Overview
 
+* REPLACE ME
+
+## Deprecation Warning
+
+REPLACE ME: A couple sentences describing the deprecation, including links to docs.
+
+* [GitHub issue #REPLACE ME](REPLACE ME)
+
+## Changes since v0.24.0-rc.0
+## :chart_with_upwards_trend: Overview
+- 10 new commits merged
+
+:book: Additionally, there has been 1 contribution to our documentation and book. (#1714) 
+
+## :question: Sort these by hand
+- Build-and-release: Add automation to release turtles in rancher/charts and rancher/rancher (#1663)
+- Build-and-release: Doc: Add ADR for updated release process (#1660)
+- Build-and-release: Test prime image build (#1710)
+- CI: Display kind and docker version in e2e runs (#1707)
+- Dependency: Bump forward CAPA to v2.9.1 patch release (#1713)
+- Dependency: Chore(deps): Bump github.com/onsi/ginkgo/v2 from 2.25.2 to 2.25.3 in the testing-dependencies group (#1692)
+- Dependency: Chore(deps): Bump the other-dependencies group with 2 updates (#1693)
+- Testing: Test: cleanup import gitops suite/spec (#1704)
+- Testing: Use providers charts in e2e (#1699)
+
+## Dependencies
+
+### Added
+_Nothing has changed._
+
+### Changed
+- github.com/onsi/ginkgo/v2: [v2.25.2 → v2.25.3](https://github.com/onsi/ginkgo/compare/v2.25.2...v2.25.3)
+- github.com/spf13/pflag: [v1.0.7 → v1.0.10](https://github.com/spf13/pflag/compare/v1.0.7...v1.0.10)
+- golang.org/x/sync: v0.16.0 → v0.17.0
+- golang.org/x/text: v0.28.0 → v0.29.0
+
+### Removed
+_Nothing has changed._
 
 _Thanks to all our contributors!_ 😊

rancher-turtles-chart/charts/cluster-api-operator/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

rancher-turtles-chart/charts/cluster-api-operator/Chart.yaml

@@ -1,6 +0,0 @@
-apiVersion: v2
-appVersion: 0.18.1
-description: Cluster API Operator
-name: cluster-api-operator
-type: application
-version: 0.18.1

rancher-turtles-chart/charts/cluster-api-operator/templates/_helpers.tpl

@@ -1,24 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "capi-operator.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "capi-operator.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}

rancher-turtles-chart/charts/cluster-api-operator/templates/addon.yaml

@@ -1,60 +0,0 @@
-# Addon provider
-{{- if .Values.addon }}
-{{- $addons := split ";" .Values.addon }}
-{{- $addonNamespace := "" }}
-{{- $addonName := "" }}
-{{- $addonVersion := "" }}
-{{- range $addon := $addons }}
-{{- $addonArgs := split ":" $addon }}
-{{- $addonArgsLen :=  len $addonArgs }}
-{{-  if eq $addonArgsLen 3 }}
-  {{- $addonNamespace = $addonArgs._0 }}
-  {{- $addonName = $addonArgs._1 }}
-  {{- $addonVersion = $addonArgs._2 }}
-{{-  else if eq $addonArgsLen 2 }}
-  {{- $addonNamespace = print $addonArgs._0 "-addon-system" }}
-  {{- $addonName = $addonArgs._0 }}
-  {{- $addonVersion = $addonArgs._1 }}
-{{-  else if eq $addonArgsLen 1 }}
-  {{- $addonNamespace = print $addonArgs._0 "-addon-system" }}
-  {{- $addonName = $addonArgs._0 }}
-{{- else }}
-  {{- fail "addon provider argument should have the following format helm:v1.0.0 or mynamespace:helm:v1.0.0" }}
-{{- end }}
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "1"
-  name: {{ $addonNamespace }}
----
-apiVersion: operator.cluster.x-k8s.io/v1alpha2
-kind: AddonProvider
-metadata:
-  name: {{ $addonName }}
-  namespace: {{ $addonNamespace }}
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "2"
-{{- if or $addonVersion $.Values.secretName }}
-spec:
-{{- end}}
-{{- if $addonVersion }}
-  version: {{ $addonVersion }}
-{{- end }}
-{{- if $.Values.secretName }}
-  secretName: {{ $.Values.secretName }}
-{{- end }}
-{{- if $.Values.secretNamespace }}
-  secretNamespace: {{ $.Values.secretNamespace }}
-{{- end }}
-{{- end }}
-{{- end }}

rancher-turtles-chart/charts/cluster-api-operator/templates/bootstrap.yaml

@@ -1,61 +0,0 @@
-# Bootstrap provider
-{{- if .Values.bootstrap }}
-{{- $bootstraps := split ";" .Values.bootstrap }}
-{{- $bootstrapNamespace := "" }}
-{{- $bootstrapName := "" }}
-{{- $bootstrapVersion := "" }}
-{{- range $bootstrap := $bootstraps }}
-{{- $bootstrapArgs := split ":" $bootstrap }}
-{{- $bootstrapArgsLen :=  len $bootstrapArgs }}
-{{-  if eq $bootstrapArgsLen 3 }}
-  {{- $bootstrapNamespace = $bootstrapArgs._0 }}
-  {{- $bootstrapName = $bootstrapArgs._1 }}
-  {{- $bootstrapVersion = $bootstrapArgs._2 }}
-{{-  else if eq $bootstrapArgsLen 2 }}
-  {{- $bootstrapNamespace = print $bootstrapArgs._0 "-bootstrap-system" }}
-  {{- $bootstrapName = $bootstrapArgs._0 }}
-  {{- $bootstrapVersion = $bootstrapArgs._1 }}
-{{-  else if eq $bootstrapArgsLen 1 }}
-  {{- $bootstrapNamespace = print $bootstrapArgs._0 "-bootstrap-system" }}
-  {{- $bootstrapName = $bootstrapArgs._0 }}
-{{- else }}
-  {{- fail "bootstrap provider argument should have the following format kubeadm:v1.0.0 or mynamespace:kubeadm:v1.0.0" }}
-{{- end }}
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "1"
-  name: {{ $bootstrapNamespace }}
----
-apiVersion: operator.cluster.x-k8s.io/v1alpha2
-kind: BootstrapProvider
-metadata:
-  name: {{ $bootstrapName }}
-  namespace: {{ $bootstrapNamespace }}
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "2"
-{{- if or $bootstrapVersion $.Values.configSecret.name }}
-spec:
-{{- end}}
-{{- if $bootstrapVersion }}
-  version: {{ $bootstrapVersion }}
-{{- end }}
-{{- if $.Values.configSecret.name }}
-  configSecret:
-    name: {{ $.Values.configSecret.name }}
-    {{- if $.Values.configSecret.namespace }}
-    namespace: {{ $.Values.configSecret.namespace }}
-    {{- end }}
-{{- end }}
-{{- end }}
-{{- end }}

rancher-turtles-chart/charts/cluster-api-operator/templates/control-plane.yaml

@@ -1,74 +0,0 @@
-# Control plane provider
-{{- if .Values.controlPlane }}
-{{- $controlPlanes := split ";" .Values.controlPlane }}
-{{- $controlPlaneNamespace := "" }}
-{{- $controlPlaneName := "" }}
-{{- $controlPlaneVersion := "" }}
-{{- range $controlPlane := $controlPlanes }}
-{{- $controlPlaneArgs := split ":" $controlPlane }}
-{{- $controlPlaneArgsLen :=  len $controlPlaneArgs }}
-{{-  if eq $controlPlaneArgsLen 3 }}
-  {{- $controlPlaneNamespace = $controlPlaneArgs._0 }}
-  {{- $controlPlaneName = $controlPlaneArgs._1 }}
-  {{- $controlPlaneVersion = $controlPlaneArgs._2 }}
-{{-  else if eq $controlPlaneArgsLen 2 }}
-  {{- $controlPlaneNamespace = print $controlPlaneArgs._0 "-control-plane-system" }}
-  {{- $controlPlaneName = $controlPlaneArgs._0 }}
-  {{- $controlPlaneVersion = $controlPlaneArgs._1 }}
-{{-  else if eq $controlPlaneArgsLen 1 }}
-  {{- $controlPlaneNamespace = print $controlPlaneArgs._0 "-control-plane-system" }}
-  {{- $controlPlaneName = $controlPlaneArgs._0 }}
-{{- else }}
-  {{- fail "controlplane provider argument should have the following format kubeadm:v1.0.0 or mynamespace:kubeadm:v1.0.0" }}
-{{-  end }}
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "1"
-  name: {{ $controlPlaneNamespace }}
----
-apiVersion: operator.cluster.x-k8s.io/v1alpha2
-kind: ControlPlaneProvider
-metadata:
-  name: {{ $controlPlaneName }}
-  namespace: {{ $controlPlaneNamespace }}
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "2"
-{{- if or $controlPlaneVersion $.Values.configSecret.name $.Values.manager }}
-spec:
-{{- end}}
-{{- if $controlPlaneVersion }}
-  version: {{ $controlPlaneVersion }}
-{{- end }}
-{{- if $.Values.manager }}
-{{- if hasKey $.Values.manager.featureGates $controlPlaneName }}
-  manager:
-{{- range $key, $value := $.Values.manager.featureGates }}
-  {{- if eq $key $controlPlaneName }}
-    featureGates:
-    {{- range $k, $v := $value }}
-      {{ $k }}: {{ $v }}
-    {{- end }}
-  {{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- if $.Values.configSecret.name }}
-  configSecret:
-    name: {{ $.Values.configSecret.name }}
-    {{- if $.Values.configSecret.namespace }}
-    namespace: {{ $.Values.configSecret.namespace }}
-    {{- end }}
-{{- end }}
-{{- end }}
-{{- end }}

rancher-turtles-chart/charts/cluster-api-operator/templates/core-conditions.yaml

@@ -1,36 +0,0 @@
-{{- if or .Values.addon .Values.bootstrap .Values.controlPlane .Values.infrastructure .Values.ipam }}
-# Deploy core components if not specified
-{{- if not .Values.core }}
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "1"
-  name: capi-system
----
-apiVersion: operator.cluster.x-k8s.io/v1alpha2
-kind: CoreProvider
-metadata:
-  name: cluster-api
-  namespace: capi-system
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "2"
-{{- with .Values.configSecret }}
-spec:
-  configSecret:
-    name: {{ .name }}
-    {{- if .namespace }}
-    namespace: {{ .namespace }}
-    {{- end }}
-{{- end }}
-{{- end }}
-{{- end }}

rancher-turtles-chart/charts/cluster-api-operator/templates/core.yaml

@@ -1,68 +0,0 @@
-# Core provider
-{{- if .Values.core }}
-{{- $coreArgs := split ":" .Values.core }}
-{{- $coreArgsLen :=  len $coreArgs }}
-{{- $coreVersion := "" }}
-{{- $coreNamespace := "" }}
-{{- $coreName := "" }}
-{{- $coreVersion := "" }}
-{{-  if eq $coreArgsLen 3 }}
-  {{- $coreNamespace = $coreArgs._0 }}
-  {{- $coreName = $coreArgs._1 }}
-  {{- $coreVersion = $coreArgs._2 }}
-{{-  else if eq $coreArgsLen 2 }}
-  {{- $coreNamespace = "capi-system" }}
-  {{- $coreName = $coreArgs._0 }}
-  {{- $coreVersion = $coreArgs._1 }}
-{{-  else if eq $coreArgsLen 1 }}
-  {{- $coreNamespace = "capi-system" }}
-  {{- $coreName = $coreArgs._0 }}
-{{- else }}
-  {{- fail "core provider argument should have the following format cluster-api:v1.0.0 or mynamespace:cluster-api:v1.0.0" }}
-{{-  end }}
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "1"
-  name: {{ $coreNamespace }}
----
-apiVersion: operator.cluster.x-k8s.io/v1alpha2
-kind: CoreProvider
-metadata:
-  name: {{ $coreName }}
-  namespace: {{ $coreNamespace }}
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "2"
-{{- if or $coreVersion $.Values.configSecret.name $.Values.manager }}
-spec:
-{{- end}}
-{{- if $coreVersion }}
-  version: {{ $coreVersion }}
-{{- end }}
-{{- if $.Values.manager }}
-{{- if and $.Values.manager.featureGates $.Values.manager.featureGates.core }}
-  manager:
-    featureGates:
-    {{- range $key, $value := $.Values.manager.featureGates.core }}
-      {{ $key }}: {{ $value }}
-    {{- end }}
-{{- end }}
-{{- end }}
-{{- if $.Values.configSecret.name }}
-  configSecret:
-    name: {{ $.Values.configSecret.name }}
-    {{- if $.Values.configSecret.namespace }}
-    namespace: {{ $.Values.configSecret.namespace }}
-    {{- end }}
-{{- end }}
-{{- end }}

rancher-turtles-chart/charts/cluster-api-operator/templates/deployment.yaml

@@ -1,177 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ template "capi-operator.fullname" . }}
-  namespace: '{{ .Release.Namespace }}'
-  labels:
-    app: {{ template "capi-operator.name" . }}
-    app.kubernetes.io/name: {{ template "capi-operator.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/component: "controller"
-    control-plane: controller-manager
-    clusterctl.cluster.x-k8s.io/core: capi-operator
-    {{- with .Values.deploymentLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.deploymentAnnotations }}
-  annotations:
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ template "capi-operator.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/component: "controller"
-      control-plane: controller-manager
-      clusterctl.cluster.x-k8s.io/core: capi-operator
-  {{- with .Values.strategy }}
-  strategy:
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
-  template:
-    metadata:
-      labels:
-        app: {{ template "capi-operator.name" . }}
-        app.kubernetes.io/name: {{ template "capi-operator.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-        app.kubernetes.io/component: "controller"
-        control-plane: controller-manager
-        clusterctl.cluster.x-k8s.io/core: capi-operator
-        {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      {{- with .Values.podAnnotations }}
-      annotations:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
-    spec:
-      serviceAccountName: capi-operator-manager
-      automountServiceAccountToken: true
-      {{- with .Values.securityContext }}
-      securityContext:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
-      containers:
-      - args:
-        {{- if .Values.logLevel }}
-        - --v={{ .Values.logLevel }}
-        {{- end }}
-        {{- if .Values.healthAddr }}
-        - --health-addr={{ .Values.healthAddr }}
-        {{- end }}
-        {{- if .Values.diagnosticsAddress }}
-        - --diagnostics-address={{ .Values.diagnosticsAddress }}
-        {{- end }}
-        {{- if .Values.insecureDiagnostics }}
-        - --insecure-diagnostics={{ .Values.insecureDiagnostics }}
-        {{- end }}
-        {{- if .Values.watchConfigSecret }}
-        - --watch-configsecret
-        {{- end }}
-        {{- with .Values.leaderElection }}
-        - --leader-elect={{ .enabled }}
-        {{- if .leaseDuration }}
-        - --leader-elect-lease-duration={{ .leaseDuration }}
-        {{- end }}
-        {{- if .renewDeadline }}
-        - --leader-elect-renew-deadline={{ .renewDeadline }}
-        {{- end }}
-        {{- if .retryPeriod }}
-        - --leader-elect-retry-period={{ .retryPeriod }}
-        {{- end }}
-        {{- end }}
-        command:
-        - /manager
-        {{- with .Values.image.manager }}
-        image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}"
-        {{- end }}
-        imagePullPolicy: {{ .Values.image.manager.pullPolicy }}
-        name: manager
-        ports:
-        - containerPort: 9443
-          name: webhook-server
-          protocol: TCP
-          {{- if $.Values.diagnosticsAddress }}
-          {{- $diagnosticsPort := $.Values.diagnosticsAddress }}
-          {{- if contains ":" $diagnosticsPort -}}
-          {{ $diagnosticsPort = ( split ":" $.Values.diagnosticsAddress)._1 | int }}
-          {{- end }}
-        - containerPort: {{ $diagnosticsPort | int }}
-          name: metrics
-          protocol: TCP
-          {{- end }}
-        {{- with .Values.resources.manager }}
-        resources:
-        {{- toYaml . | nindent 12 }}
-        {{- end }}
-        {{- with .Values.env.manager }}
-        env:
-        {{- toYaml . | nindent 12 }}
-        {{- end }}
-        {{- with .Values.containerSecurityContext.manager }}
-        securityContext:
-        {{- toYaml . | nindent 12 }}
-        {{- end }}
-        {{- with .Values.volumeMounts.manager }}
-        volumeMounts:
-        {{- toYaml . | nindent 12 }}
-        {{- end }}
-        terminationMessagePolicy: FallbackToLogsOnError
-        {{- $healthAddr := $.Values.healthAddr }}
-        {{- if contains ":" $healthAddr -}}
-        {{ $healthAddr = ( split ":" $.Values.healthAddr)._1 | int }}
-        {{- end }}
-        livenessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /healthz
-            port: {{ $healthAddr | default 9440 }}
-            scheme: HTTP
-          initialDelaySeconds: 15
-          periodSeconds: 20
-          successThreshold: 1
-          timeoutSeconds: 1
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /readyz
-            port: {{ $healthAddr | default 9440 }}
-            scheme: HTTP
-          initialDelaySeconds: 5
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-      terminationGracePeriodSeconds: 10
-      {{- with .Values.volumes }}
-      volumes:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with  .Values.topologySpreadConstraints }}
-      topologySpreadConstraints:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.podDnsPolicy }}
-      dnsPolicy: {{ . }}
-      {{- end }}
-      {{- with .Values.podDnsConfig }}
-      dnsConfig:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}

rancher-turtles-chart/charts/cluster-api-operator/templates/infra-conditions.yaml

@@ -1,81 +0,0 @@
-{{- if .Values.infrastructure }}
-
-# Deploy bootstrap, and infrastructure components if not specified
-{{- if not .Values.bootstrap }}
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "1"
-  name: capi-kubeadm-bootstrap-system
----
-apiVersion: operator.cluster.x-k8s.io/v1alpha2
-kind: BootstrapProvider
-metadata:
-  name: kubeadm
-  namespace: capi-kubeadm-bootstrap-system
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "2"
-{{- with .Values.configSecret }}
-spec:
-  configSecret:
-    name: {{ .name }}
-    {{- if .namespace }}
-    namespace: {{ .namespace }}
-    {{- end }}
-{{- end }}
-{{- end }}
-
-{{- if not .Values.controlPlane }}
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "1"
-  name: capi-kubeadm-control-plane-system
----
-apiVersion: operator.cluster.x-k8s.io/v1alpha2
-kind: ControlPlaneProvider
-metadata:
-  name: kubeadm
-  namespace: capi-kubeadm-control-plane-system
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "2"
-{{- with .Values.configSecret }}
-spec:
-{{- if $.Values.manager }}
-{{- if and $.Values.manager.featureGates $.Values.manager.featureGates.kubeadm }}
-  manager:
-    featureGates:
-    {{- range $key, $value := $.Values.manager.featureGates.kubeadm }}
-      {{ $key }}: {{ $value }}
-    {{- end }}
-{{- end }}
-{{- end }}
-  configSecret:
-    name: {{ .name }}
-    {{- if .namespace }}
-    namespace: {{ .namespace }}
-    {{- end }}
-{{- end }}
-{{- end }}
-
-{{- end }}

rancher-turtles-chart/charts/cluster-api-operator/templates/infra.yaml

@@ -1,87 +0,0 @@
-# Infrastructure providers
-{{- if .Values.infrastructure }}
-{{- $infrastructures := split ";" .Values.infrastructure }}
-{{- $infrastructureNamespace := "" }}
-{{- $infrastructureName := "" }}
-{{- $infrastructureVersion := "" }}
-{{- range $infrastructure := $infrastructures }}
-{{- $infrastructureArgs := split ":" $infrastructure }}
-{{- $infrastructureArgsLen := len $infrastructureArgs }}
-{{-  if eq $infrastructureArgsLen 3 }}
-  {{- $infrastructureNamespace = $infrastructureArgs._0 }}
-  {{- $infrastructureName = $infrastructureArgs._1 }}
-  {{- $infrastructureVersion = $infrastructureArgs._2 }}
-{{-  else if eq $infrastructureArgsLen 2 }}
-  {{- $infrastructureNamespace = print $infrastructureArgs._0 "-infrastructure-system" }}
-  {{- $infrastructureName = $infrastructureArgs._0 }}
-  {{- $infrastructureVersion = $infrastructureArgs._1 }}
-{{-  else if eq $infrastructureArgsLen 1 }}
-  {{- $infrastructureNamespace = print $infrastructureArgs._0 "-infrastructure-system" }}
-  {{- $infrastructureName = $infrastructureArgs._0 }}
-{{- else }}
-  {{- fail "infrastructure provider argument should have the following format aws:v1.0.0 or mynamespace:aws:v1.0.0" }}
-{{- end }}
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "1"
-  name: {{ $infrastructureNamespace }}
----
-apiVersion: operator.cluster.x-k8s.io/v1alpha2
-kind: InfrastructureProvider
-metadata:
-  name: {{ $infrastructureName }}
-  namespace: {{ $infrastructureNamespace }}
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "2"
-{{- if or $infrastructureVersion $.Values.configSecret.name $.Values.manager $.Values.additionalDeployments }}
-spec:
-{{- end }}
-{{- if $infrastructureVersion }}
-  version: {{ $infrastructureVersion }}
-{{- end }}
-{{- if $.Values.manager }}
-{{- if and (kindIs "map" $.Values.manager.featureGates) (hasKey $.Values.manager.featureGates $infrastructureName) }}
-  manager:
-{{- range $key, $value := $.Values.manager.featureGates }}
-  {{- if eq $key $infrastructureName }}
-    featureGates:
-    {{- range $k, $v := $value }}
-      {{ $k }}: {{ $v }}
-    {{- end }}
-  {{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- if and (kindIs "map" $.Values.fetchConfig) (hasKey $.Values.fetchConfig $infrastructureName) }}
-{{- range $key, $value := $.Values.fetchConfig }}
-  {{- if eq $key $infrastructureName }}
-  fetchConfig:
-    {{- range $k, $v := $value }}
-      {{ $k }}: {{ $v }}
-    {{- end }}
-  {{- end }}
-{{- end }}
-{{- end }}
-{{- if $.Values.configSecret.name }}
-  configSecret:
-    name: {{ $.Values.configSecret.name }}
-    {{- if $.Values.configSecret.namespace }}
-    namespace: {{ $.Values.configSecret.namespace }}
-    {{- end }}
-{{- end }}
-{{- if $.Values.additionalDeployments }}
-  additionalDeployments: {{ toYaml $.Values.additionalDeployments | nindent 4 }}
-{{- end }}
-{{- end }}
-{{- end }}

rancher-turtles-chart/charts/cluster-api-operator/templates/ipam.yaml

@@ -1,77 +0,0 @@
-# IPAM providers
-{{- if .Values.ipam }}
-{{- $ipams := split ";" .Values.ipam }}
-{{- $ipamNamespace := "" }}
-{{- $ipamName := "" }}
-{{- $ipamVersion := "" }}
-{{- range $ipam := $ipams }}
-{{- $ipamArgs := split ":" $ipam }}
-{{- $ipamArgsLen := len $ipamArgs }}
-{{-  if eq $ipamArgsLen 3 }}
-  {{- $ipamNamespace = $ipamArgs._0 }}
-  {{- $ipamName = $ipamArgs._1 }}
-  {{- $ipamVersion = $ipamArgs._2 }}
-{{-  else if eq $ipamArgsLen 2 }}
-  {{- $ipamNamespace = print $ipamArgs._0 "-ipam-system" }}
-  {{- $ipamName = $ipamArgs._0 }}
-  {{- $ipamVersion = $ipamArgs._1 }}
-{{-  else if eq $ipamArgsLen 1 }}
-  {{- $ipamNamespace = print $ipamArgs._0 "-ipam-system" }}
-  {{- $ipamName = $ipamArgs._0 }}
-{{- else }}
-  {{- fail "ipam provider argument should have the following format in-cluster:v1.0.0 or mynamespace:in-cluster:v1.0.0" }}
-{{- end }}
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "1"
-  name: {{ $ipamNamespace }}
----
-apiVersion: operator.cluster.x-k8s.io/v1alpha2
-kind: IPAMProvider
-metadata:
-  name: {{ $ipamName }}
-  namespace: {{ $ipamNamespace }}
-  annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
-    "argocd.argoproj.io/sync-wave": "2"
-{{- if or $ipamVersion $.Values.configSecret.name $.Values.manager $.Values.additionalDeployments }}
-spec:
-{{- end }}
-{{- if $ipamVersion }}
-  version: {{ $ipamVersion }}
-{{- end }}
-{{- if $.Values.manager }}
-{{- if and (kindIs "map" $.Values.manager.featureGates) (hasKey $.Values.manager.featureGates $ipamName) }}
-  manager:
-{{- range $key, $value := $.Values.manager.featureGates }}
-  {{- if eq $key $ipamName }}
-    featureGates:
-    {{- range $k, $v := $value }}
-      {{ $k }}: {{ $v }}
-    {{- end }}
-  {{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- if $.Values.configSecret.name }}
-  configSecret:
-    name: {{ $.Values.configSecret.name }}
-    {{- if $.Values.configSecret.namespace }}
-    namespace: {{ $.Values.configSecret.namespace }}
-    {{- end }}
-{{- end }}
-{{- if $.Values.additionalDeployments }}
-  additionalDeployments: {{ toYaml $.Values.additionalDeployments | nindent 4 }}
-{{- end }}
-{{- end }}
-{{- end }}

rancher-turtles-chart/charts/cluster-api-operator/values.yaml

@@ -1,72 +0,0 @@
----
-# ---
-# Cluster API provider options
-core: ""
-bootstrap: ""
-controlPlane: ""
-infrastructure: ""
-ipam: ""
-addon: ""
-manager.featureGates: {}
-fetchConfig: {}
-# ---
-# Common configuration secret options
-configSecret: {}
-# ---
-# CAPI operator deployment options
-logLevel: 2
-replicaCount: 1
-leaderElection:
-  enabled: true
-image:
-  manager:
-    repository: registry.k8s.io/capi-operator/cluster-api-operator
-    tag: v0.18.1
-    pullPolicy: IfNotPresent
-env:
-  manager: []
-diagnosticsAddress: ":8443"
-healthAddr: ":9440"
-insecureDiagnostics: false
-watchConfigSecret: false
-imagePullSecrets: {}
-resources:
-  manager:
-    limits:
-      cpu: 100m
-      memory: 150Mi
-    requests:
-      cpu: 100m
-      memory: 100Mi
-containerSecurityContext: {}
-affinity:
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-        - matchExpressions:
-            - key: kubernetes.io/arch
-              operator: In
-              values:
-                - amd64
-                - arm64
-                - ppc64le
-            - key: kubernetes.io/os
-              operator: In
-              values:
-                - linux
-tolerations:
-  - effect: NoSchedule
-    key: node-role.kubernetes.io/master
-  - effect: NoSchedule
-    key: node-role.kubernetes.io/control-plane
-volumes:
-  - name: cert
-    secret:
-      defaultMode: 420
-      secretName: capi-operator-webhook-service-cert
-volumeMounts:
-  manager:
-    - mountPath: /tmp/k8s-webhook-server/serving-certs
-      name: cert
-      readOnly: true
-enableHelmHook: true

rancher-turtles-chart/questions.yml

@@ -8,11 +8,6 @@ questions:
     show_subquestion_if: true
     group: "Rancher Turtles Extra Settings"
     subquestions:
-      - variable: cluster-api-operator.cert-manager.enabled
-        default: false
-        type: boolean
-        description: "Flag to enable or disable installation of cert-manager. If set to false then you will need to install cert-manager manually."
-        label: "Enable Cert Manager"
       - variable: turtlesUI.enabled
         default: false
         type: boolean
@@ -35,6 +30,12 @@ questions:
         type: boolean
         label: Enable Agent TLS Mode
         group: "Rancher Turtles Features Settings"
+      - variable: rancherTurtles.features.no-cert-manager.enabled
+        default: false
+        description: "[ALPHA] If enabled Turtles will remove cert-manager."
+        type: boolean
+        label: Remove cert-manager
+        group: "Rancher Turtles Features Settings"
       - variable: rancherTurtles.kubectlImage
         default: "registry.suse.com/edge/3.3/kubectl:1.32.4"
         description: "Specify the image to use when running kubectl in jobs."

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

@@ -7,10 +7,20 @@ metadata:
     "helm.sh/hook": "post-install, post-upgrade"
     "helm.sh/hook-weight": "2"
 spec:
+  enableAutomaticUpdate: true
   type: addon
   additionalManifests:
     name: fleet-addon-config
     namespace: '{{ .Values.rancherTurtles.namespace }}'
+{{- if or (index .Values "cluster-api-operator" "cluster-api" "fleet" "addon" "fetchConfig" "url") (index .Values "cluster-api-operator" "cluster-api" "fleet" "addon" "fetchConfig" "selector") }}
+  fetchConfig:
+    {{- if index .Values "cluster-api-operator" "cluster-api" "fleet" "addon" "fetchConfig" "url" }}
+    url: {{ index .Values "cluster-api-operator" "cluster-api" "fleet" "addon" "fetchConfig" "url" }}
+    {{- end }}
+    {{- if index .Values "cluster-api-operator" "cluster-api" "fleet" "addon" "fetchConfig" "selector" }}
+    selector: {{ index .Values "cluster-api-operator" "cluster-api" "fleet" "addon" "fetchConfig" "selector" }}
+    {{- end }}
+{{- end }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -58,3 +68,16 @@ data:
           matchExpressions:
             - key: cluster-api.cattle.io/disable-fleet-auto-import
               operator: DoesNotExist
+    ---
+    apiVersion: rbac.authorization.k8s.io/v1
+    kind: ClusterRoleBinding
+    metadata:
+      name: cappf-controller-psa
+    roleRef:
+      apiGroup: rbac.authorization.k8s.io
+      kind: ClusterRole
+      name: fleet-controller-psa
+    subjects:
+    - kind: ServiceAccount
+      name: caapf-controller-manager
+      namespace: {{ .Values.rancherTurtles.namespace }}

rancher-turtles-chart/templates/clusterctl-config.yaml

@@ -1,34 +1,5 @@
-{{- if index .Values "cluster-api-operator" "enabled" }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: clusterctl-config
   namespace: '{{ .Values.rancherTurtles.namespace }}'
-data:
-  clusterctl.yaml: |
-    providers:
-    # Cluster API core provider
-    - name:         "cluster-api"
-      url:          "https://github.com/kubernetes-sigs/cluster-api/releases/v1.7.5/core-components.yaml"
-      type:         "CoreProvider"
-
-    # Infrastructure providers
-    - name:         "metal3"
-      url:          "https://github.com/metal3-io/cluster-api-provider-metal3/releases/v1.7.1/infrastructure-components.yaml"
-      type:         "InfrastructureProvider"
-
-    # Bootstrap providers
-    - name:         "rke2"
-      url:          "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.7.0/bootstrap-components.yaml"
-      type:         "BootstrapProvider"
-
-    # ControlPlane providers
-    - name:         "rke2"
-      url:          "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.7.0/control-plane-components.yaml"
-      type:         "ControlPlaneProvider"
-
-    # Addon providers
-#    - name:         "fleet"
-#      url:          "https://github.com/rancher-sandbox/cluster-api-addon-provider-fleet/releases/v0.3.1/addon-components.yaml"
-#      type:         "AddonProvider"
-{{- end }}

rancher-turtles-chart/templates/core-provider.yaml

@@ -22,7 +22,10 @@ metadata:
 spec:
   name: cluster-api
   type: core
-  version: {{ index .Values "cluster-api-operator" "cluster-api" "version" }}
+  enableAutomaticUpdate: {{ index .Values "cluster-api-operator" "cluster-api" "core" "enableAutomaticUpdate" }}
+{{- if index .Values "cluster-api-operator" "cluster-api" "core" "version" }}
+  version: {{ index .Values "cluster-api-operator" "cluster-api" "core" "version" }}
+{{- end }}
   additionalManifests:
     name: capi-additional-rbac-roles
     namespace: {{ index .Values "cluster-api-operator" "cluster-api" "core" "namespace" }}

rancher-turtles-chart/templates/deployment.yaml

@@ -26,7 +26,7 @@ spec:
       containers:
       - args:
         - --leader-elect
-        - --feature-gates=agent-tls-mode={{ index .Values "rancherTurtles" "features" "agent-tls-mode" "enabled"}},ui-plugin={{ index .Values "turtlesUI" "enabled"}}
+        - --feature-gates=agent-tls-mode={{ index .Values "rancherTurtles" "features" "agent-tls-mode" "enabled"}},ui-plugin={{ index .Values "turtlesUI" "enabled"}},no-cert-manager={{ index .Values "rancherTurtles" "features" "no-cert-manager" "enabled"}}
         {{- range .Values.rancherTurtles.managerArguments }}
         - {{ . }}
         {{- end }}  
@@ -67,12 +67,20 @@ spec:
         resources:
           limits:
             cpu: 500m
-            memory: 256Mi
+            memory: 300Mi
           requests:
             cpu: 10m
             memory: 128Mi
+        {{- with .Values.rancherTurtles.volumeMounts.manager }}
+        volumeMounts:
+        {{- toYaml . | nindent 12 }}
+        {{- end }}
       serviceAccountName: rancher-turtles-manager
       terminationGracePeriodSeconds: 10
+      {{- with .Values.rancherTurtles.volumes }}
+      volumes:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       tolerations:
       - effect: NoSchedule
         key: node-role.kubernetes.io/master

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

@@ -1,5 +1,6 @@
 {{- if and (index .Values "cluster-api-operator" "cluster-api" "enabled") (index .Values "cluster-api-operator" "cluster-api" "metal3" "enabled") }}
 {{- $namespace := index .Values "cluster-api-operator" "cluster-api" "metal3" "infrastructure" "namespace" }}
+{{- $ipamnamespace := index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "namespace" }}
 {{- if not (lookup "v1" "Namespace" "" $namespace) }}
 ---
 apiVersion: v1
@@ -10,6 +11,16 @@ metadata:
     "helm.sh/hook-weight": "1"
   name: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "infrastructure" "namespace" }}
 {{- end }}
+{{- if not (lookup "v1" "Namespace" "" $ipamnamespace) }}
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  annotations:
+    "helm.sh/hook": "post-install, post-upgrade"
+    "helm.sh/hook-weight": "1"
+  name: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "namespace" }}
+{{- end }}
 ---
 apiVersion: turtles-capi.cattle.io/v1alpha1
 kind: ClusterctlConfig
@@ -22,8 +33,11 @@ metadata:
 spec:
   providers:
   - name: metal3
-    url: "https://github.com/rancher-sandbox/cluster-api-provider-metal3/releases/v1.9.2/infrastructure-components.yaml"
+    url: "https://github.com/rancher-sandbox/cluster-api-provider-metal3/releases/v1.10.2/infrastructure-components.yaml"
     type: InfrastructureProvider
+  - name: metal3ipam
+    url: "https://github.com/rancher-sandbox/ip-address-manager/releases/v1.10.2/ipam-components.yaml"
+    type: IPAMProvider
 ---
 apiVersion: turtles-capi.cattle.io/v1alpha1
 kind: CAPIProvider
@@ -59,11 +73,41 @@ spec:
     containers:
       - name: manager
         imageUrl: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "infrastructure" "imageUrl" }}
-  additionalDeployments:
+{{- end }}
-    ipam-controller-manager:
+---
+apiVersion: turtles-capi.cattle.io/v1alpha1
+kind: CAPIProvider
+metadata:
+  name: metal3ipam
+  namespace: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "namespace" }}
+  annotations:
+    "helm.sh/hook": "post-install, post-upgrade"
+    "helm.sh/hook-weight": "2"
+spec:
+  name: metal3ipam
+  type: ipam
+{{- if index .Values  "cluster-api-operator" "cluster-api" "metal3" "ipam" "version" }}
+  version: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "version" }}
+{{- end }}
+  configSecret:
+{{- if index .Values "cluster-api-operator" "cluster-api" "configSecret" "name" }}
+    name: {{ index .Values "cluster-api-operator" "cluster-api" "configSecret" "name" }}
+{{ else }}
+    name: {{ index .Values "cluster-api-operator" "cluster-api" "configSecret" "defaultName" }}
+{{- end }}
+{{- if or (index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "fetchConfig" "url") (index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "fetchConfig" "selector") }}
+  fetchConfig:
+    {{- if index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "fetchConfig" "url" }}
+    url: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "fetchConfig" "url" }}
+    {{- end }}
+    {{- if index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "fetchConfig" "selector" }}
+    selector: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "fetchConfig" "selector" }}
+    {{- end }}
+{{- end }}
+{{- if index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "imageUrl" }}
   deployment:
     containers:
-        - imageUrl:  {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "imageUrl" }}
+      - name: manager
-          name: manager
+        imageUrl: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "ipam" "imageUrl" }}
 {{- end }}
 {{- end }}

rancher-turtles-chart/templates/operator-crds.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    rancher-turtles/aggregate-to-manager: "true"
+  name: rancher-turtles-operator-admin
+rules:
+- apiGroups:
+  - '*'
+  resources:
+  - '*'
+  verbs:
+  - '*'

rancher-turtles-chart/templates/post-upgrade-job.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -11,23 +10,38 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: post-upgrade-job-delete-clusters
+  name: post-upgrade-job-delete-capi-operator-resources
   annotations:
     "helm.sh/hook": post-upgrade
     "helm.sh/hook-weight": "1"
 rules:
 - apiGroups:
-  - provisioning.cattle.io
+  - operator.cluster.x-k8s.io
   resources:
-  - clusters
+  - addonproviders
+  - bootstrapproviders
+  - controlplaneproviders
+  - coreproviders
+  - infrastructureproviders
+  - ipamproviders
+  - runtimeextensionproviders
   verbs:
+  - get
+  - watch
   - list
   - delete
+  - patch
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - get
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: post-upgrade-job-delete-clusters
+  name: post-upgrade-job-capi-operator-resources-cleanup
   annotations:
     "helm.sh/hook": post-upgrade
     "helm.sh/hook-weight": "1"
@@ -37,13 +51,51 @@ subjects:
     namespace: '{{ .Values.rancherTurtles.namespace }}'
 roleRef:
   kind: ClusterRole
-  name: post-upgrade-job-delete-clusters
+  name: post-upgrade-job-delete-capi-operator-resources
   apiGroup: rbac.authorization.k8s.io
 ---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cluster-api-operator-resources-cleanup-script
+  namespace: '{{ .Values.rancherTurtles.namespace }}'
+  annotations:
+    "helm.sh/hook": post-upgrade
+    "helm.sh/hook-weight": "1"
+data:
+  cleanup.sh: |
+    #!/usr/bin/env bash
+
+    set -euo pipefail
+
+    remove_finalizers_and_delete() {
+      local resource_type="$1"
+      if kubectl get crd $resource_type > /dev/null 2>&1; then
+        kubectl get $resource_type --all-namespaces --no-headers --ignore-not-found | awk '{print $1 " " $2}' | xargs -r -n2 bash -c 'kubectl patch '"${resource_type}"' "$1" -n "$0" --type merge -p "{\"metadata\":{\"finalizers\":null}}"'
+        kubectl delete $resource_type --all --all-namespaces
+      else
+        echo "Resource type $resource_type does not exist, skipping cleanup."
+      fi
+    }
+
+    resource_types=(
+      "addonproviders.operator.cluster.x-k8s.io"
+      "bootstrapproviders.operator.cluster.x-k8s.io"
+      "controlplaneproviders.operator.cluster.x-k8s.io"
+      "coreproviders.operator.cluster.x-k8s.io"
+      "infrastructureproviders.operator.cluster.x-k8s.io"
+      "ipamproviders.operator.cluster.x-k8s.io"
+      "runtimeextensionproviders.operator.cluster.x-k8s.io"
+    )
+
+    for resource_type in "${resource_types[@]}"; do
+      remove_finalizers_and_delete "$resource_type"
+    done
+---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: post-upgrade-delete-clusters
+  name: cluster-api-operator-resources-cleanup
   namespace: '{{ .Values.rancherTurtles.namespace }}'
   annotations:
     "helm.sh/hook": post-upgrade
@@ -54,13 +106,19 @@ spec:
     spec:
       serviceAccountName: post-upgrade-job
       containers:
-        - name: post-upgrade-delete-clusters
+        - name: cluster-api-operator-resources-cleanup
-          image: {{ index .Values "rancherTurtles" "kubectlImage" }}
+          image: {{ index .Values "rancherTurtles" "shellImage" }}
+          command: ["/bin/bash"]
           args:
-          - delete
+          - "-c"
-          - clusters.provisioning.cattle.io
+          - "/scripts/cleanup.sh"
-          - --selector=cluster-api.cattle.io/owned
+          volumeMounts:
-          - -A
+            - name: script
-          - --ignore-not-found=true
+              mountPath: /scripts
-          - --wait
+      volumes:
-      restartPolicy: OnFailure
+        - name: script
+          configMap:
+            name: cluster-api-operator-resources-cleanup-script
+            defaultMode: 0777
+      restartPolicy: Never
+---

rancher-turtles-chart/templates/rancher-turtles-components.yaml

@@ -1301,6 +1301,13 @@ spec:
                       description: Manager defines the properties that can be enabled
                         on the controller manager for the additional provider deployment.
                       properties:
+                        additionalArgs:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            AdditionalArgs is a map of additional options that will be passed
+                            in as container args to the provider's controller manager.
+                          type: object
                         cacheNamespace:
                           description: |-
                             CacheNamespace if specified restricts the manager's cache to watch objects in
@@ -1436,7 +1443,7 @@ spec:
                           minimum: 1
                           type: integer
                         metrics:
-                          description: Metrics contains thw controller metrics configuration
+                          description: Metrics contains the controller metrics configuration
                           properties:
                             bindAddress:
                               description: |-
@@ -2775,6 +2782,10 @@ spec:
                       type: object
                     type: array
                 type: object
+              enableAutomaticUpdate:
+                description: EnableAutomaticUpdate can be used to automatically update
+                  the CAPIProvider to a newest version.
+                type: boolean
               features:
                 description: Features is a collection of features to enable.
                 example:
@@ -2875,6 +2886,13 @@ spec:
                 description: Manager defines the properties that can be enabled on
                   the controller manager for the provider.
                 properties:
+                  additionalArgs:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      AdditionalArgs is a map of additional options that will be passed
+                      in as container args to the provider's controller manager.
+                    type: object
                   cacheNamespace:
                     description: |-
                       CacheNamespace if specified restricts the manager's cache to watch objects in
@@ -3009,7 +3027,7 @@ spec:
                     minimum: 1
                     type: integer
                   metrics:
-                    description: Metrics contains thw controller metrics configuration
+                    description: Metrics contains the controller metrics configuration
                     properties:
                       bindAddress:
                         description: |-
@@ -3118,27 +3136,32 @@ spec:
                   properties:
                     lastTransitionTime:
                       description: |-
-                        Last time the condition transitioned from one status to another.
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
                         This should be when the underlying condition changed. If that is not known, then using the time when
                         the API field changed is acceptable.
                       format: date-time
                       type: string
                     message:
                       description: |-
-                        A human readable message indicating details about the transition.
+                        message is a human readable message indicating details about the transition.
                         This field may be empty.
+                      maxLength: 10240
+                      minLength: 1
                       type: string
                     reason:
                       description: |-
-                        The reason for the condition's last transition in CamelCase.
+                        reason is the reason for the condition's last transition in CamelCase.
                         The specific API may choose whether or not this field is considered a guaranteed API.
                         This field may be empty.
+                      maxLength: 256
+                      minLength: 1
                       type: string
                     severity:
                       description: |-
                         severity provides an explicit classification of Reason code, so the users or machines can immediately
                         understand the current situation and act accordingly.
                         The Severity field MUST be set only when Status=False.
+                      maxLength: 32
                       type: string
                     status:
                       description: status of the condition, one of True, False, Unknown.
@@ -3148,6 +3171,8 @@ spec:
                         type of condition in CamelCase or in foo.example.com/CamelCase.
                         Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
                         can be useful (see .node.status.conditions), the ability to deconflict is important.
+                      maxLength: 256
+                      minLength: 1
                       type: string
                   required:
                   - lastTransitionTime
@@ -3417,7 +3442,6 @@ rules:
   - update
 - apiGroups:
   - infrastructure.cluster.x-k8s.io
-  - operator.cluster.x-k8s.io
   resources:
   - '*'
   verbs:

rancher-turtles-chart/templates/rancher-turtles-exp-day2-components.yaml

@@ -181,27 +181,32 @@ spec:
                   properties:
                     lastTransitionTime:
                       description: |-
-                        Last time the condition transitioned from one status to another.
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
                         This should be when the underlying condition changed. If that is not known, then using the time when
                         the API field changed is acceptable.
                       format: date-time
                       type: string
                     message:
                       description: |-
-                        A human readable message indicating details about the transition.
+                        message is a human readable message indicating details about the transition.
                         This field may be empty.
+                      maxLength: 10240
+                      minLength: 1
                       type: string
                     reason:
                       description: |-
-                        The reason for the condition's last transition in CamelCase.
+                        reason is the reason for the condition's last transition in CamelCase.
                         The specific API may choose whether or not this field is considered a guaranteed API.
                         This field may be empty.
+                      maxLength: 256
+                      minLength: 1
                       type: string
                     severity:
                       description: |-
                         severity provides an explicit classification of Reason code, so the users or machines can immediately
                         understand the current situation and act accordingly.
                         The Severity field MUST be set only when Status=False.
+                      maxLength: 32
                       type: string
                     status:
                       description: status of the condition, one of True, False, Unknown.
@@ -211,6 +216,8 @@ spec:
                         type of condition in CamelCase or in foo.example.com/CamelCase.
                         Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
                         can be useful (see .node.status.conditions), the ability to deconflict is important.
+                      maxLength: 256
+                      minLength: 1
                       type: string
                   required:
                   - lastTransitionTime

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

@@ -22,6 +22,7 @@ metadata:
 spec:
   name: rke2
   type: bootstrap
+  enableAutomaticUpdate: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "enableAutomaticUpdate" }}
 {{- if index .Values  "cluster-api-operator" "cluster-api" "rke2" "version" }}
   version: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "version" }}
 {{- end }}

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

@@ -22,6 +22,7 @@ metadata:
 spec:
   name: rke2
   type: controlPlane
+  enableAutomaticUpdate: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "enableAutomaticUpdate" }}
 {{- if index .Values  "cluster-api-operator" "cluster-api" "rke2" "version" }}
   version: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "version" }}
 {{- end }}

rancher-turtles-chart/values.schema.json

@@ -62,7 +62,7 @@
         },
         "kubectlImage": {
           "type": "string",
-          "default": "registry.k8s.io/kubernetes/kubectl:v1.30.0",
+          "default": "registry.k8s.io/kubernetes/kubectl:v1.31.4",
           "description": "Image for kubectl tasks."
         },
         "features": {
@@ -155,59 +155,20 @@
               }
             }
           }
-        }
-      }
-    },
-    "cluster-api-operator": {
-      "type": "object",
-      "description": "Manages Cluster API components.",
-      "properties": {
-        "enabled": {
-          "type": "boolean",
-          "default": true,
-          "description": "Turn on or off."
-        },
-        "cert-manager": {
-          "type": "object",
-          "properties": {
-            "enabled": {
-              "type": "boolean",
-              "default": false,
-              "description": "Turn on or off."
-            }
-          }
         },
         "volumes": {
           "type": "array",
-          "description": "Volumes for operator pods (certs, config).",
+          "description": "Volumes for controller pods.",
           "items": {
             "type": "object",
-            "oneOf": [
+            "required": [
-              {
+              "name",
-                "required": ["name", "secret"],
+              "configMap"
+            ],
             "properties": {
-                  "name": { "type": "string" },
+              "name": {
-                  "secret": {
+                "type": "string"
-                    "type": "object",
-                    "properties": {
-                      "defaultMode": {
-                        "type": "integer",
-                        "default": 420,
-                        "description": "File permissions."
               },
-                      "secretName": {
-                        "type": "string",
-                        "default": "capi-operator-webhook-service-cert",
-                        "description": "Secret for webhook certs."
-                      }
-                    }
-                  }
-                }
-              },
-              {
-                "required": ["name", "configMap"],
-                "properties": {
-                  "name": { "type": "string" },
               "configMap": {
                 "type": "object",
                 "properties": {
@@ -220,23 +181,6 @@
               }
             }
           }
-            ]
-          }
-        },
-        "image": {
-          "type": "object",
-          "properties": {
-            "manager": {
-              "type": "object",
-              "properties": {
-                "repository": {
-                  "type": "string",
-                  "default": "registry.rancher.com/rancher/cluster-api-operator",
-                  "description": "Image repo."
-                }
-              }
-            }
-          }
         },
         "volumeMounts": {
           "type": "object",
@@ -258,43 +202,13 @@
               }
             }
           }
+        }
+      }
     },
-        "resources": {
+    "cluster-api-operator": {
       "type": "object",
+      "description": "Manages Cluster API components.",
       "properties": {
-            "manager": {
-              "type": "object",
-              "properties": {
-                "limits": {
-                  "type": "object",
-                  "properties": {
-                    "cpu": {
-                      "type": "string",
-                      "description": "CPU limit."
-                    },
-                    "memory": {
-                      "type": "string",
-                      "description": "Memory limit."
-                    }
-                  }
-                },
-                "requests": {
-                  "type": "object",
-                  "properties": {
-                    "cpu": {
-                      "type": "string",
-                      "description": "CPU request."
-                    },
-                    "memory": {
-                      "type": "string",
-                      "description": "Memory request."
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
         "cleanup": {
           "type": "boolean",
           "default": true,
@@ -343,6 +257,16 @@
                     "url": { "type": "string", "default": "" },
                     "selector": { "type": "string", "default": "" }
                   }
+                },
+                "enableAutomaticUpdates": {
+                  "type": "boolean",
+                  "default": true,
+                  "description": "Allow the provider to update automatically when a new Turtles version is installed."
+                },
+                "version": {
+                  "type": "string",
+                  "default": "",
+                  "description": "CAPI core provider version."
                 }
               }
             },
@@ -359,6 +283,11 @@
                   "default": "",
                   "description": "RKE2 version."
                 },
+                "enableAutomaticUpdates": {
+                  "type": "boolean",
+                  "default": true,
+                  "description": "Allow the provider to update automatically when a new Turtles version is installed."
+                },
                 "bootstrap": {
                   "type": "object",
                   "properties": {

rancher-turtles-chart/values.yaml

@@ -9,8 +9,8 @@ turtlesUI:
 rancherTurtles:
   # image: registry.rancher.com/rancher/rancher/turtles
   image: registry.rancher.com/rancher/rancher/turtles
-  # imageVersion: v0.21.0
+  # imageVersion: v0.24.0
-  imageVersion: v0.21.0
+  imageVersion: v0.24.0
   # imagePullPolicy: IfNotPresent
   imagePullPolicy: IfNotPresent
   # namespace: Select namespace for Turtles to run.
@@ -23,6 +23,8 @@ rancherTurtles:
   rancherInstalled: false
   # kubectlImage: Image for kubectl tasks.
   kubectlImage: "%%IMG_REPO%%/%%IMG_PREFIX%%kubectl:1.33.4"
+  # shellImage: Image for shell tasks.
+  shellImage: registry.rancher.com/rancher/kuberlr-kubectl:v5.0.0
   # features: Optional and experimental features.
   features:
     # day2operations: Alpha feature.
@@ -31,8 +33,8 @@ rancherTurtles:
       enabled: false
       # image: registry.rancher.com/rancher/rancher/turtles
       image: registry.rancher.com/rancher/rancher/turtles
-      # imageVersion: v0.21.0
+      # imageVersion: v0.24.0
-      imageVersion: v0.21.0
+      imageVersion: v0.24.0
       # imagePullPolicy: IfNotPresent
       imagePullPolicy: IfNotPresent
       # etcdBackupRestore: Alpha feature. Manages etcd backup/restore.
@@ -43,61 +45,33 @@ rancherTurtles:
     agent-tls-mode:
       # enabled: Turn on or off.
       enabled: true
+    # no-cert-manager: Alpha feature for cert-manager removal.
+    no-cert-manager:
+      # enabled: Turn on or off.
+      enabled: false
     # clusterclass-operations: Alpha feature. Manages cluster class ops. Not ready for testing yet.
     clusterclass-operations:
       # enabled: Turn on or off.
       enabled: false
       # image: registry.rancher.com/rancher/rancher/turtles
       image: registry.rancher.com/rancher/rancher/turtles
-      # imageVersion: v0.21.0
+      # imageVersion: v0.24.0
-      imageVersion: v0.21.0
+      imageVersion: v0.24.0
       # imagePullPolicy: IfNotPresent
       imagePullPolicy: IfNotPresent
+  # volumes: Volumes for controller pods.
+  volumes:
+    - name: clusterctl-config
+      configMap:
+        name: clusterctl-config
+  # volumeMounts: Volume mounts for controller pods.
+  volumeMounts:
+    manager:
+      - mountPath: /config
+        name: clusterctl-config
 
 # cluster-api-operator: Manages Cluster API components.
 cluster-api-operator:
-  # enabled: Turn on or off.
-  enabled: true
-  # cert-manager: Cert-manager integration.
-  cert-manager:
-    # enabled: Turn on or off.
-    enabled: false
-  # volumes: Volumes for operator pods (certs, config).
-  volumes:
-    - name: cert
-      secret:
-        # defaultMode: File permissions.
-        defaultMode: 420
-        # secretName: Secret for webhook certs.
-        secretName: capi-operator-webhook-service-cert
-    - name: clusterctl-config
-      configMap:
-        # name: ConfigMap for clusterctl.
-        name: clusterctl-config
-  resources:
-    manager:
-      limits:
-        cpu: 100m
-        memory: 300Mi
-      requests:
-        cpu: 100m
-        memory: 100Mi
-  # image: registry.rancher.com/rancher/rancher/turtles
-  image:
-    manager:
-      # repository: Image repo.
-      repository: registry.rancher.com/rancher/cluster-api-operator
-  # volumeMounts: Mount volumes to pods.
-  volumeMounts:
-    manager:
-      - mountPath: /tmp/k8s-webhook-server/serving-certs
-        name: cert
-        # readOnly: Mount as read-only.
-        readOnly: true
-      - mountPath: /config
-        name: clusterctl-config
-        # readOnly: Mount as read-only.
-        readOnly: true
   # cleanup: Enable cleanup tasks.
   cleanup: true
   # cluster-api: Cluster API component settings.
@@ -114,6 +88,10 @@ cluster-api-operator:
     core:
       # namespace: Core component namespace.
       namespace: capi-system
+      # version: Core ClusterAPI version.
+      version: ""
+      # enableAutomaticUpdate: Allow the provider to update automatically when a new Turtles version is installed.
+      enableAutomaticUpdate: true
       # imageUrl: Custom image URL.
       imageUrl: ""
       # fetchConfig: Config fetching settings.
@@ -127,7 +105,9 @@ cluster-api-operator:
       # enabled: Turn on or off.
       enabled: true
       # version: RKE2 version.
-      version: "v0.18.0"
+      version: ""
+      # enableAutomaticUpdate: Allow the provider to update automatically when a new Turtles version is installed.
+      enableAutomaticUpdate: true
       # bootstrap: RKE2 bootstrap provider.
       bootstrap:
         # namespace: Bootstrap namespace.
@@ -154,13 +134,21 @@ cluster-api-operator:
           selector: ""
     metal3:
       enabled: true
-      version: "v1.9.4"
+      version: "v1.10.2"
       infrastructure:
         namespace: capm3-system
-        imageUrl: "registry.suse.com/rancher/cluster-api-provider-metal3:v1.9.4"
+        imageUrl: "registry.suse.com/rancher/cluster-api-provider-metal3:v1.10.2"
         fetchConfig:
           url: ""
           selector: ""
       ipam:
-        namespace: capm3-system
+        namespace: metal3-ipam-system
-        imageUrl: "registry.suse.com/rancher/ip-address-manager:v1.9.4"
+        imageUrl: "registry.suse.com/rancher/ip-address-manager:v1.10.2"
+        fetchConfig:
+          url: ""
+          selector: ""
+    fleet:
+      addon:
+        fetchConfig:
+          url: ""
+          selector: ""

release-manifest-image/Dockerfile

@@ -1,4 +1,4 @@
-#!BuildTag: %%IMG_PREFIX%%release-manifest:3.4.0
+#!BuildTag: %%IMG_PREFIX%%release-manifest:3.5.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.4.0"
+LABEL org.opencontainers.image.version="3.5.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.4.0"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%release-manifest:3.5.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

@@ -1,64 +1,65 @@
 images:
-  - name: quay.io/jetstack/cert-manager-cainjector:v1.14.2
+  - name: quay.io/jetstack/cert-manager-cainjector:v1.18.2
-  - name: quay.io/jetstack/cert-manager-controller:v1.14.2
+  - name: quay.io/jetstack/cert-manager-cainjector:v1.18.2
-  - name: quay.io/jetstack/cert-manager-webhook:v1.14.2
+  - name: quay.io/jetstack/cert-manager-controller:v1.18.2
-  - name: registry.rancher.com/rancher/hardened-cluster-autoscaler:v1.10.2-build20250507
+  - name: quay.io/jetstack/cert-manager-webhook:v1.18.2
-  - name: registry.rancher.com/rancher/hardened-cni-plugins:v1.7.1-build20250509
+  - name: registry.k8s.io/e2e-test-images/agnhost:2.39
-  - name: registry.rancher.com/rancher/hardened-coredns:v1.12.1-build20250507
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%baremetal-operator:0.10.2.1
-  - name: registry.rancher.com/rancher/hardened-etcd:v3.5.21-k3s1-build20250411
-  - name: registry.rancher.com/rancher/hardened-k8s-metrics-server:v0.7.2-build20250507
-  - name: registry.rancher.com/rancher/hardened-kubernetes:v1.32.5-rke2r1-build20250515
-  - name: registry.rancher.com/rancher/hardened-multus-cni:v4.2.0-build20250326
-  - name: registry.rancher.com/rancher/klipper-helm:v0.9.5-build20250306
-  - name: registry.rancher.com/rancher/mirrored-cilium-cilium:v1.17.3
-  - name: registry.rancher.com/rancher/mirrored-cilium-operator-generic:v1.17.3
-  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-attacher:v4.8.1
-  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-node-driver-registrar:v2.13.0
-  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-provisioner:v5.2.0
-  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-resizer:v1.13.2
-  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-snapshotter:v8.2.0
-  - name: registry.rancher.com/rancher/mirrored-longhornio-livenessprobe:v2.15.0
-  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-engine:v1.8.1
-  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-instance-manager:v1.8.1
-  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-manager:v1.8.1
-  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-share-manager:v1.8.1
-  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-ui:v1.8.1
-  - name: registry.rancher.com/rancher/mirrored-sig-storage-snapshot-controller:v8.2.0
-  - name: registry.rancher.com/rancher/neuvector-compliance-config:1.0.4
-  - name: registry.rancher.com/rancher/neuvector-controller:5.4.3
-  - name: registry.rancher.com/rancher/neuvector-enforcer:5.4.3
-  - name: registry.rancher.com/rancher/nginx-ingress-controller:v1.12.1-hardened6
-  - name: registry.rancher.com/rancher/rke2-cloud-provider:v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%baremetal-operator:0.9.1.1
   - name: %%IMG_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator:0.3.0
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.8
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.9
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.5
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic:29.0.4.3
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%metallb-controller:v0.14.9
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%metallb-controller:v0.15.2
-  - name: %%IMG_REPO%%/%%IMG_PREFIX%%metallb-speaker:v0.14.9
+  - name: %%IMG_REPO%%/%%IMG_PREFIX%%metallb-speaker:v0.15.2
   - name: %%IMG_REPO%%/%%IMG_PREFIX%%upgrade-controller:0.1.1
-  - name: registry.rancher.com/rancher/cluster-api-operator:v0.17.0
+  - name: registry.rancher.com/rancher/fleet-agent:v0.13.1
-  - name: registry.rancher.com/rancher/fleet-agent:v0.12.3
+  - name: registry.rancher.com/rancher/fleet:v0.13.1
-  - name: registry.rancher.com/rancher/fleet:v0.12.3
+  - 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/rancher-webhook:v0.7.2
+  - name: registry.rancher.com/rancher/klipper-helm:v0.9.8-build20250709
-  - name: registry.rancher.com/rancher/rancher/turtles:v0.20.0
+  - name: registry.rancher.com/rancher/mirrored-cilium-cilium:v1.17.6
-  - name: registry.rancher.com/rancher/rancher:v2.11.2
+  - name: registry.rancher.com/rancher/mirrored-cilium-operator-generic:v1.17.6
-  - name: registry.rancher.com/rancher/shell:v0.4.1
+  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-attacher:v4.9.0-20250709
-  - name: registry.rancher.com/rancher/system-upgrade-controller:v0.15.2
+  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-node-driver-registrar:v2.14.0-20250709
-  - name: registry.suse.com/rancher/cluster-api-addon-provider-fleet:v0.10.0
+  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-provisioner:v5.3.0-20250709
-  - name: registry.suse.com/rancher/cluster-api-controller:v1.9.5
+  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-resizer:v1.14.0-20250709
-  - name: registry.suse.com/rancher/cluster-api-provider-metal3:v1.9.3
+  - name: registry.rancher.com/rancher/mirrored-longhornio-csi-snapshotter:v8.3.0-20250709
-  - name: registry.suse.com/rancher/cluster-api-provider-rke2-bootstrap:v0.16.1
+  - name: registry.rancher.com/rancher/mirrored-longhornio-livenessprobe:v2.16.0-20250709
-  - name: registry.suse.com/rancher/cluster-api-provider-rke2-controlplane:v0.16.1
+  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-engine:v1.9.1
-  - name: registry.suse.com/rancher/elemental-operator:1.6.8
+  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-instance-manager:v1.9.1
+  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-manager:v1.9.1
+  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-share-manager:v1.9.1
+  - name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-ui:v1.9.1
+  - name: registry.rancher.com/rancher/mirrored-sig-storage-snapshot-controller:v8.2.0
+  - name: registry.rancher.com/rancher/neuvector-compliance-config:1.0.6
+  - name: registry.rancher.com/rancher/neuvector-controller:5.4.5
+  - name: registry.rancher.com/rancher/neuvector-enforcer:5.4.5
+  - 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.24.0
+  - name: registry.rancher.com/rancher/rancher:v2.12.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.suse.com/rancher/cluster-api-addon-provider-fleet:v0.11.0
+  - name: registry.suse.com/rancher/cluster-api-controller:v1.10.5
+  - name: registry.suse.com/rancher/cluster-api-provider-metal3:v1.10.2
+  - name: registry.suse.com/rancher/cluster-api-provider-rke2-bootstrap:v0.20.1
+  - name: registry.suse.com/rancher/cluster-api-provider-rke2-controlplane:v0.20.1
+  - name: registry.suse.com/rancher/elemental-operator:1.7.3
   - name: registry.suse.com/rancher/hardened-sriov-network-operator:v1.5.0-build20250425
-  - name: registry.suse.com/rancher/ip-address-manager:v1.9.4
+  - name: registry.suse.com/rancher/ip-address-manager:v1.10.2
-  - name: registry.suse.com/suse/sles/15.6/cdi-apiserver:1.61.0-150600.3.12.1
+  - name: registry.suse.com/suse/sles/15.7/cdi-apiserver:1.62.0-150700.9.3.1
-  - name: registry.suse.com/suse/sles/15.6/cdi-controller:1.61.0-150600.3.12.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.6/cdi-operator:1.61.0-150600.3.12.1
+  - name: registry.suse.com/suse/sles/15.7/cdi-operator:1.62.0-150700.9.3.1
-  - name: registry.suse.com/suse/sles/15.6/cdi-uploadproxy:1.61.0-150600.3.12.1
+  - name: registry.suse.com/suse/sles/15.7/cdi-uploadproxy:1.62.0-150700.9.3.1
-  - name: registry.suse.com/suse/sles/15.6/virt-api:1.4.0-150600.5.15.1
+  - name: registry.suse.com/suse/sles/15.7/virt-api:1.5.2-150700.3.5.2
-  - name: registry.suse.com/suse/sles/15.6/virt-controller:1.4.0-150600.5.15.1
+  - name: registry.suse.com/suse/sles/15.7/virt-controller:1.5.2-150700.3.5.2
-  - name: registry.suse.com/suse/sles/15.6/virt-handler:1.4.0-150600.5.15.1
+  - name: registry.suse.com/suse/sles/15.7/virt-handler:1.5.2-150700.3.5.2
-  - name: registry.suse.com/suse/sles/15.6/virt-launcher:1.4.0-150600.5.15.1
+  - name: registry.suse.com/suse/sles/15.7/virt-launcher:1.5.2-150700.3.5.2
-  - name: registry.suse.com/suse/sles/15.6/virt-operator:1.4.0-150600.5.15.1
+  - name: registry.suse.com/suse/sles/15.7/virt-operator:1.5.2-150700.3.5.2

release-manifest-image/release_manifest.yaml

@@ -1,9 +1,9 @@
 apiVersion: lifecycle.suse.com/v1alpha1
 kind: ReleaseManifest
 metadata:
-  name: release-manifest-3-4-0
+  name: release-manifest-3-5-0
 spec:
-  releaseVersion: 3.4.0
+  releaseVersion: 3.5.0
   components:
     kubernetes:
       k3s:
@@ -77,10 +77,10 @@ spec:
             version: 0.0.0
             type: HelmChart
     operatingSystem:
-      version: '6.1'
+      version: '6.2'
       zypperID: SL-Micro
-      cpeScheme: cpe:/o:suse:sl-micro:6.1
+      cpeScheme: cpe:/o:suse:sles:16:16.0
-      prettyName: SUSE Linux Micro 6.1
+      prettyName: SUSE Linux Enterprise Server 16.0
       supportedArchs:
         - x86_64
         - aarch64
@@ -107,7 +107,7 @@ spec:
         - prettyName: MetalLB
           releaseName: metallb
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metallb'
-          version: '%%CHART_MAJOR%%.0.0+up0.14.9'
+          version: '%%CHART_MAJOR%%.0.1+up0.15.2'
         - prettyName: CDI
           releaseName: cdi
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%cdi'
@@ -151,7 +151,7 @@ spec:
             - releaseName: elemental
               chart: elemental
               repository: https://github.com/rancher/ui-plugin-charts/raw/main
-              version: 3.0.0
+              version: 3.0.1
         - prettyName: SRIOV
           releaseName: sriov-network-operator
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%sriov-network-operator'
@@ -171,12 +171,17 @@ spec:
         - prettyName: Metal3
           releaseName: metal3
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metal3'
-          version: '%%CHART_MAJOR%%.0.16+up0.12.6'
+          version: '%%CHART_MAJOR%%.0.18+up0.12.8'
         - prettyName: RancherTurtles
           releaseName: rancher-turtles
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles'
-          version: '%%CHART_MAJOR%%.0.5+up0.21.0'
+          version: '%%CHART_MAJOR%%.0.6+up0.24.0'
         - prettyName: RancherTurtlesAirgapResources
           releaseName: rancher-turtles-airgap-resources
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles-airgap-resources'
-          version: '%%CHART_MAJOR%%.0.5+up0.21.0'
+          version: '%%CHART_MAJOR%%.0.6+up0.24.0'
+        - prettyName: CertManager
+          releaseName: cert-manager
+          chart: cert-manager
+          version: 1.18.2
+          repository: https://charts.jetstack.io

suse-edge-components-versions-image/Dockerfile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%suse-edge-components-versions:0.1.1
+#!BuildTag: %%IMG_PREFIX%%suse-edge-components-versions:0.2.1
-#!BuildTag: %%IMG_PREFIX%%suse-edge-components-versions:0.1.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%suse-edge-components-versions:0.2.1-%RELEASE%
 
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
@@ -29,8 +29,8 @@ LABEL org.opencontainers.image.description="Gather and display component version
 LABEL org.opencontainers.image.url="https://github.com/suse-edge/support-tools/tree/main/components-versions"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opencontainers.image.version="0.1.1"
+LABEL org.opencontainers.image.version="0.2.1"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%suse-edge-components-versions:0.1.1-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%suse-edge-components-versions:0.2.1-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"