(cluster/pillan) change role from rke -> rke2{server,agent}

lsst-it · Dec 11, 2024 · f052d8c · f052d8c
1 parent 7865c1e
commit f052d8c
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 18 deletions.
diff --git a/hieradata/cluster/pillan.yaml b/hieradata/cluster/pillan.yaml
@@ -6,6 +6,10 @@ clustershell::groupmembers:
 profile::core::ospl::enable_rundir: true
 profile::core::k8snode::enable_dhcp: true
 tuned::active_profile: "latency-performance"
+nm::conf:
+  device:
+    keep-configuration: "no"
+    allowed-connections: "except:origin:nm-initrd-generator"
 nm::connections:
   enp4s0f3u2u2c2:
     content:

diff --git a/hieradata/cluster/pillan/role/rke.yaml → hieradata/cluster/pillan/role/rke2agent.yaml b/hieradata/cluster/pillan/role/rke.yaml → hieradata/cluster/pillan/role/rke2agent.yaml
@@ -2,3 +2,6 @@
 classes:
   - "profile::core::sysctl::rp_filter"
 profile::core::sysctl::rp_filter::enable: false
+rke2::config:
+  node-label:
+    - "role=storage-node"
diff --git a/hieradata/cluster/pillan/role/rke2server.yaml b/hieradata/cluster/pillan/role/rke2server.yaml
@@ -0,0 +1,7 @@
+---
+classes:
+  - "profile::core::sysctl::rp_filter"
+profile::core::sysctl::rp_filter::enable: false
+rke2::config:
+  node-label:
+    - "role=storage-node"
diff --git a/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb b/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb
@@ -19,34 +19,53 @@
       end
       let(:node_params) do
         {
-          role: 'rke',
-          site: 'tu',
+          role: 'rke2server',
           cluster: 'pillan',
+          site: 'tu',
         }
       end
 
       it { is_expected.to compile.with_all_deps }
 
-      include_examples 'docker', docker_version: '24.0.9'
       include_examples 'baremetal'
       include_context 'with nm interface'
       include_examples 'ceph cluster'
 
+      it do
+        expect(catalogue.resource('class', 'rke2')[:config]).to include(
+          'node-label' => ['role=storage-node']
+        )
+      end
+
       it do
         is_expected.to contain_class('profile::core::sysctl::rp_filter').with_enable(false)
       end
 
       it do
-        is_expected.to contain_class('profile::core::rke').with(
-          version: '1.6.2'
+        is_expected.to contain_class('clustershell').with(
+          groupmembers: {
+            'pillan' => {
+              'group' => 'pillan',
+              'member' => 'pillan[01-09]',
+            },
+          }
+        )
+      end
+
+      it do
+        is_expected.to contain_class('rke2').with(
+          node_type: 'server',
+          release_series: '1.29',
+          version: '1.29.9~rke2r1'
         )
       end
 
       it do
-        is_expected.to contain_class('cni::plugins').with(
-          version: '1.2.0',
-          checksum: 'f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37',
-          enable: ['macvlan']
+        expect(catalogue.resource('class', 'nm')[:conf]).to include(
+          'device' => {
+            'keep-configuration' => 'no',
+            'allowed-connections' => 'except:origin:nm-initrd-generator',
+          }
         )
       end
 

diff --git a/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb b/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb
@@ -22,34 +22,53 @@
       end
       let(:node_params) do
         {
-          role: 'rke',
-          site: 'tu',
+          role: 'rke2agent',
           cluster: 'pillan',
+          site: 'tu',
         }
       end
 
       it { is_expected.to compile.with_all_deps }
 
-      include_examples 'docker', docker_version: '24.0.9'
       include_examples 'baremetal'
       include_context 'with nm interface'
       include_examples 'ceph cluster'
 
+      it do
+        expect(catalogue.resource('class', 'rke2')[:config]).to include(
+          'node-label' => include('role=storage-node')
+        )
+      end
+
       it do
         is_expected.to contain_class('profile::core::sysctl::rp_filter').with_enable(false)
       end
 
       it do
-        is_expected.to contain_class('profile::core::rke').with(
-          version: '1.6.2'
+        is_expected.to contain_class('clustershell').with(
+          groupmembers: {
+            'pillan' => {
+              'group' => 'pillan',
+              'member' => 'pillan[01-09]',
+            },
+          }
+        )
+      end
+
+      it do
+        is_expected.to contain_class('rke2').with(
+          node_type: 'agent',
+          release_series: '1.29',
+          version: '1.29.9~rke2r1'
         )
       end
 
       it do
-        is_expected.to contain_class('cni::plugins').with(
-          version: '1.2.0',
-          checksum: 'f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37',
-          enable: ['macvlan']
+        expect(catalogue.resource('class', 'nm')[:conf]).to include(
+          'device' => {
+            'keep-configuration' => 'no',
+            'allowed-connections' => 'except:origin:nm-initrd-generator',
+          }
         )
       end