Release-3.1 back port

bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml

@@ -6,11 +6,11 @@ metadata:
 spec:
   resources:
   - content: |
-      # control-plane upgrade plan
+      # SUC Plan related to upgrading the K3s version of control-plane nodes
       apiVersion: upgrade.cattle.io/v1
       kind: Plan
       metadata:
-        name: k3s-plan-control-plane
+        name: k3s-upgrade-control-plane
         namespace: cattle-system
         labels:
           k3s-upgrade: control-plane
@@ -35,16 +35,16 @@ spec:
         cordon: true
         upgrade:
           image: rancher/k3s-upgrade
-        version: v1.30.3+k3s1
+        version: v1.30.5+k3s1
       ---
-      # worker upgrade plan
+      # SUC Plan related to upgrading the K3s version of worker nodes
       apiVersion: upgrade.cattle.io/v1
       kind: Plan
       metadata:
-        name: k3s-plan-agent
+        name: k3s-upgrade-worker
         namespace: cattle-system
         labels:
-          k3s-upgrade: agent
+          k3s-upgrade: worker
       spec:
         concurrency: 2 
         nodeSelector:
@@ -56,11 +56,11 @@ spec:
           image: rancher/k3s-upgrade
           args:
           - prepare
-          - k3s-plan-control-plane
+          - k3s-upgrade-control-plane
         cordon: true
         upgrade:
           image: rancher/k3s-upgrade
-        version: v1.30.3+k3s1
+        version: v1.30.5+k3s1
     name: k3s-upgrade-bundle.yaml
   targets:
   # Match nothing, user needs to specify targets

bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml

@@ -1,31 +1,32 @@
 kind: Bundle
 apiVersion: fleet.cattle.io/v1alpha1
 metadata:
-  name: os-upgrade-310
+  name: os-upgrade
   namespace: fleet-default
 spec:
   resources:
   - content: |
+      # SUC Plan related to upgrading/migrating the operating system of worker nodes
       apiVersion: upgrade.cattle.io/v1
       kind: Plan
       metadata:
-        name: agent-os-upgrade-edge-310
+        name: os-upgrade-worker
         namespace: cattle-system
       spec:
         concurrency: 1
         # Override default SUC set value of 900 with something that will
-        # give the enough time to the agent plan to finish 
+        # give the enough time to the worker plan to finish 
         jobActiveDeadlineSecs: 43200
         nodeSelector:
           matchExpressions:
             # will trigger upgrade for any node that does not contain the 'node-role.kubernetes.io/control-plane' label
             - {key: node-role.kubernetes.io/control-plane, operator: NotIn, values: ["true"]}
         serviceAccountName: system-upgrade-controller
         secrets:
-          - name: os-upgrade-edge-310
-            path: /host/run/system-upgrade/secrets/os-upgrade-edge-310
+          - name: os-upgrade-script
+            path: /host/run/system-upgrade/secrets/os-upgrade-script
         cordon: true
-        version: "3.1.0"
+        version: "3.1.1"
         prepare:
           image: registry.suse.com/edge/3.1/kubectl:1.30.3
           command: ["/bin/sh", "-c"]
@@ -41,31 +42,32 @@ spec:
                   if [ -n "$PLAN_APPLYING_CHECK" ]; then
                     echo "SUC has not yet cleared ${MASTER_PLAN} plan 'status.applying' list. Checking again in ${CHECK_INTERVAL} seconds..."
                   else
-                    echo "${MASTER_PLAN} control-plane upgrade has finished. Proceeding to agent node upgrade.."
+                    echo "${MASTER_PLAN} control-plane upgrade has finished. Proceeding to worker node upgrade.."
                     break
                   fi
                 fi
                 sleep $CHECK_INTERVAL
               done
           envs:
           - name: MASTER_PLAN
-            value: "cp-os-upgrade-edge-310"
+            value: "os-upgrade-control-plane"
           - name: NAMESPACE
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
         upgrade:
           image: registry.suse.com/bci/bci-base:15.6
           command: ["chroot", "/host"]
-          args: ["sh", "/run/system-upgrade/secrets/os-upgrade-edge-310/upgrade.sh"]
+          args: ["sh", "/run/system-upgrade/secrets/os-upgrade-script/upgrade.sh"]
           envFrom:
           - configMapRef:
-              name: os-upgrade-edge-310
+              name: os-upgrade-config
       ---
+      # SUC Plan related to upgrading/migrating the operating system of control-plane nodes
       apiVersion: upgrade.cattle.io/v1
       kind: Plan
       metadata:
-        name: cp-os-upgrade-edge-310
+        name: os-upgrade-control-plane
         namespace: cattle-system
       spec:
         concurrency: 1
@@ -89,22 +91,24 @@ spec:
           effect: "NoExecute"
         serviceAccountName: system-upgrade-controller
         secrets:
-          - name: os-upgrade-edge-310
-            path: /host/run/system-upgrade/secrets/os-upgrade-edge-310
+          - name: os-upgrade-script
+            path: /host/run/system-upgrade/secrets/os-upgrade-script
         cordon: true
-        version: "3.1.0"
+        version: "3.1.1"
         upgrade:
           image: registry.suse.com/bci/bci-base:15.6
           command: ["chroot", "/host"]
-          args: ["sh", "/run/system-upgrade/secrets/os-upgrade-edge-310/upgrade.sh"]
+          args: ["sh", "/run/system-upgrade/secrets/os-upgrade-script/upgrade.sh"]
           envFrom:
           - configMapRef:
-              name: os-upgrade-edge-310
+              name: os-upgrade-config
       ---
+      # Secret containing the script that is used by the 
+      # SUC Plans for operating system migration/upgrade
       apiVersion: v1
       kind: Secret
       metadata:
-        name: os-upgrade-edge-310
+        name: os-upgrade-script
         namespace: cattle-system
       type: Opaque
       stringData:
@@ -199,16 +203,17 @@ spec:
 
           executeUpgrade
       ---
+      # Configurations for the operating system migration/upgrade workflow
       apiVersion: v1
       kind: ConfigMap
       metadata:
-        name: os-upgrade-edge-310
+        name: os-upgrade-config
         namespace: cattle-system
       data:
         EDGE_RELEASE_CPE: "cpe:/o:suse:sl-micro:6.0"
         SL_MICRO_ZYPPER_ID: "SL-Micro"
         SL_MICRO_VERSION: "6.0"
-    name: os-pkg-update-bundle.yaml
+    name: os-upgrade-bundle.yaml
   targets:
   # Match nothing, user needs to specify targets
   - clusterSelector: null

bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml

@@ -6,11 +6,11 @@ metadata:
 spec:
   resources:
   - content: |
-      # control-plane upgrade plan
+      # SUC Plan related to upgrading the RKE2 version of control-plane nodes
       apiVersion: upgrade.cattle.io/v1
       kind: Plan
       metadata:
-        name: rke2-plan-control-plane
+        name: rke2-upgrade-control-plane
         namespace: cattle-system
         labels:
           rke2-upgrade: control-plane
@@ -35,16 +35,16 @@ spec:
         cordon: true
         upgrade:
           image: rancher/rke2-upgrade
-        version: v1.30.3+rke2r1
+        version: v1.30.5+rke2r1
       ---
-      # worker upgrade plan
+      # SUC Plan related to upgrading the RKE2 version of worker nodes
       apiVersion: upgrade.cattle.io/v1
       kind: Plan
       metadata:
-        name: rke2-plan-agent
+        name: rke2-upgrade-worker
         namespace: cattle-system
         labels:
-          rke2-upgrade: agent
+          rke2-upgrade: worker
       spec:
         concurrency: 2
         nodeSelector:
@@ -54,15 +54,15 @@ spec:
         prepare:
           args:
           - prepare
-          - rke2-plan-control-plane
+          - rke2-upgrade-control-plane
           image: rancher/rke2-upgrade
         serviceAccountName: system-upgrade-controller
         cordon: true
         drain:
           force: true
         upgrade:
           image: rancher/rke2-upgrade
-        version: v1.30.3+rke2r1
+        version: v1.30.5+rke2r1
     name: rke2-upgrade-bundle.yaml
   targets:
   # Match nothing, user needs to specify targets

fleets/day2/chart-templates/metal3/fleet.yaml

@@ -3,6 +3,6 @@ defaultNamespace: metal3-system
 helm:
   releaseName: metal3
   chart: "oci://registry.suse.com/edge/3.1/metal3-chart"
-  version: "0.8.1"
+  version: "0.8.3"
   # custom chart value overrides
   values: {}

fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml

@@ -4,6 +4,6 @@ helm:
   releaseName: "neuvector-crd"
   chart: "neuvector-crd"
   repo: "https://charts.rancher.io"
-  version: "104.0.1+up2.7.9"
+  version: "104.0.2+up2.8.0"
   # custom chart value overrides
   values: {}

fleets/day2/chart-templates/neuvector/neuvector-ui-extension/fleet.yaml

@@ -4,6 +4,6 @@ helm:
   releaseName: "neuvector-ui-ext"
   chart: "neuvector-ui-ext"
   repo: "https://github.com/rancher/ui-plugin-charts/raw/main/"
-  version: "1.0.0"
+  version: "2.0.0"
   # custom chart value overrides
   values: {}

fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml

@@ -4,6 +4,6 @@ helm:
   releaseName: "neuvector"
   chart: "neuvector"
   repo: "https://charts.rancher.io"
-  version: "104.0.1+up2.7.9"
+  version: "104.0.2+up2.8.0"
   # custom chart value overrides
   values: {}

fleets/day2/chart-templates/rancher-turtles-airgap-resources/fleet.yaml

@@ -3,6 +3,6 @@ defaultNamespace: rancher-turtles-system
 helm:
   releaseName: rancher-turtles-airgap-resources
   chart: "oci://registry.suse.com/edge/3.1/rancher-turtles-airgap-resources-chart"
-  version: "0.3.2"
+  version: "0.3.3"
   # custom chart value overrides
   values: {}

fleets/day2/chart-templates/rancher-turtles/fleet.yaml

@@ -3,7 +3,7 @@ defaultNamespace: rancher-turtles-system
 helm:
   releaseName: rancher-turtles
   chart: "oci://registry.suse.com/edge/3.1/rancher-turtles-chart"
-  version: "0.3.2"
+  version: "0.3.3"
   # custom chart value overrides
   values: {}
 

fleets/day2/chart-templates/rancher/fleet.yaml

@@ -4,6 +4,6 @@ helm:
   releaseName: "rancher"
   chart: "rancher"
   repo: "https://charts.rancher.com/server-charts/prime"
-  version: "2.9.1"
+  version: "2.9.3"
   # custom chart value overrides
   values: {}

fleets/day2/system-upgrade-controller-plans/eib-charts-migration-prep/plan.yaml

@@ -25,7 +25,7 @@ spec:
       path: /host/run/system-upgrade/secrets/migration-prep-script
   cordon: false
   # Version of the specific Edge release that this Plan relates to
-  version: "3.1.0"
+  version: "3.1.1"
   upgrade:
     image: registry.suse.com/edge/3.1/kubectl:1.30.3
     command: ["/bin/sh", "/host/run/system-upgrade/secrets/migration-prep-script/prepare_chart_migration.sh"]

fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml

@@ -1,7 +1,8 @@
+# SUC Plan related to upgrading the K3s version of control-plane nodes
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
-  name: k3s-plan-control-plane
+  name: k3s-upgrade-control-plane
   labels:
     k3s-upgrade: control-plane
 spec:
@@ -25,4 +26,4 @@ spec:
   cordon: true
   upgrade:
     image: rancher/k3s-upgrade
-  version: v1.30.3+k3s1
+  version: v1.30.5+k3s1

fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-agent.yaml → fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-worker.yaml

@@ -1,10 +1,10 @@
-# worker upgrade plan
+# SUC Plan related to upgrading the K3s version of worker nodes
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
-  name: k3s-plan-agent
+  name: k3s-upgrade-worker
   labels:
-    k3s-upgrade: agent
+    k3s-upgrade: worker
 spec:
   concurrency: 2 
   nodeSelector:
@@ -16,8 +16,8 @@ spec:
     image: rancher/k3s-upgrade
     args:
     - prepare
-    - k3s-plan-control-plane
+    - k3s-upgrade-control-plane
   cordon: true
   upgrade:
     image: rancher/k3s-upgrade
-  version: v1.30.3+k3s1
+  version: v1.30.5+k3s1

fleets/day2/system-upgrade-controller-plans/os-upgrade/config-map.yaml

@@ -1,7 +1,8 @@
+# Configurations for the operating system migration/upgrade workflow
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: os-upgrade-edge-310
+  name: os-upgrade-config
 data:
   EDGE_RELEASE_CPE: "cpe:/o:suse:sl-micro:6.0"
   SL_MICRO_ZYPPER_ID: "SL-Micro"

fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-control-plane.yaml

@@ -1,7 +1,8 @@
+# SUC Plan related to upgrading/migrating the operating system of control-plane nodes
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
-  name: cp-os-upgrade-edge-310
+  name: os-upgrade-control-plane
 spec:
   concurrency: 1
   # Override the default SUC set value of 900 with something that will
@@ -24,14 +25,14 @@ spec:
     effect: "NoExecute"
   serviceAccountName: system-upgrade-controller
   secrets:
-    - name: os-upgrade-edge-310
-      path: /host/run/system-upgrade/secrets/os-upgrade-edge-310
+    - name: os-upgrade-script
+      path: /host/run/system-upgrade/secrets/os-upgrade-script
   cordon: true
-  version: "3.1.0"
+  version: "3.1.1"
   upgrade:
     image: registry.suse.com/bci/bci-base:15.6
     command: ["chroot", "/host"]
-    args: ["sh", "/run/system-upgrade/secrets/os-upgrade-edge-310/upgrade.sh"]
+    args: ["sh", "/run/system-upgrade/secrets/os-upgrade-script/upgrade.sh"]
     envFrom:
     - configMapRef:
-        name: os-upgrade-edge-310
+        name: os-upgrade-config