final commit for cri-containerd

scott coulton · scott coulton · commit 85c1cea262ee · 2017-12-11T14:20:02.000+11:00
diff --git a/README.md b/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.
diff --git a/manifests/config.pp b/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,
diff --git a/manifests/init.pp b/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,
diff --git a/manifests/packages.pp b/manifests/packages.pp
@@ -3,31 +3,54 @@
 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':
+  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      => 'https://github.com/kubernetes-incubator/cri-containerd/releases/download/v1.0.0-alpha.1/cri-containerd-1.0.0-alpha.1.tar.gz',
+      destination => '/',
+      timeout     => 0,
+      verbose     => false,
     }
 
-  package { 'kubernetes-cni':
-    ensure => $cni_version,
+  -> archive { 'cri-containerd-1.0.0-alpha.1.tar.gz':
+      ensure          => present,
+      path            => '/cri-containerd-1.0.0-alpha.1.tar.gz',
+      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,
     }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -5,16 +5,17 @@
 case $::osfamily {
   'Debian' : {
     $kubernetes_package_version = '1.7.3-01'
-    $cni_version = '0.5.1-00'
+    $cni_version = '0.6.0-00'
   }
   'RedHat' : {
     $kubernetes_package_version = '1.7.3'
-    $cni_version = '0.5.1'
+    $cni_version = '0.6.0'
   }
   default: { notify {"The OS family ${::os_family} is not supported by this module":} }
 }
 $kubernetes_version = '1.7.3'
 $kube_dns_version = '1.14.2'
+$container_runtime = 'docker'
 $kubernetes_fqdn = 'kubernetes'
 $controller = false
 $bootstrap_controller = false
diff --git a/manifests/repos.pp b/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':
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -4,14 +4,25 @@
 
   $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\"]}'")
 
+  if $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'],
+    }
   }
 
   file {'/etc/systemd/system/kubelet.service.d':
@@ -34,13 +45,30 @@
     refreshonly => true,
     }
 
+  if $container_runtime == '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['docker'],
+    require   => [Service['containerd'], Service['cri-containerd']],
   }
 
+}
   if $bootstrap_controller {
 
     exec {'Checking for the Kubernets cluster to be ready':
diff --git a/spec/classes/config_spec.rb b/spec/classes/config_spec.rb
@@ -15,6 +15,7 @@
   let(:params) do
     {
       'kubernetes_version' => '1.7.3',
+      'container_runtime' => 'docker',
       'kube_dns_version' => '1.14.2',
       'controller' => true,
       'bootstrap_controller' => false,
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -48,4 +48,4 @@
     it { should contain_class('kubernetes::config')}
     it { should contain_class('kubernetes::service')}
   end
-end
+end
diff --git a/spec/classes/packages_spec.rb b/spec/classes/packages_spec.rb
@@ -3,6 +3,7 @@
   let(:facts) { { :osfamily => 'Debian' } }
   let(:params) do
     {
+      'container_runtime' => 'docker',
       'kubernetes_package_version' => '1.7.3-01',
       'cni_version' => '0.5.1-00',
     }
diff --git a/spec/classes/repos_spec.rb b/spec/classes/repos_spec.rb
@@ -14,7 +14,7 @@
       }
     end
 
-    let(:params) { { 'manage_epel' => false } }
+    let(:params) { { 'manage_epel' => false, 'container_runtime' => 'docker' } }
 
     it { should contain_apt__source('kubernetes') }
     it { should contain_apt__source('docker') }
@@ -30,10 +30,10 @@
       }
     end
 
-    let(:params) { { 'manage_epel' => true } }
+    let(:params) { { 'manage_epel' => true, 'container_runtime' => 'docker' } }
 
     it { should contain_class('epel') }
     it { should contain_yumrepo('docker') }
     it { should contain_yumrepo('kubernetes') }
   end
-end
+end
diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
@@ -15,7 +15,8 @@
   context 'with defaults for all params' do
     let(:params) do
       {
-        'controller' => false,
+        'container_runtime' => 'docker',
+	'controller' => false,
         'bootstrap_controller' => false,
         'etcd_ip' => '127.0.0.1',
       }
@@ -31,12 +32,13 @@
   context 'with bootstrap_controller => yes' do
     let(:params) do
       {
-        'bootstrap_controller' => true,
+        'container_runtime' => 'docker',
+	'bootstrap_controller' => true,
         'controller' => true,
         'etcd_ip' => '127.0.0.1',
       }
     end
 
     it { should contain_exec('Checking for the Kubernets cluster to be ready')}
   end
-end
+end
diff --git a/templates/kubernetes.conf.erb b/templates/kubernetes.conf.erb
@@ -1,5 +1,10 @@
 [Service]
+<% if @container_runtime == 'docker' -%>
 Environment="KUBELET_KUBECONFIG_ARGS=--kubeconfig=/etc/kubernetes/kubelet.conf --require-kubeconfig=true"
+<% end %>
+<% if @container_runtime == 'cri_containerd' -%> 
+	Environment="KUBELET_KUBECONFIG_ARGS=--kubeconfig=/etc/kubernetes/kubelet.conf --require-kubeconfig=true --container-runtime-endpoint=unix:///var/run/cri-containerd.sock --container-runtime=remote" 
+<% end %>
 Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests --allow-privileged=true"
 Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin"
 Environment="KUBELET_DNS_ARGS=--cluster-dns=10.96.0.10 --cluster-domain=cluster.local"

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`let(:params) do`
`16`	`16`	`{`
`17`	`17`	`'kubernetes_version' => '1.7.3',`
	`18`	`+ 'container_runtime' => 'docker',`
`18`	`19`	`'kube_dns_version' => '1.14.2',`
`19`	`20`	`'controller' => true,`
`20`	`21`	`'bootstrap_controller' => false,`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`let(:facts) { { :osfamily => 'Debian' } }`
`4`	`4`	`let(:params) do`
`5`	`5`	`{`
	`6`	`+ 'container_runtime' => 'docker',`
`6`	`7`	`'kubernetes_package_version' => '1.7.3-01',`
`7`	`8`	`'cni_version' => '0.5.1-00',`
`8`	`9`	`}`