Merge pull request #121 from ananace/improved-handling

Improve handling of manage_* parameters

Author: rwaffen

Diff for: REFERENCE.md

@@ -732,6 +732,7 @@ The following parameters are available in the `k8s::node` class:
 * [`firewall_type`](#-k8s--node--firewall_type)
 * [`manage_crictl`](#-k8s--node--manage_crictl)
 * [`manage_firewall`](#-k8s--node--manage_firewall)
+* [`manage_packages`](#-k8s--node--manage_packages)
 * [`manage_kernel_modules`](#-k8s--node--manage_kernel_modules)
 * [`manage_kubelet`](#-k8s--node--manage_kubelet)
 * [`manage_proxy`](#-k8s--node--manage_proxy)
@@ -803,6 +804,14 @@ whether to manage firewall or not
 
 Default value: `$k8s::manage_firewall`
 
+##### <a name="-k8s--node--manage_packages"></a>`manage_packages`
+
+Data type: `Boolean`
+
+whether to manage packages
+
+Default value: `$k8s::manage_packages`
+
 ##### <a name="-k8s--node--manage_kernel_modules"></a>`manage_kernel_modules`
 
 Data type: `Boolean`

Diff for: manifests/binary.pp

@@ -136,7 +136,7 @@
     }
   }
 
-  if $active and $packaging != 'container' and !defined(File["/usr/bin/${name}"]) {
+  if $active and $packaging != 'container' and $_packaging != 'manual' and !defined(File["/usr/bin/${name}"]) {
     if $packaging == 'package' {
       file { "/usr/bin/${name}":
         ensure  => $ensure,

Diff for: manifests/common.pp

@@ -69,9 +69,5 @@
     '/usr/libexec/kubernetes': ;
     '/var/lib/kubelet': ;
     '/var/lib/kubelet/pki': ;
-
-    '/usr/share/containers/': ;
-    '/usr/share/containers/oci/': ;
-    '/usr/share/containers/oci/hooks.d': ;
   }
 }

Diff for: manifests/install/container_runtime.pp

@@ -86,6 +86,15 @@
     name   => $pkg,
   }
 
+  file {
+    default:
+      ensure => directory;
+
+    '/usr/share/containers/': ;
+    '/usr/share/containers/oci/': ;
+    '/usr/share/containers/oci/hooks.d': ;
+  }
+
   if $manage_repo {
     require k8s::repo
   }

Diff for: manifests/node.pp

@@ -7,6 +7,7 @@
 # @param firewall_type define the type of firewall to use
 # @param manage_crictl toggle to install crictl
 # @param manage_firewall whether to manage firewall or not
+# @param manage_packages whether to manage packages
 # @param manage_kernel_modules whether to load kernel modules or not
 # @param manage_kubelet whether to manage kublet or not
 # @param manage_proxy whether to manage kube-proxy or not
@@ -33,6 +34,7 @@
   Boolean $manage_proxy             = $k8s::manage_kube_proxy == 'on-node',
   Boolean $manage_crictl            = false,
   Boolean $manage_firewall          = $k8s::manage_firewall,
+  Boolean $manage_packages          = $k8s::manage_packages,
   Boolean $manage_kernel_modules    = $k8s::manage_kernel_modules,
   Boolean $manage_sysctl_settings   = $k8s::manage_sysctl_settings,
   Boolean $manage_simple_cni        = false,

Diff for: manifests/node/kubelet.pp

@@ -71,7 +71,6 @@
   case $auth {
     'bootstrap': {
       $_ca_cert = pick($ca_cert, '/var/lib/kubelet/pki/ca.pem')
-      ensure_packages(['jq'])
       if !defined(K8s::Binary['kubectl']) {
         k8s::binary { 'kubectl':
           ensure => $ensure,
@@ -85,12 +84,9 @@
       ~> exec { 'Retrieve K8s CA':
         path    => ['/usr/local/bin','/usr/bin','/bin'],
         command => "kubectl --server='${control_plane_url}' --username=anonymous --insecure-skip-tls-verify=true \
-          get --raw /api/v1/namespaces/kube-system/configmaps/cluster-info | jq .data.ca -r > '${_ca_cert}'",
+          get --namespace=kube-system configmap cluster-info --output=jsonpath={.data.ca} > '${_ca_cert}'",
         creates => $_ca_cert,
-        require => [
-          K8s::Binary['kubectl'],
-          Package['jq'],
-        ],
+        require => K8s::Binary['kubectl'],
       }
       -> kubeconfig { $_bootstrap_kubeconfig:
         ensure          => $ensure,
@@ -280,7 +276,9 @@
     }
   }
 
-  Class['k8s::install::container_runtime'] -> Service['kubelet']
+  if defined(Class['k8s::install::container_runtime']) {
+    Class['k8s::install::container_runtime'] -> Service['kubelet']
+  }
   Package <| title == 'containernetworking-plugins' |> -> Service['kubelet']
 
   if $manage_firewall {