fix: preload correct rke2 airgap images to break CNI bootstrap deadlock

New el9_8 nodes boot rke2 v1.33.11 (flannel v0.28.4 / calico v3.31.5) from
the rolling latest/1.33 repo, but the airgap preload pinned v1.33.4
(flannel v0.27.2 / calico v3.30.2), so canal's images were never on disk and
containerd fell back to the artifactapi mirror VIP, which is unreachable until
the flannel overlay it would provide is up. Classic bootstrap deadlock.

- bump pinned rke2_version 1.33.4 -> 1.33.11 so the versionlock, RPM and
  preloaded tarball all match the canal image tags the running binary requests
- preload the canal-specific tarball alongside the default bundle so the
  flannel/calico images are guaranteed on disk regardless of bundle layout

Claude-Session: https://claude.ai/code/session_01JUoARVdmhxKQHyyyp1pxeT

hieradata/nodes/prodnxsr0014.main.unkin.net.yaml

@@ -0,0 +1,13 @@
+---
+networking_loopback0_ip: 198.18.19.21  # management loopback
+networking_loopback1_ip: 198.18.22.14  # ceph-cluster loopback
+networking_loopback2_ip: 198.18.23.14  # ceph-public loopback
+networking_1000_ip: 198.18.15.14       # 1gbe network
+networking_2500_ip: 198.18.21.14       # 2.5gbe network
+networking_1000_iface: enp1s0
+networking_2500_iface: enp2s0
+networking::interfaces:
+  "%{hiera('networking_1000_iface')}":
+    mac: a4:bb:6d:a4:e5:c1
+  "%{hiera('networking_2500_iface')}":
+    mac: c4:62:37:0d:50:03

hieradata/nodes/prodnxsr0015.main.unkin.net.yaml

@@ -0,0 +1,13 @@
+---
+networking_loopback0_ip: 198.18.19.22  # management loopback
+networking_loopback1_ip: 198.18.22.15  # ceph-cluster loopback
+networking_loopback2_ip: 198.18.23.15  # ceph-public loopback
+networking_1000_ip: 198.18.15.15       # 1gbe network
+networking_2500_ip: 198.18.21.15       # 2.5gbe network
+networking_1000_iface: enp1s0
+networking_2500_iface: enp2s0
+networking::interfaces:
+  "%{hiera('networking_1000_iface')}":
+    mac: a4:bb:6d:a6:30:c4
+  "%{hiera('networking_2500_iface')}":
+    mac: c4:62:37:0d:4f:f4

hieradata/nodes/prodnxsr0016.main.unkin.net.yaml

@@ -0,0 +1,13 @@
+---
+networking_loopback0_ip: 198.18.19.23  # management loopback
+networking_loopback1_ip: 198.18.22.16  # ceph-cluster loopback
+networking_loopback2_ip: 198.18.23.16  # ceph-public loopback
+networking_1000_ip: 198.18.15.16       # 1gbe network
+networking_2500_ip: 198.18.21.16       # 2.5gbe network
+networking_1000_iface: enp1s0
+networking_2500_iface: enp2s0
+networking::interfaces:
+  "%{hiera('networking_1000_iface')}":
+    mac: a4:bb:6d:9f:22:13
+  "%{hiera('networking_2500_iface')}":
+    mac: c4:62:37:0d:50:0c

hieradata/nodes/prodnxsr0017.main.unkin.net.yaml

@@ -0,0 +1,13 @@
+---
+networking_loopback0_ip: 198.18.19.24  # management loopback
+networking_loopback1_ip: 198.18.22.17  # ceph-cluster loopback
+networking_loopback2_ip: 198.18.23.17  # ceph-public loopback
+networking_1000_ip: 198.18.15.17       # 1gbe network
+networking_2500_ip: 198.18.21.17       # 2.5gbe network
+networking_1000_iface: enp1s0
+networking_2500_iface: enp2s0
+networking::interfaces:
+  "%{hiera('networking_1000_iface')}":
+    mac: 8c:04:ba:9c:b6:08
+  "%{hiera('networking_2500_iface')}":
+    mac: c4:62:37:0d:50:12

hieradata/nodes/prodnxsr0018.main.unkin.net.yaml

@@ -0,0 +1,13 @@
+---
+networking_loopback0_ip: 198.18.19.25  # management loopback
+networking_loopback1_ip: 198.18.22.18  # ceph-cluster loopback
+networking_loopback2_ip: 198.18.23.18  # ceph-public loopback
+networking_1000_ip: 198.18.15.18       # 1gbe network
+networking_2500_ip: 198.18.21.18       # 2.5gbe network
+networking_1000_iface: enp1s0
+networking_2500_iface: enp2s0
+networking::interfaces:
+  "%{hiera('networking_1000_iface')}":
+    mac: a4:bb:6d:a4:db:94
+  "%{hiera('networking_2500_iface')}":
+    mac: c4:62:37:0d:4f:fa

hieradata/nodes/prodnxsr0019.main.unkin.net.yaml

@@ -0,0 +1,13 @@
+---
+networking_loopback0_ip: 198.18.19.26  # management loopback
+networking_loopback1_ip: 198.18.22.19  # ceph-cluster loopback
+networking_loopback2_ip: 198.18.23.19  # ceph-public loopback
+networking_1000_ip: 198.18.15.19       # 1gbe network
+networking_2500_ip: 198.18.21.19       # 2.5gbe network
+networking_1000_iface: enp1s0
+networking_2500_iface: enp2s0
+networking::interfaces:
+  "%{hiera('networking_1000_iface')}":
+    mac: a4:bb:6d:a4:56:11
+  "%{hiera('networking_2500_iface')}":
+    mac: c4:62:37:0d:50:00

modules/rke2/manifests/install.pp

@@ -27,15 +27,18 @@ class rke2::install (
     before  => Service["rke2-${node_type}"],
   }
 
-  # download required archive of containers
-  archive { '/var/lib/rancher/rke2/agent/images/rke2-images.linux-amd64.tar.zst':
-    ensure  => present,
-    source  => "https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/rancher/rke2/releases/download/v${rke2_version}%2B${rke2_release}/rke2-images.linux-amd64.tar.zst",
-    require => [
-      Package["rke2-${node_type}"],
-      File['/var/lib/rancher/rke2/agent/images'],
-    ],
-    before  => Service["rke2-${node_type}"],
+  # preload airgap tarballs (incl. canal CNI) so flannel/calico start from disk, not the mirror VIP that needs flannel to be reachable
+  $image_archives = ['rke2-images.linux-amd64.tar.zst', 'rke2-images-canal.linux-amd64.tar.zst']
+  $image_archives.each |String $archive_file| {
+    archive { "/var/lib/rancher/rke2/agent/images/${archive_file}":
+      ensure  => present,
+      source  => "https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/rancher/rke2/releases/download/v${rke2_version}%2B${rke2_release}/${archive_file}",
+      require => [
+        Package["rke2-${node_type}"],
+        File['/var/lib/rancher/rke2/agent/images'],
+      ],
+      before  => Service["rke2-${node_type}"],
+    }
   }
 
   # ensure the images cache file exists

modules/rke2/manifests/params.pp

@@ -1,7 +1,7 @@
 # rke2 params
 class rke2::params (
   Enum['server', 'agent'] $node_type = 'agent',
-  String                  $rke2_version = '1.33.4',
+  String                  $rke2_version = '1.33.11',
   String                  $rke2_release = 'rke2r1',
   Stdlib::Absolutepath    $config_file = '/etc/rancher/rke2/config.yaml',
   Hash                    $config_hash = {},