Split actionable code from parameter definitions

voxpupuli · Jul 14, 2023 · 4cfbda3 · 4cfbda3
1 parent b174ec9
commit 4cfbda3
Show file tree

Hide file tree

Showing 12 changed files with 174 additions and 183 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -7,6 +7,7 @@
 ### Classes
 
 * [`k8s`](#k8s): Sets up a Kubernetes instance - either as a node or as a server
+* [`k8s::common`](#k8s--common): Sets up common Kubernetes components - users/groups/folders/etc
 * [`k8s::install::cni_plugins`](#k8s--install--cni_plugins): manages the installation of the cni plugins
 * [`k8s::install::container_runtime`](#k8s--install--container_runtime): manages the installation of cri
 * [`k8s::install::crictl`](#k8s--install--crictl): installs the crictl debugging tool
@@ -218,12 +219,16 @@ Data type: `String[1]`
 
 
 
+Default value: `'1.26.1'`
+
 ##### <a name="-k8s--etcd_version"></a>`etcd_version`
 
 Data type: `String[1]`
 
 
 
+Default value: `'3.5.1'`
+
 ##### <a name="-k8s--native_packaging"></a>`native_packaging`
 
 Data type: `K8s::Native_packaging`
@@ -474,7 +479,7 @@ Default value: `'cluster.local'`
 
 ##### <a name="-k8s--role"></a>`role`
 
-Data type: `Enum['node','server','none']`
+Data type: `Enum['node','server','etcd-replica','none']`
 
 
 
@@ -488,6 +493,10 @@ Data type: `Optional[K8s::Firewall]`
 
 Default value: `undef`
 
+### <a name="k8s--common"></a>`k8s::common`
+
+Sets up common Kubernetes components - users/groups/folders/etc
+
 ### <a name="k8s--install--cni_plugins"></a>`k8s::install::cni_plugins`
 
 Class: k8s::install::cni_plugins
@@ -2053,11 +2062,11 @@ Default value: `false`
 
 ##### <a name="-k8s--server--etcd--version"></a>`version`
 
-Data type: `Optional[String[1]]`
+Data type: `String[1]`
 
 version of ectd to install, will use k8s::etcd_version unless otherwise specified
 
-Default value: `undef`
+Default value: `$k8s::etcd_version`
 
 ##### <a name="-k8s--server--etcd--user"></a>`user`
 
@@ -2183,11 +2192,11 @@ Default value: `"${etcd_name}.etcd"`
 
 ##### <a name="-k8s--server--etcd--setup--ensure"></a>`ensure`
 
-Data type: `Optional[K8s::Ensure]`
+Data type: `K8s::Ensure`
 
 set ensure for installation or deinstallation
 
-Default value: `undef`
+Default value: `'present'`
 
 ##### <a name="-k8s--server--etcd--setup--etcd_name"></a>`etcd_name`
 
@@ -2215,11 +2224,11 @@ Default value: `undef`
 
 ##### <a name="-k8s--server--etcd--setup--group"></a>`group`
 
-Data type: `Optional[String[1]]`
+Data type: `String[1]`
 
 etcd system user group
 
-Default value: `undef`
+Default value: `'etcd'`
 
 ##### <a name="-k8s--server--etcd--setup--initial_advertise_peer_urls"></a>`initial_advertise_peer_urls`
 
@@ -2367,19 +2376,19 @@ Default value: `undef`
 
 ##### <a name="-k8s--server--etcd--setup--user"></a>`user`
 
-Data type: `Optional[String[1]]`
+Data type: `String[1]`
 
 etcd system user
 
-Default value: `undef`
+Default value: `'etcd'`
 
 ##### <a name="-k8s--server--etcd--setup--version"></a>`version`
 
-Data type: `Optional[String[1]]`
+Data type: `String[1]`
 
 The ectd version to install
 
-Default value: `undef`
+Default value: `$k8s::etcd_version`
 
 ### <a name="k8s--server--resources"></a>`k8s::server::resources`
 

diff --git a/data/common.yaml b/data/common.yaml
@@ -1,3 +1,2 @@
 ---
-k8s::version: 1.26.1
-k8s::etcd_version: 3.5.1
+k8s::sysconfig_path: '/etc/sysconfig'
diff --git a/manifests/common.pp b/manifests/common.pp
@@ -0,0 +1,71 @@
+# @summary Sets up common Kubernetes components - users/groups/folders/etc
+class k8s::common {
+  group { $k8s::group:
+    ensure => present,
+    system => true,
+    gid    => $k8s::gid,
+  }
+
+  user { $k8s::user:
+    ensure     => present,
+    comment    => 'Kubernetes user',
+    gid        => $k8s::group,
+    home       => '/srv/kubernetes',
+    managehome => false,
+    shell      => (fact('os.family') ? {
+        'Debian' => '/usr/sbin/nologin',
+        default  => '/sbin/nologin',
+    }),
+    system     => true,
+    uid        => $k8s::uid,
+  }
+
+  file {
+    default:
+      ensure  => directory,
+      force   => true,
+      purge   => true,
+      recurse => true;
+
+    '/opt/k8s': ;
+    '/opt/k8s/bin': ;
+  }
+
+  file { '/var/run/kubernetes':
+    ensure => directory,
+    owner  => $k8s::user,
+    group  => $k8s::group,
+  }
+
+  file { "${k8s::sysconfig_path}/kube-common":
+    ensure  => file,
+    content => epp('k8s/sysconfig.epp', {
+        comment               => 'General Kubernetes Configuration',
+        environment_variables => {
+          'KUBE_LOG_LEVEL'   => '',
+        },
+    }),
+  }
+
+  file {
+    default:
+      ensure => directory;
+
+    '/etc/kubernetes': ;
+    '/etc/kubernetes/certs': ;
+    '/etc/kubernetes/manifests':
+      purge   => $k8s::purge_manifests,
+      recurse => true;
+    '/root/.kube': ;
+    '/srv/kubernetes':
+      owner => $k8s::user,
+      group => $k8s::group;
+    '/usr/libexec/kubernetes': ;
+    '/var/lib/kubelet': ;
+    '/var/lib/kubelet/pki': ;
+
+    '/usr/share/containers/': ;
+    '/usr/share/containers/oci/': ;
+    '/usr/share/containers/oci/hooks.d': ;
+  }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -19,9 +19,8 @@
 # @param etcd_cluster_name name of the etcd cluster for searching its nodes in the puppetdb
 #
 class k8s (
-  # Stored in Hiera data
-  String[1] $version,
-  String[1] $etcd_version,
+  String[1] $version      = '1.26.1',
+  String[1] $etcd_version = '3.5.1',
 
   K8s::Ensure $ensure                     = 'present',
   Enum['container', 'native'] $packaging  = 'native',
@@ -69,110 +68,19 @@
   Stdlib::Fqdn $cluster_domain                       = 'cluster.local',
   String[1] $etcd_cluster_name                       = 'default',
 
-  Enum['node','server','none']  $role    = 'none',
+  Enum['node','server','etcd-replica','none']  $role = 'none',
   Optional[K8s::Firewall] $firewall_type = undef,
 
   String[1] $user        = 'kube',
   String[1] $group       = 'kube',
   Integer[0, 65535] $uid = 888,
   Integer[0, 65535] $gid = 888,
 ) {
-  if $manage_container_manager {
-    include k8s::install::container_runtime
-  }
-
-  group { $group:
-    ensure => present,
-    system => true,
-    gid    => $gid,
-  }
-
-  user { $user:
-    ensure     => present,
-    comment    => 'Kubernetes user',
-    gid        => $group,
-    home       => '/srv/kubernetes',
-    managehome => false,
-    shell      => (fact('os.family') ? {
-        'Debian' => '/usr/sbin/nologin',
-        default  => '/sbin/nologin',
-    }),
-    system     => true,
-    uid        => $uid,
-  }
-
-  file {
-    default:
-      ensure  => directory,
-      force   => true,
-      purge   => true,
-      recurse => true;
-
-    '/opt/k8s': ;
-    '/opt/k8s/bin': ;
-  }
-
-  file { '/var/run/kubernetes':
-    ensure => directory,
-    owner  => $user,
-    group  => $group,
-  }
-
-  $_sysconfig_path = pick($sysconfig_path, '/etc/sysconfig')
-  file { "${_sysconfig_path}/kube-common":
-    ensure  => file,
-    content => epp('k8s/sysconfig.epp', {
-        comment               => 'General Kubernetes Configuration',
-        environment_variables => {
-          'KUBE_LOG_LEVEL'   => '',
-        },
-    }),
-  }
-
-  file {
-    default:
-      ensure => directory;
-
-    '/etc/kubernetes': ;
-    '/etc/kubernetes/certs': ;
-    '/etc/kubernetes/manifests':
-      purge   => $purge_manifests,
-      recurse => true;
-    '/root/.kube': ;
-    '/srv/kubernetes':
-      owner => $user,
-      group => $group;
-    '/usr/libexec/kubernetes': ;
-    '/var/lib/kubelet': ;
-    '/var/lib/kubelet/pki': ;
-
-    '/usr/share/containers/': ;
-    '/usr/share/containers/oci/': ;
-    '/usr/share/containers/oci/hooks.d': ;
-  }
-
-  if $manage_repo {
-    include k8s::repo
-  }
-
-  if $manage_packages {
-    # Ensure conntrack is installed to properly handle networking cleanup
-    if fact('os.family') == 'Debian' {
-      $_conntrack = 'conntrack'
-    } else {
-      $_conntrack = 'conntrack-tools'
-    }
-
-    ensure_packages([$_conntrack,])
-  }
-
-  if $role != 'none' {
-    include k8s::install::cni_plugins
-  }
-
   if $role == 'server' {
     include k8s::server
   } elsif $role == 'node' {
     include k8s::node
+  } elsif $role == 'etcd-replica' {
+    include k8s::server::etcd
   }
 }
diff --git a/manifests/install/container_runtime.pp b/manifests/install/container_runtime.pp
@@ -89,6 +89,7 @@
   }
 
   if $manage_repo {
+    include k8s::repo
     Class['k8s::repo'] -> Package['k8s container manager']
   }
 }
diff --git a/manifests/install/crictl.pp b/manifests/install/crictl.pp
@@ -23,8 +23,9 @@
   Stdlib::HTTPUrl $download_url       = "https://github.com/kubernetes-sigs/cri-tools/releases/download/${version}/crictl-${version}-linux-${arch}.tar.gz",
 ) {
   if $manage_repo {
-    $pkg = pick($crictl_package, 'cri-tools')
+    include k8s::repo
 
+    $pkg = pick($crictl_package, 'cri-tools')
     package { $pkg:
       ensure => stdlib::ensure($ensure, 'package'),
     }

diff --git a/manifests/node.pp b/manifests/node.pp
@@ -53,6 +53,26 @@
 
   Optional[K8s::Firewall] $firewall_type = $k8s::firewall_type,
 ) {
+  include k8s::common
+  include k8s::install::cni_plugins
+
+  if $k8s::manage_container_manager {
+    include k8s::install::container_runtime
+  }
+  if $k8s::manage_repo {
+    include k8s::repo
+  }
+  if $k8s::manage_packages {
+    # Ensure conntrack is installed to properly handle networking cleanup
+    if fact('os.family') == 'Debian' {
+      $_conntrack = 'conntrack'
+    } else {
+      $_conntrack = 'conntrack-tools'
+    }
+
+    ensure_packages([$_conntrack,])
+  }
+
   if $manage_crictl {
     include k8s::install::crictl
   }

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -60,6 +60,8 @@
   String[1] $etcd_cluster_name                   = $k8s::etcd_cluster_name,
 
 ) {
+  include k8s::common
+
   if $manage_etcd {
     class { 'k8s::server::etcd':
       ensure          => $ensure,