Merge branch 'voxpupuli:master' into kubelet_labels

Author: zezav-cz

.github/workflows/prepare_release.yml

@@ -0,0 +1,23 @@
+---
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
+name: 'Prepare Release'
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)'
+        required: false
+
+jobs:
+  release_prep:
+    uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'
+    with:
+      version: ${{ github.event.inputs.version }}
+      allowed_owner: 'voxpupuli'
+    secrets:
+      # Configure secrets here:
+      #  https://docs.github.com/en/actions/security-guides/encrypted-secrets
+      github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}'

.github/workflows/release.yml

@@ -21,10 +21,3 @@ jobs:
       #  https://docs.github.com/en/actions/security-guides/encrypted-secrets
       username: ${{ secrets.PUPPET_FORGE_USERNAME }}
       api_key: ${{ secrets.PUPPET_FORGE_API_KEY }}
-
-  create-github-release:
-    name: Create GitHub Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Create GitHub release
-        uses: voxpupuli/gha-create-a-github-release@v1

.msync.yml

@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '9.3.0'
+modulesync_config_version: '9.4.0'

.vscode/extensions.json

@@ -33,6 +33,9 @@
     '/opt/k8s': ;
     '/opt/k8s/bin': ;
   }
+  ['/etc/facter','/etc/facter/facts.d'].each |$path| {
+    ensure_resource('file', $path, { ensure => directory })
+  }
 
   file { '/var/run/kubernetes':
     ensure => directory,

manifests/common.pp

@@ -33,6 +33,27 @@
       file { $_target:
         ensure  => stdlib::ensure($ensure, 'directory'),
       }
+      if $ensure == present {
+        # Store the cni plugin version in a static fact, to retain the plugin directory for copying from on upgrades
+        file { '/etc/facter/facts.d/cni_plugins_version.txt':
+          ensure  => file,
+          content => "cni_plugins_version=${version}",
+          require => File['/opt/cni/bin'],
+        }
+        if fact('cni_plugins_version') and fact('cni_plugins_version') != $version {
+          $_old_target = "/opt/k8s/cni-${fact('cni_plugins_version')}"
+          file { $_old_target:
+            ensure => directory,
+          }
+
+          exec { 'Retain custom CNI binaries':
+            command     => "cp --no-clobber '${_old_target}'/* '${_target}'",
+            path        => fact('path'),
+            refreshonly => true,
+            subscribe   => File['/opt/cni/bin'],
+          }
+        }
+      }
 
       archive { 'cni-plugins':
         ensure       => $ensure,

manifests/install/cni_plugins.pp

@@ -26,7 +26,7 @@
     },
     {
       "name": "puppet-systemd",
-      "version_requirement": ">= 2.0.0 < 8.0.0"
+      "version_requirement": ">= 2.0.0 < 9.0.0"
     },
     {
       "name": "puppetlabs-firewall",

metadata.json

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'k8s::install::cni_plugins' do
+  let(:pre_condition) do
+    <<~PUPPET
+      include k8s
+    PUPPET
+  end
+
+  on_supported_os.each do |os, os_facts|
+    context "on #{os}" do
+      let(:facts) { os_facts }
+
+      it { is_expected.to compile }
+      it { is_expected.to contain_file('/opt/cni') }
+
+      context 'when method is tarball' do
+        let(:params) do
+          {
+            method: 'tarball',
+            version: 'v1.0.0'
+          }
+        end
+
+        it { is_expected.to contain_archive('cni-plugins').with_extract_path('/opt/k8s/cni-v1.0.0') }
+
+        context 'without storage fact' do
+          it { is_expected.not_to contain_exec('Retain custom CNI binaries') }
+        end
+
+        context 'with storage fact' do
+          let(:facts) { os_facts.merge(cni_plugins_version: 'v0.0.0') }
+
+          it { is_expected.to contain_exec('Retain custom CNI binaries') }
+        end
+      end
+    end
+  end
+end