CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 2.0.2
+
+Fixes issue with cgroup mismatch on docker PR #109
+
+ignores docker warning ine prelifght checks when using containerd PR #109
+
 # Version 2.0.1
 
 Changes default runtime to docker

manifests/cluster_roles.pp

@@ -18,29 +18,41 @@
   String $cni_pod_cidr = $kubernetes::cni_pod_cidr,
   String $token = $kubernetes::token,
   String $discovery_token_hash = $kubernetes::discovery_token_hash,
+  String $container_runtime = $kubernetes::container_runtime,
 
 ){
   $path = ['/usr/bin','/bin','/sbin','/usr/local/bin']
   $env = ['HOME=/root', 'KUBECONFIG=/etc/kubernetes/admin.conf']
 
+  if $container_runtime == 'cri_containerd' {
+    $preflight_errors = ['Service-Docker']
+    $cri_socket = '/run/containerd/containerd.sock'
+  } else {
+    $preflight_errors = undef
+    $cri_socket = undef
+  }
+
+
   if $controller {
     kubernetes::kubeadm_init { $node_label:
-      config     => '/etc/kubernetes/config.yaml',
-      path       => $path,
-      env        => $env,
-      node_label => $node_label,
+      config                  => '/etc/kubernetes/config.yaml',
+      path                    => $path,
+      env                     => $env,
+      node_label              => $node_label,
+      ignore_preflight_errors => $preflight_errors,
       }
     }
 
   if $worker {
     kubernetes::kubeadm_join { $node_label:
-      path               => $path,
-      env                => $env,
-      controller_address => $controller_address,
-      token              => $token,
-      ca_cert_hash       => $discovery_token_hash,
-      cri_socket         => '/run/containerd/containerd.sock',
-      node_label         => $node_label,
+      path                    => $path,
+      env                     => $env,
+      controller_address      => $controller_address,
+      token                   => $token,
+      ca_cert_hash            => $discovery_token_hash,
+      cri_socket              => $cri_socket,
+      node_label              => $node_label,
+      ignore_preflight_errors => $preflight_errors,
       }
     }
 }

manifests/packages.pp

@@ -37,12 +37,22 @@
 
   if $container_runtime == 'docker' {
     case $::osfamily {
-      'Debian','RedHat' : {
+      'Debian': {
         package { 'docker-engine':
           ensure => $docker_version,
         }
       }
-
+      'RedHat': {
+        package { 'docker-engine':
+          ensure => $docker_version,
+        }
+        file_line { 'set systemd cgroup docker':
+          path    => '/usr/lib/systemd/system/docker.service',
+          line    => 'ExecStart=/usr/bin/dockerd --exec-opt native.cgroupdriver=systemd',
+          match   => 'ExecStart',
+          require => Package['docker-engine'],
+        }
+      }
     default: { notify {"The OS family ${::osfamily} is not supported by this module":} }
     }
   }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-kubernetes",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "author": "Puppet",
   "summary": "The module installs and configures a Kubernetes cluster",
   "license": "Apache-2.0",

spec/classes/cluster_roles_spec.rb

@@ -33,7 +33,8 @@
           'token' => 'foo',
           'etcd_initial_cluster' => 'foo',
           'controller_address' => '172.17.10.101',  
-          'node_label' => 'foo',         
+          'node_label' => 'foo',    
+          'container_runtime' => 'docker',     
         } 
     end
 
@@ -58,7 +59,9 @@
           'token' => 'foo',
           'etcd_initial_cluster' => 'foo',   
           'controller_address' => '172.17.10.101',  
-          'node_label' => 'foo',                                           
+          'node_label' => 'foo',   
+          'container_runtime' => 'docker',     
+
         } 
     end