updated sriov images

Align with https://github.com/suse-edge/charts/pull/214 so we can
consume the RKE2 provider bugfix

edge-build-checks/20-helm-images

@@ -8,6 +8,7 @@ import pprint
 
 AUTHORIZED_REPOS = [
     "registry.suse.com/suse/sles/",
+    "registry.suse.com/rancher",
     "registry.rancher.com",
 ]
 

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

@@ -1,5 +1,5 @@
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.1_up0.19.0
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.2_up0.19.0
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.1_up0.19.0-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.2_up0.19.0-%RELEASE%
 apiVersion: v2
 appVersion: 0.19.0
 description: Rancher Turtles utility chart for airgap scenarios
@@ -7,4 +7,4 @@ 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.1+up0.19.0"
+version: "%%CHART_MAJOR%%.0.2+up0.19.0"

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

@@ -22,7 +22,7 @@ data:
     metadata:
       annotations:
         cert-manager.io/inject-ca-from: rke2-bootstrap-system/rke2-bootstrap-serving-cert
-        controller-gen.kubebuilder.io/version: v0.16.1
+        controller-gen.kubebuilder.io/version: v0.17.3
       labels:
         cluster.x-k8s.io/provider: bootstrap-rke2
         cluster.x-k8s.io/v1beta1: v1alpha1_v1beta1
@@ -1218,7 +1218,7 @@ data:
     metadata:
       annotations:
         cert-manager.io/inject-ca-from: rke2-bootstrap-system/rke2-bootstrap-serving-cert
-        controller-gen.kubebuilder.io/version: v0.16.1
+        controller-gen.kubebuilder.io/version: v0.17.3
       labels:
         cluster.x-k8s.io/provider: bootstrap-rke2
         cluster.x-k8s.io/v1beta1: v1alpha1_v1beta1
@@ -2526,9 +2526,10 @@ data:
             - --diagnostics-address=${CAPRKE2_DIAGNOSTICS_ADDRESS:=:8443}
             - --insecure-diagnostics=${CAPRKE2_INSECURE_DIAGNOSTICS:=false}
             - --feature-gates=MachinePool=${EXP_MACHINE_POOL:=true}
+            - --v=${CAPRKE2_DEBUG_LEVEL:=0}
             command:
             - /manager
-            image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.14.0
+            image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.15.1
             imagePullPolicy: IfNotPresent
             livenessProbe:
               httpGet:
@@ -2757,10 +2758,13 @@ data:
       - major: 0
         minor: 14
         contract: v1beta1
+      - major: 0
+        minor: 15
+        contract: v1beta1
 kind: ConfigMap
 metadata:
   creationTimestamp: null
-  name: v0.14.0
+  name: v0.15.1
   namespace: rke2-bootstrap-system
   labels:
     provider-components: rke2-bootstrap

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

@@ -22,7 +22,7 @@ data:
     metadata:
       annotations:
         cert-manager.io/inject-ca-from: rke2-control-plane-system/rke2-control-plane-serving-cert
-        controller-gen.kubebuilder.io/version: v0.16.1
+        controller-gen.kubebuilder.io/version: v0.17.3
       labels:
         cluster.x-k8s.io/provider: control-plane-rke2
         cluster.x-k8s.io/v1beta1: v1alpha1_v1beta1
@@ -1985,6 +1985,54 @@ data:
                     - control-plane-endpoint
                     - ""
                     type: string
+                  remediationStrategy:
+                    description: remediationStrategy is the RemediationStrategy that controls
+                      how control plane machine remediation happens.
+                    properties:
+                      maxRetry:
+                        description: "maxRetry is the Max number of retries while attempting
+                          to remediate an unhealthy machine.\nA retry happens when a machine
+                          that was created as a replacement for an unhealthy machine also
+                          fails.\nFor example, given a control plane with three machines
+                          M1, M2, M3:\n\n\tM1 become unhealthy; remediation happens, and
+                          M1-1 is created as a replacement.\n\tIf M1-1 (replacement of
+                          M1) has problems while bootstrapping it will become unhealthy,
+                          and then be\n\tremediated; such operation is considered a retry,
+                          remediation-retry #1.\n\tIf M1-2 (replacement of M1-1) becomes
+                          unhealthy, remediation-retry #2 will happen, etc.\n\nA retry
+                          could happen only after RetryPeriod from the previous retry.\nIf
+                          a machine is marked as unhealthy after MinHealthyPeriod from
+                          the previous remediation expired,\nthis is not considered a
+                          retry anymore because the new issue is assumed unrelated from
+                          the previous one.\n\nIf not set, the remedation will be retried
+                          infinitely."
+                        format: int32
+                        type: integer
+                      minHealthyPeriod:
+                        description: "minHealthyPeriod defines the duration after which
+                          RKE2ControlPlane will consider any failure to a machine unrelated\nfrom
+                          the previous one. In this case the remediation is not considered
+                          a retry anymore, and thus the retry\ncounter restarts from 0.
+                          For example, assuming MinHealthyPeriod is set to 1h (default)\n\n\tM1
+                          become unhealthy; remediation happens, and M1-1 is created as
+                          a replacement.\n\tIf M1-1 (replacement of M1) has problems within
+                          the 1hr after the creation, also\n\tthis machine will be remediated
+                          and this operation is considered a retry - a problem related\n\tto
+                          the original issue happened to M1 -.\n\n\tIf instead the problem
+                          on M1-1 is happening after MinHealthyPeriod expired, e.g. four
+                          days after\n\tm1-1 has been created as a remediation of M1,
+                          the problem on M1-1 is considered unrelated to\n\tthe original
+                          issue happened to M1.\n\nIf not set, this value is defaulted
+                          to 1h."
+                        type: string
+                      retryPeriod:
+                        description: |-
+                          retryPeriod is the duration that RKE2ControlPlane should wait before remediating a machine being created as a replacement
+                          for an unhealthy machine (a retry).
+
+                          If not set, a retry will happen immediately.
+                        type: string
+                    type: object
                   replicas:
                     description: Replicas is the number of replicas for the Control Plane.
                     format: int32
@@ -2558,6 +2606,30 @@ data:
                     description: Initialized indicates the target cluster has completed
                       initialization.
                     type: boolean
+                  lastRemediation:
+                    description: lastRemediation stores info about last remediation performed.
+                    properties:
+                      machine:
+                        description: machine is the machine name of the latest machine
+                          being remediated.
+                        maxLength: 253
+                        minLength: 1
+                        type: string
+                      retryCount:
+                        description: |-
+                          retryCount used to keep track of remediation retry for the last remediated machine.
+                          A retry happens when a machine that was created as a replacement for an unhealthy machine also fails.
+                        type: integer
+                      timestamp:
+                        description: timestamp is when last remediation happened. It is
+                          represented in RFC3339 form and is in UTC.
+                        format: date-time
+                        type: string
+                    required:
+                    - machine
+                    - retryCount
+                    - timestamp
+                    type: object
                   observedGeneration:
                     description: ObservedGeneration is the latest generation observed
                       by the controller.
@@ -2610,7 +2682,7 @@ data:
     metadata:
       annotations:
         cert-manager.io/inject-ca-from: rke2-control-plane-system/rke2-control-plane-serving-cert
-        controller-gen.kubebuilder.io/version: v0.16.1
+        controller-gen.kubebuilder.io/version: v0.17.3
       labels:
         cluster.x-k8s.io/provider: control-plane-rke2
         cluster.x-k8s.io/v1beta1: v1alpha1_v1beta1
@@ -3416,6 +3488,57 @@ data:
                             - control-plane-endpoint
                             - ""
                             type: string
+                          remediationStrategy:
+                            description: remediationStrategy is the RemediationStrategy
+                              that controls how control plane machine remediation happens.
+                            properties:
+                              maxRetry:
+                                description: "maxRetry is the Max number of retries while
+                                  attempting to remediate an unhealthy machine.\nA retry
+                                  happens when a machine that was created as a replacement
+                                  for an unhealthy machine also fails.\nFor example, given
+                                  a control plane with three machines M1, M2, M3:\n\n\tM1
+                                  become unhealthy; remediation happens, and M1-1 is created
+                                  as a replacement.\n\tIf M1-1 (replacement of M1) has
+                                  problems while bootstrapping it will become unhealthy,
+                                  and then be\n\tremediated; such operation is considered
+                                  a retry, remediation-retry #1.\n\tIf M1-2 (replacement
+                                  of M1-1) becomes unhealthy, remediation-retry #2 will
+                                  happen, etc.\n\nA retry could happen only after RetryPeriod
+                                  from the previous retry.\nIf a machine is marked as
+                                  unhealthy after MinHealthyPeriod from the previous remediation
+                                  expired,\nthis is not considered a retry anymore because
+                                  the new issue is assumed unrelated from the previous
+                                  one.\n\nIf not set, the remedation will be retried infinitely."
+                                format: int32
+                                type: integer
+                              minHealthyPeriod:
+                                description: "minHealthyPeriod defines the duration after
+                                  which RKE2ControlPlane will consider any failure to
+                                  a machine unrelated\nfrom the previous one. In this
+                                  case the remediation is not considered a retry anymore,
+                                  and thus the retry\ncounter restarts from 0. For example,
+                                  assuming MinHealthyPeriod is set to 1h (default)\n\n\tM1
+                                  become unhealthy; remediation happens, and M1-1 is created
+                                  as a replacement.\n\tIf M1-1 (replacement of M1) has
+                                  problems within the 1hr after the creation, also\n\tthis
+                                  machine will be remediated and this operation is considered
+                                  a retry - a problem related\n\tto the original issue
+                                  happened to M1 -.\n\n\tIf instead the problem on M1-1
+                                  is happening after MinHealthyPeriod expired, e.g. four
+                                  days after\n\tm1-1 has been created as a remediation
+                                  of M1, the problem on M1-1 is considered unrelated to\n\tthe
+                                  original issue happened to M1.\n\nIf not set, this value
+                                  is defaulted to 1h."
+                                type: string
+                              retryPeriod:
+                                description: |-
+                                  retryPeriod is the duration that RKE2ControlPlane should wait before remediating a machine being created as a replacement
+                                  for an unhealthy machine (a retry).
+
+                                  If not set, a retry will happen immediately.
+                                type: string
+                            type: object
                           replicas:
                             description: Replicas is the number of replicas for the Control
                               Plane.
@@ -4012,6 +4135,30 @@ data:
                     description: Initialized indicates the target cluster has completed
                       initialization.
                     type: boolean
+                  lastRemediation:
+                    description: lastRemediation stores info about last remediation performed.
+                    properties:
+                      machine:
+                        description: machine is the machine name of the latest machine
+                          being remediated.
+                        maxLength: 253
+                        minLength: 1
+                        type: string
+                      retryCount:
+                        description: |-
+                          retryCount used to keep track of remediation retry for the last remediated machine.
+                          A retry happens when a machine that was created as a replacement for an unhealthy machine also fails.
+                        type: integer
+                      timestamp:
+                        description: timestamp is when last remediation happened. It is
+                          represented in RFC3339 form and is in UTC.
+                        format: date-time
+                        type: string
+                    required:
+                    - machine
+                    - retryCount
+                    - timestamp
+                    type: object
                   observedGeneration:
                     description: ObservedGeneration is the latest generation observed
                       by the controller.
@@ -4139,6 +4286,14 @@ data:
       - patch
       - update
       - watch
+    - apiGroups:
+      - apiextensions.k8s.io
+      resources:
+      - customresourcedefinitions
+      verbs:
+      - get
+      - list
+      - watch
     - apiGroups:
       - authentication.k8s.io
       resources:
@@ -4290,6 +4445,7 @@ data:
             - --leader-elect
             - --diagnostics-address=${CAPRKE2_DIAGNOSTICS_ADDRESS:=:8443}
             - --insecure-diagnostics=${CAPRKE2_INSECURE_DIAGNOSTICS:=false}
+            - --v=${CAPRKE2_DEBUG_LEVEL:=0}
             command:
             - /manager
             env:
@@ -4305,7 +4461,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.uid
-            image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.14.0
+            image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.15.1
             imagePullPolicy: IfNotPresent
             livenessProbe:
               httpGet:
@@ -4541,10 +4697,13 @@ data:
       - major: 0
         minor: 14
         contract: v1beta1
+      - major: 0
+        minor: 15
+        contract: v1beta1
 kind: ConfigMap
 metadata:
   creationTimestamp: null
-  name: v0.14.0
+  name: v0.15.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.1_up0.19.0
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.2_up0.19.0
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.1_up0.19.0-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.2_up0.19.0-%RELEASE%
 annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: Rancher Turtles - the Cluster API Extension
@@ -29,4 +29,4 @@ keywords:
 - provisioning
 name: rancher-turtles
 type: application
-version: "%%CHART_MAJOR%%.0.1+up0.19.0"
+version: "%%CHART_MAJOR%%.0.2+up0.19.0"

rancher-turtles-chart/values.yaml

@@ -123,7 +123,7 @@ cluster-api-operator:
       # enabled: Turn on or off.
       enabled: true
       # version: RKE2 version.
-      version: ""
+      version: "v0.15.1"
       # bootstrap: RKE2 bootstrap provider.
       bootstrap:
         # namespace: Bootstrap namespace.

release-manifest-image/release_manifest.yaml

@@ -175,4 +175,4 @@ spec:
         - prettyName: RancherTurtles
           releaseName: rancher-turtles
           chart: %%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles
-          version: %%CHART_MAJOR%%.0.0+up0.17.0
+          version: %%CHART_MAJOR%%.0.2+up0.19.0

sriov-network-operator-chart/.checks_helm.yaml

@@ -1,10 +1,2 @@
 extra_apis:
-    - k8s.cni.cncf.io/v1/NetworkAttachmentDefinition
+    - k8s.cni.cncf.io/v1/NetworkAttachmentDefinition
-image_exceptions:
-    - rancher/hardened-sriov-network-operator
-    - rancher/hardened-sriov-network-config-daemon
-    - rancher/hardened-sriov-cni
-    - rancher/hardened-ib-sriov-cni
-    - rancher/hardened-sriov-network-device-plugin
-    - rancher/hardened-sriov-network-resources-injector
-    - rancher/hardened-sriov-network-webhook

sriov-network-operator-chart/values.yaml

@@ -101,25 +101,25 @@ supportedExtraNICs: []
 # Image URIs for sriov-network-operator components
 images:
   operator:
-    repository: rancher/hardened-sriov-network-operator
+    repository: registry.suse.com/rancher/hardened-sriov-network-operator
     tag: v1.5.0-build20250425
   sriovConfigDaemon:
-    repository: rancher/hardened-sriov-network-config-daemon
+    repository: registry.suse.com/rancher/hardened-sriov-network-config-daemon
     tag: v1.5.0-build20250425
   sriovCni:
-    repository: rancher/hardened-sriov-cni
+    repository: registry.suse.com/rancher/hardened-sriov-cni
     tag: v2.9.0-build20250425
   ibSriovCni:
-    repository: rancher/hardened-ib-sriov-cni
+    repository: registry.suse.com/rancher/hardened-ib-sriov-cni
     tag: v1.2.1-build20250425
   sriovDevicePlugin:
-    repository: rancher/hardened-sriov-network-device-plugin
+    repository: registry.suse.com/rancher/hardened-sriov-network-device-plugin
     tag: v3.9.0-build20250425
   resourcesInjector:
-    repository: rancher/hardened-sriov-network-resources-injector
+    repository: registry.suse.com/rancher/hardened-sriov-network-resources-injector
     tag: v1.7.1-build20250425
   webhook:
-    repository: rancher/hardened-sriov-network-webhook
+    repository: registry.suse.com/rancher/hardened-sriov-network-webhook
     tag: v1.5.0-build20250425
 imagePullSecrets: []
 extraDeploy: []