(PE-38155) Updating node_manager to use Latest Puppetlabs version (#451)

* (PE-38155) Updating node_manager to use latest puppetlabs version

Added rule purge to PE Infrastructure Agent

* Adding node_manager upper bound

Co-authored-by: Tim Meusel <[email protected]>

---------

Co-authored-by: Tim Meusel <[email protected]>

Author: ragingra

.fixtures.yml

@@ -5,9 +5,6 @@ fixtures:
     service: "puppetlabs/service"
     package: "puppetlabs/package"
     reboot: "puppetlabs/reboot"
-    node_manager:
-      repo: "WhatsARanjit/node_manager"
-      ref: "0.7.5"
   repositories:
     facts: "https://github.com/puppetlabs/puppetlabs-facts.git"
     puppet_agent: "https://github.com/puppetlabs/puppetlabs-puppet_agent.git"
@@ -17,6 +14,7 @@ fixtures:
     bolt_shim: "https://github.com/puppetlabs/puppetlabs-bolt_shim"
     format: "https://github.com/voxpupuli/puppet-format"
     container_inventory: "https://gitlab.com/nwops/bolt-container_inventory"
+    node_manager: "https://github.com/puppetlabs/puppetlabs-node_manager.git"
   symlinks:
     "peadm": "#{source_dir}"
     "peadm_spec": "#{source_dir}/spec/acceptance/peadm_spec"

.github/workflows/ci.yml

@@ -9,9 +9,7 @@ on:
 jobs:
   Spec:
     if: ${{ github.repository_owner == 'puppetlabs' }}
-    # Temporary workaround for allowing locking node_manager less than latest
-    # uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
-    uses: "./.github/workflows/module_ci.yml"
+    uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
     secrets: "inherit"
 
   Acceptance:

.github/workflows/module_ci.yml

@@ -8,9 +8,7 @@ on:
 jobs:
   Spec:
     if: ${{ github.repository_owner == 'puppetlabs' }}
-    # Temporary workaround for allowing locking node_manager less than latest
-    # uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
-    uses: "./.github/workflows/module_ci.yml"
+    uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
     secrets: "inherit"
 
   Acceptance:

.github/workflows/nightly.yml

@@ -4,6 +4,6 @@
 # The following directive installs modules to the managed moduledir.
 moduledir '.modules'
 
-mod 'WhatsARanjit/node_manager', '0.7.5'
+mod 'puppetlabs/node_manager', '1.0.1'
 mod 'puppet/format', '1.1.1'
 mod 'puppetlabs/stdlib', '9.5.0'

Puppetfile

@@ -55,7 +55,8 @@
   # We modify this group's rule such that all PE infrastructure nodes will be
   # members.
   node_group { 'PE Infrastructure Agent':
-    rule => ['or',
+    purge_behavior => rule,
+    rule           => ['or',
       ['~', ['trusted', 'extensions', peadm::oid('peadm_role')], '^puppet/'],
       ['~', ['fact', 'pe_server_version'], '.+']
     ],

bolt-project.yaml

@@ -13,8 +13,8 @@
       "version_requirement": ">= 9.0.0 < 10.0.0"
     },
     {
-      "name": "WhatsARanjit/node_manager",
-      "version_requirement": "0.7.5"
+      "name": "puppetlabs/node_manager",
+      "version_requirement": ">= 1.0.1 < 2.0.0"
     },
     {
       "name": "puppetlabs/bolt_shim",

manifests/setup/node_manager.pp

@@ -7,7 +7,7 @@ moduledir '.modules'
 mod 'puppet/format', '1.0.0'
 mod 'puppetlabs/bolt_shim', '0.3.2'
 mod 'puppetlabs/apply_helpers', '0.3.0'
-mod 'WhatsARanjit/node_manager', '0.7.5'
+mod 'puppetlabs/node_manager', '1.0.1'
 mod 'puppetlabs/ruby_task_helper', '0.5.1'
 mod 'puppetlabs/stdlib', '7.1.0'
 mod 'nwops/container_inventory', '0.1.1'

metadata.json

@@ -6,8 +6,8 @@ modules:
   - name: puppetlabs/stdlib
     version_requirement: ">= 6.5.0 < 8.0.0"
   - puppetlabs/ruby_task_helper
-  - name: WhatsARanjit/node_manager
-    version_requirement: "0.7.5"
+  - name: puppetlabs/node_manager
+    version_requirement: ">= 1.0.1 < 2.0.0"
   - puppetlabs/apply_helpers
   - puppetlabs/bolt_shim
   - puppet/format