Merge pull request #31 from puppetlabs/cri-containerd-dave

* first commit to add cri-containerd

final commit for cri_containerd

* final commit for cri-containerd

* Update README.md

fixed typo in README

* Update params.pp

* Update params.pp

* ensuring files are created before kubelet is started

* fixing acceptance tests

* updates for beta containerd on kube 1.9

* Update metadata.json

* Update .fixtures.yml

Author: scotty-c

.fixtures.yml

@@ -3,5 +3,7 @@ fixtures:
     stdlib: 'puppetlabs-stdlib'
     apt: 'puppetlabs-apt'
     epel: 'stahnma-epel'
+    wget: 'maestrodev-wget'
+    archive: "puppet-archive"    
   symlinks:
     kubernetes: "#{source_dir}"

README.md

@@ -48,6 +48,10 @@ The kube_tools help menu:
 
 ```puppet
 Usage: kube_tool [options]
+    -o, --os-type os-type            the os that kubernetes will run on
+    -v, --version version            the kubernetes version to install
+    -r container runtime,            the container runtime to use. this can only be docker or cri_containerd
+        --container_runtime
     -f, --fqdn fqdn                  fqdn
     -i, --ip ip                      ip
     -b bootstrap,                    the bootstrap controller ip address
@@ -64,11 +68,14 @@ Usage: kube_tool [options]
 So to generate the hiera file for my cluster I use:
 
 ```puppet
-./kube_tool.rb -f kubernetes -i 172.17.10.101 -b 172.17.10.101 -e "etcd-kube-master=http://172.17.10.101:2380,etcd-kube-replica-master-01=http://172.17.10.210:2380,etcd-kube-replica-master-02=http://172.17.10.220:2380" -t "%{::ipaddress_enp0s8}" -a "%{::ipaddress_enp0s8}" -d true
+./kube_tool.rb -o debian -v 1.8.4 -r docker -f kubernetes -i 172.17.10.101 -b 172.17.10.101 -e "etcd-kube-master=http://172.17.10.101:2380,etcd-kube-replica-master-01=http://172.17.10.210:2380,etcd-kube-replica-master-02=http://172.17.10.220:2380" -t "%{::ipaddress_enp0s8}" -a "%{::ipaddress_enp0s8}" -d true
 ```
 
 The parameters are:
 
+* `OS`: the os kubernetes will run on.
+* `VERSION`: the version of kubernetes you want to deploy
+* `CONTAINER_RUNTIME`: the container runtime kubernetes will use, this can only be set to `docker` or `cri_containerd` 
 * `FQDN`: the cluster fqdn.
 * `BOOTSTRAP_CONTROLLER_IP`: the ip address of the controller puppet will use to create things like cluster role bindings, kube dns, and the Kubernetes dashboard.
 * `ETCD_INITIAL_CLUSTER`: the server addresses. When in production, include three, five, or seven nodes for etcd.

manifests/cluster_roles.pp

@@ -32,7 +32,7 @@
     require     => File['/etc/kubernetes/manifests/clusterRoleBinding.yaml'],
     }
 
-  if $kubernetes_version =~ /1[.]8[.]\d/ {
+  if $kubernetes_version =~ /1[.](8|9)[.]\d/ {
 
     exec { 'Create role biniding for system nodes':
       command => 'kubectl set subject clusterrolebinding system:node --group=system:nodes',

manifests/config.pp

@@ -3,6 +3,7 @@
 class kubernetes::config (
 
   $kubernetes_version = $kubernetes::kubernetes_version,
+  $container_runtime = $kubernetes::container_runtime,
   $kube_dns_version = $kubernetes::kube_dns_version,
   $kubernetes_fqdn = $kubernetes::kubernetes_fqdn,
   $controller = $kubernetes::controller,

manifests/init.pp

@@ -14,7 +14,12 @@
 #   The version of the packages the Kubernetes os packages to install 
 #   ie kubectl and kubelet
 #   Defaults to 1.7.3
-# 
+#
+# [*container_runtime]
+#   This is the runtime that the Kubernetes cluster will use.
+#   It can only be set to "cri_containerd" or "docker"
+#   Defaults to docker
+#
 # [*cni_version*]
 #   The version of the cni package you would like to install
 #   Defaults to 0.5.1
@@ -203,6 +208,7 @@
   $kubernetes_version = $kubernetes::params::kubernetes_version,
   $kubernetes_package_version = $kubernetes::params::kubernetes_package_version,
   $kubernetes_fqdn = $kubernetes::params::kubernetes_fqdn,
+  $container_runtime = $kubernetes::params::container_runtime,
   $cni_version = $kubernetes::params::cni_version,
   $kube_dns_version = $kubernetes::params::kube_dns_version,
   $controller = $kubernetes::params::controller,

manifests/kube_addons.pp

@@ -71,7 +71,7 @@
     require     => Exec['Create kube dns service account'],
     }
 
-  if $install_dashboard and $kubernetes_version =~ /1[.]8[.]\d/ {
+  if $install_dashboard and $kubernetes_version =~ /1[.](8|9)[.]\d/ {
     exec { 'Install Kubernetes dashboard':
       command => 'kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/master/src/deploy/recommended/kubernetes-dashboard.yaml',
       onlyif  => 'kubectl get nodes',

manifests/packages.pp

@@ -3,31 +3,66 @@
 class kubernetes::packages (
 
   $kubernetes_package_version = $kubernetes::kubernetes_package_version,
+  $container_runtime = $kubernetes::container_runtime,
   $cni_version = $kubernetes::cni_version,
+
 ) {
 
   $kube_packages = ['kubelet', 'kubectl']
 
-  case $::osfamily {
-    'Debian' : {
-      package { 'docker-engine':
+  case $kubernetes_package_version {
+    /1[.]9[.]\d/: {
+      $cri_source = 'https://github.com/kubernetes-incubator/cri-containerd/releases/download/v1.0.0-beta.0/cri-containerd-1.0.0-beta.0.linux-amd64.tar.gz'
+      $cri_archive = 'cri-containerd-1.0.0-beta.0.linux-amd64.tar.gz'
+    }
+    default: {
+      $cri_source = 'https://github.com/kubernetes-incubator/cri-containerd/releases/download/v1.0.0-alpha.1/cri-containerd-1.0.0-alpha.1.tar.gz'
+      $cri_archive = 'cri-containerd-1.0.0-alpha.1.tar.gz'
+    }
+  }
+
+  if $container_runtime == 'docker' {
+    case $::osfamily {
+      'Debian' : {
+        package { 'docker-engine':
         ensure => '1.12.0-0~xenial',
+        }
       }
-    }
 
-    'RedHat' : {
-      package { 'docker-engine':
-        ensure => '1.12.6',
+      'RedHat' : {
+        package { 'docker-engine':
+          ensure => '1.12.6',
+        }
       }
-    }
+
     default: { notify {"The OS family ${::os_family} is not supported by this module":} }
+    }
+
+    package { 'kubernetes-cni':
+      ensure => $cni_version,
+    }
   }
 
-  package { $kube_packages:
-    ensure => $kubernetes_package_version,
+  elsif $container_runtime == 'cri_containerd' {
+    wget::fetch { 'wget cri-containerd':
+      source      => $cri_source,
+      destination => '/',
+      timeout     => 0,
+      verbose     => false,
     }
 
-  package { 'kubernetes-cni':
-    ensure => $cni_version,
+  -> archive { $cri_archive:
+      ensure          => present,
+      path            => "/${cri_archive}",
+      extract         => true,
+      extract_command => 'tar xfz %s --strip-components=1',
+      extract_path    => '/',
+      cleanup         => true,
+      creates         => '/usr/local/bin/cri-containerd'
+      }
+  }
+
+  package { $kube_packages:
+    ensure => $kubernetes_package_version,
     }
 }

manifests/params.pp

@@ -15,6 +15,7 @@
 }
 $kubernetes_version = '1.7.3'
 $kube_dns_version = '1.14.2'
+$container_runtime = 'docker'
 $kubernetes_fqdn = 'kubernetes'
 $controller = false
 $bootstrap_controller = false

manifests/repos.pp

@@ -1,6 +1,7 @@
 ## kubernetes repos 
 
 class kubernetes::repos (
+  $container_runtime = $kubernetes::container_runtime,
   $manage_epel = $kubernetes::manage_epel,
 ){
 
@@ -18,26 +19,30 @@
           },
         }
 
-        apt::source { 'docker':
-          location => 'https://apt.dockerproject.org/repo',
-          repos    => 'main',
-          release  => 'ubuntu-xenial',
-          key      => {
-            'id'     => '9DC858229FC7DD38854AE2D88D81803C0EBFCD88',
-            'source' => 'https://download.docker.com/linux/ubuntu/gpg',
-        },
+        if $container_runtime == 'docker' {
+          apt::source { 'docker':
+            location => 'https://apt.dockerproject.org/repo',
+            repos    => 'main',
+            release  => 'ubuntu-xenial',
+            key      => {
+              'id'     => '9DC858229FC7DD38854AE2D88D81803C0EBFCD88',
+              'source' => 'https://download.docker.com/linux/ubuntu/gpg',
+          },
+        }
       }
     }
     'RedHat': {
       if $manage_epel {
         include epel
       }
 
-      yumrepo { 'docker':
-        descr    => 'docker',
-        baseurl  => "https://yum.dockerproject.org/repo/main/${repo}/7",
-        gpgkey   => 'https://yum.dockerproject.org/gpg',
-        gpgcheck => true,
+      if $container_runtime == 'docker' {
+        yumrepo { 'docker':
+          descr    => 'docker',
+          baseurl  => "https://yum.dockerproject.org/repo/main/${repo}/7",
+          gpgkey   => 'https://yum.dockerproject.org/gpg',
+          gpgcheck => true,
+        }
       }
 
       yumrepo { 'kubernetes':

manifests/service.pp

@@ -4,19 +4,15 @@
 
   $controller = $kubernetes::controller,
   $bootstrap_controller = $kubernetes::bootstrap_controller,
+  $container_runtime = $kubernetes::container_runtime,
   $etcd_ip = $kubernetes::etcd_ip,
 ){
 
   $peeruls = inline_template("'{\"peerURLs\":[\"http://${etcd_ip}:2380\"]}'")
 
-  service { 'docker':
-    ensure => running,
-    enable => true,
-  }
-
   file {'/etc/systemd/system/kubelet.service.d':
     ensure => 'directory',
-    }
+  }
 
   file {'/etc/systemd/system/kubelet.service.d/kubernetes.conf':
     ensure  => 'file',
@@ -26,19 +22,55 @@
     content => template('kubernetes/kubernetes.conf.erb'),
     require => File['/etc/systemd/system/kubelet.service.d'],
     notify  => Exec['Reload systemd'],
-    }
+  }
 
   exec { 'Reload systemd':
     path        => '/bin',
     command     => 'systemctl daemon-reload',
     refreshonly => true,
+  }
+
+  case $container_runtime {
+    'docker': {
+      service { 'docker':
+        ensure => running,
+        enable => true,
+      }
+
+      service {'kubelet':
+        ensure    => running,
+        enable    => true,
+        subscribe => File['/etc/systemd/system/kubelet.service.d/kubernetes.conf'],
+        require   => Service['docker'],
+      }
     }
 
-  service {'kubelet':
-    ensure    => running,
-    enable    => true,
-    subscribe => File['/etc/systemd/system/kubelet.service.d/kubernetes.conf'],
-    require   => Service['docker'],
+    'cri_containerd': {
+      service {'containerd':
+        ensure  => running,
+        enable  => true,
+        require => Exec['Reload systemd'],
+        before  => Service['kubelet'],
+      }
+
+      service {'cri-containerd':
+        ensure  => running,
+        enable  => true,
+        require => Exec['Reload systemd'],
+        before  => Service['kubelet'],
+      }
+
+      service {'kubelet':
+        ensure    => running,
+        enable    => true,
+        subscribe => File['/etc/systemd/system/kubelet.service.d/kubernetes.conf'],
+        require   => [Service['containerd'], Service['cri-containerd']],
+      }
+    }
+
+    default: {
+      fail('Please specify a valid container runtime')
+    }
   }
 
   if $bootstrap_controller {