Merge branch 'puppetlabs:main' into fix/kubeadm-join-node-check

Author: teasonia

.github/workflows/ci.yml

@@ -13,19 +13,24 @@ jobs:
 
   Integration:
     needs: "Spec"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix: {'platform':['rhel-8', 'debian-11'],'collection':['puppet7-nightly', 'puppet8-nightly']}
 
     steps:
+    - name: "Install Twingate"
+      uses: "twingate/github-action@v1"
+      with:
+        service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
+
     - name: Checkout Source
       uses: actions/checkout@v3
 
-    - name: Activate Ruby 2.7
+    - name: Activate Ruby 3.1
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "2.7"
+        ruby-version: "3.1"
         bundler-cache: true
 
     - name: Print bundle environment

.github/workflows/nightly.yml

@@ -11,19 +11,24 @@ jobs:
 
   Integration:
     needs: "Spec"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix: {'platform':['rhel-8', 'debian-11'],'collection':['puppet7-nightly', 'puppet8-nightly']}
 
     steps:
+    - name: "Install Twingate"
+      uses: "twingate/github-action@v1"
+      with:
+        service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
+
     - name: Checkout Source
       uses: actions/checkout@v3
 
-    - name: Activate Ruby 2.7
+    - name: Activate Ruby 3.1
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "2.7"
+        ruby-version: "3.1"
         bundler-cache: true
 
     - name: Print bundle environment

manifests/config/worker.pp

@@ -95,10 +95,10 @@
   $kubelet_extra_config_yaml = regsubst(to_yaml($kubelet_extra_config), '^---\n', '')
 
   $template = $kubernetes_version ? {
-    /1\.12/                  => 'v1alpha3',
-    /1\.1(3|4|5\.[012])/     => 'v1beta1',
-    /1\.(16|17|18|19|20|21)/ => 'v1beta2',
-    default                  => 'v1beta3',
+    /^1\.12/                  => 'v1alpha3',
+    /^1\.1(3|4|5\.[012])/     => 'v1beta1',
+    /^1\.(16|17|18|19|20|21)/ => 'v1beta2',
+    default                   => 'v1beta3',
   }
 
   file { '/etc/kubernetes':

metadata.json

@@ -14,11 +14,11 @@
     },
     {
       "name": "puppetlabs-apt",
-      "version_requirement": "<= 10.0.0"
+      "version_requirement": ">= 10.0.0"
     },
     {
       "name": "puppet-archive",
-      "version_requirement": ">= 2.0.0 < 8.0.0"
+      "version_requirement": ">= 2.0.0 <= 8.1.0"
     },
     {
       "name": "puppet-augeasproviders_sysctl",