updates for beta containerd on kube 1.9

Author: Dave Try

.fixtures.yml

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

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

@@ -5,10 +5,22 @@
   $kubernetes_package_version = $kubernetes::kubernetes_package_version,
   $container_runtime = $kubernetes::container_runtime,
   $cni_version = $kubernetes::cni_version,
+
 ) {
 
   $kube_packages = ['kubelet', 'kubectl']
 
+  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' : {
@@ -33,15 +45,15 @@
 
   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',
+      source      => $cri_source,
       destination => '/',
       timeout     => 0,
       verbose     => false,
     }
 
-  -> archive { 'cri-containerd-1.0.0-alpha.1.tar.gz':
+  -> archive { $cri_archive:
       ensure          => present,
-      path            => '/cri-containerd-1.0.0-alpha.1.tar.gz',
+      path            => "/${cri_archive}",
       extract         => true,
       extract_command => 'tar xfz %s --strip-components=1',
       extract_path    => '/',

metadata.json

@@ -10,7 +10,8 @@
   "dependencies": [
     {"name":"puppetlabs-stdlib","version_requirement":">= 4.19.0 < 5.0.0"},
     {"name":"puppetlabs-apt","version_requirement":">= 4.1.0 < 4.3.0"},
-    {"name":"stahnma-epel","version_requirement":">= 1.2.2 < 1.3.0"}
+    {"name":"stahnma-epel","version_requirement":">= 1.2.2 < 1.3.0"},
+    {"name":"maestrodev-wget"}
   ],
   "data_provider": null,
   "operatingsystem_support": [