add debian support as per PR#8

cristifalcas · Jun 13, 2016 · dd6701b · dd6701b
1 parent 278802c
commit dd6701b
Show file tree

Hide file tree

Showing 21 changed files with 224 additions and 128 deletions.
diff --git a/manifests/master.pp b/manifests/master.pp
@@ -1,6 +1,6 @@
 # == Class: kubernetes::master
 #
-# Module to install an up-to-date version of Docker from package.
+# Module to install an up-to-date version of kubernetes from package.
 #
 # === Parameters
 #

diff --git a/manifests/master/apiserver.pp b/manifests/master/apiserver.pp
@@ -324,6 +324,21 @@
     } ~> Service['kube-apiserver']
   }
 
+  case $::osfamily {
+    'redhat' : {
+    }
+    'debian' : {
+      file { '/etc/default/kube-apiserver':
+        ensure  => 'file',
+        force   => true,
+        content => template("${module_name}/etc/default/api-server.erb"),
+      } ~> Service['kube-apiserver']
+    }
+    default  : {
+      fail("Unsupport OS: ${::osfamily}")
+    }
+  }
+
   file { '/etc/kubernetes/apiserver':
     ensure  => 'file',
     force   => true,

diff --git a/manifests/master/controller_manager.pp b/manifests/master/controller_manager.pp
@@ -264,6 +264,21 @@
     } ~> Service['kube-controller-manager']
   }
 
+  case $::osfamily {
+    'redhat' : {
+    }
+    'debian' : {
+      file { '/etc/default/kube-controller-manager':
+        ensure  => 'file',
+        force   => true,
+        content => template("${module_name}/etc/default/controller-manager.erb"),
+      } ~> Service['kube-controller-manager']
+    }
+    default  : {
+      fail("Unsupport OS: ${::osfamily}")
+    }
+  }
+
   file { '/etc/kubernetes/controller-manager':
     ensure  => 'file',
     force   => true,

diff --git a/manifests/master/scheduler.pp b/manifests/master/scheduler.pp
@@ -120,6 +120,21 @@
     } ~> Service['kube-scheduler']
   }
 
+  case $::osfamily {
+    'redhat' : {
+    }
+    'debian' : {
+      file { '/etc/default/kube-scheduler':
+        ensure  => 'file',
+        force   => true,
+        content => template("${module_name}/etc/default/scheduler.erb"),
+      } ~> Service['kube-scheduler']
+    }
+    default  : {
+      fail("Unsupport OS: ${::osfamily}")
+    }
+  }
+
   file { '/etc/kubernetes/scheduler':
     ensure  => 'file',
     force   => true,

diff --git a/manifests/node/kube_proxy.pp b/manifests/node/kube_proxy.pp
@@ -176,6 +176,21 @@
     } ~> Service['kube-proxy']
   }
 
+  case $::osfamily {
+    'redhat' : {
+    }
+    'debian' : {
+      file { '/etc/default/kube-proxy':
+        ensure  => 'file',
+        force   => true,
+        content => template("${module_name}/etc/default/proxy.erb"),
+      } ~> Service['kube-proxy']
+    }
+    default  : {
+      fail("Unsupport OS: ${::osfamily}")
+    }
+  }
+
   file { '/etc/kubernetes/proxy':
     ensure  => 'file',
     content => template("${module_name}/etc/kubernetes/proxy.erb"),

diff --git a/manifests/node/kubelet.pp b/manifests/node/kubelet.pp
@@ -348,6 +348,21 @@
     } ~> Service['kubelet']
   }
 
+  case $::osfamily {
+    'redhat' : {
+    }
+    'debian' : {
+      file { '/etc/default/kubelet':
+        ensure  => 'file',
+        force   => true,
+        content => template("${module_name}/etc/default/kubelet.erb"),
+      } ~> Service['kubelet']
+    }
+    default  : {
+      fail("Unsupport OS: ${::osfamily}")
+    }
+  }
+
   file { '/etc/kubernetes/kubelet':
     ensure  => 'file',
     content => template("${module_name}/etc/kubernetes/kubelet.erb"),

diff --git a/spec/classes/kubernetes_client_spec.rb b/spec/classes/kubernetes_client_spec.rb
@@ -1,22 +1,21 @@
 require 'spec_helper'
 
 describe 'kubernetes::client', :type => :class do
-  context 'with defaults for all parameters on RedHat' do
-    let :facts do
-      {
-        :kernel   => 'Linux',
-        :osfamily => 'RedHat',
-      }
-    end
-    it 'test default install' do
-      is_expected.to compile.with_all_deps
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let :facts do
+          facts.merge({:puppetversion => Puppet.version})
+      end
+      it 'test default install' do
+        is_expected.to compile.with_all_deps
 
-      is_expected.to contain_class('kubernetes::client')
-      is_expected.to contain_package('kubernetes-client').with_ensure('present')
+        is_expected.to contain_class('kubernetes::client')
+        is_expected.to contain_package('kubernetes-client').with_ensure('present')
 
-      is_expected.to contain_file('/etc/kubernetes/').with({  'ensure'  => 'directory',  })
-      is_expected.to contain_file('/etc/kubernetes/config').with({  'ensure'  => 'file',  })
-      is_expected.to contain_file('/etc/kubernetes/config').with_content(/### file managed by puppet/)
+        is_expected.to contain_file('/etc/kubernetes/').with({  'ensure'  => 'directory',  })
+        is_expected.to contain_file('/etc/kubernetes/config').with({  'ensure'  => 'file',  })
+        is_expected.to contain_file('/etc/kubernetes/config').with_content(/### file managed by puppet/)
+      end
     end
   end
 end
diff --git a/spec/classes/kubernetes_master_apiserver_spec.rb b/spec/classes/kubernetes_master_apiserver_spec.rb
@@ -1,13 +1,10 @@
 require 'spec_helper'
 
 describe 'kubernetes::master::apiserver', :type => :class do
-  context 'with defaults for all parameters on RedHat' do
-    describe 'with minimum_version default' do
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
       let :facts do
-        {
-          :kernel   => 'Linux',
-          :osfamily => 'RedHat',
-        }
+        facts.merge({:puppetversion => Puppet.version})
       end
 
       let :params do
@@ -28,18 +25,18 @@
         should contain_service('kube-apiserver')
       end
     end
+  end
 
-    describe 'with minimum_version 1.2' do
-      let :params do
-        {
-          :service_cluster_ip_range  => '1.1.1.1',
-          :minimum_version           => '1.2',
-        }
-      end
+  describe 'with minimum_version 1.2' do
+    let :params do
+      {
+        :service_cluster_ip_range  => '1.1.1.1',
+        :minimum_version           => '1.2',
+      }
+    end
 
-      it 'test with param minimum_version set to 1.2' do
-        is_expected.to_not contain_file('/etc/kubernetes/etcd_config.json')
-      end
+    it 'test with param minimum_version set to 1.2' do
+      is_expected.to_not contain_file('/etc/kubernetes/etcd_config.json')
     end
   end
 end
diff --git a/spec/classes/kubernetes_master_controller_manager_spec.rb b/spec/classes/kubernetes_master_controller_manager_spec.rb
@@ -1,22 +1,22 @@
 require 'spec_helper'
 
-describe 'kubernetes::master::controller_manager', :type => :class do
-  context 'with defaults for all parameters on RedHat' do
-    let :facts do
-      {
-        :kernel   => 'Linux',
-        :osfamily => 'RedHat',
-      }
-    end
-    it 'test default install' do
-      is_expected.to compile.with_all_deps
-      is_expected.to contain_class('kubernetes::master')
-      is_expected.to contain_class('kubernetes::master::controller_manager')
-      is_expected.to contain_class('kubernetes::master::params')
+describe 'kubernetes::master::controller_manager', :type => :class  do
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let :facts do
+        facts.merge({:puppetversion => Puppet.version})
+      end
+
+      it 'test default install' do
+        is_expected.to compile.with_all_deps
+        is_expected.to contain_class('kubernetes::master')
+        is_expected.to contain_class('kubernetes::master::controller_manager')
+        is_expected.to contain_class('kubernetes::master::params')
 
-      is_expected.to contain_file('/etc/kubernetes/controller-manager').with({  'ensure'  => 'file',  })
-      is_expected.to contain_file('/etc/kubernetes/controller-manager').with_content(/### file managed by puppet/)
-      is_expected.to contain_service('kube-controller-manager')
+        is_expected.to contain_file('/etc/kubernetes/controller-manager').with({  'ensure'  => 'file',  })
+        is_expected.to contain_file('/etc/kubernetes/controller-manager').with_content(/### file managed by puppet/)
+        is_expected.to contain_service('kube-controller-manager')
+      end
     end
   end
 end
diff --git a/spec/classes/kubernetes_master_scheduler_spec.rb b/spec/classes/kubernetes_master_scheduler_spec.rb
@@ -1,22 +1,22 @@
 require 'spec_helper'
 
-describe 'kubernetes::master::scheduler', :type => :class do
-  context 'with defaults for all parameters on RedHat' do
-    let :facts do
-      {
-        :kernel   => 'Linux',
-        :osfamily => 'RedHat',
-      }
-    end
-    it 'test default install' do
-      is_expected.to compile.with_all_deps
-      is_expected.to contain_class('kubernetes::master')
-      is_expected.to contain_class('kubernetes::master::scheduler')
-      is_expected.to contain_class('kubernetes::master::params')
+describe 'kubernetes::master::scheduler', :type => :class  do
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let :facts do
+        facts.merge({:puppetversion => Puppet.version})
+      end
+
+      it 'test default install' do
+        is_expected.to compile.with_all_deps
+        is_expected.to contain_class('kubernetes::master')
+        is_expected.to contain_class('kubernetes::master::scheduler')
+        is_expected.to contain_class('kubernetes::master::params')
 
-      is_expected.to contain_file('/etc/kubernetes/scheduler').with({  'ensure'  => 'file',  })
-      is_expected.to contain_file('/etc/kubernetes/scheduler').with_content(/### file managed by puppet/)
-      is_expected.to contain_service('kube-scheduler')
+        is_expected.to contain_file('/etc/kubernetes/scheduler').with({  'ensure'  => 'file',  })
+        is_expected.to contain_file('/etc/kubernetes/scheduler').with_content(/### file managed by puppet/)
+        is_expected.to contain_service('kube-scheduler')
+      end
     end
   end
 end
diff --git a/spec/classes/kubernetes_master_spec.rb b/spec/classes/kubernetes_master_spec.rb
@@ -1,20 +1,20 @@
 require 'spec_helper'
 
 describe 'kubernetes::master', :type => :class do
-  context 'with defaults for all parameters on RedHat' do
-    let :facts do
-      {
-        :kernel   => 'Linux',
-        :osfamily => 'RedHat',
-      }
-    end
-    it 'test default install' do
-      is_expected.to compile.with_all_deps
-      is_expected.to contain_class('kubernetes::client')
-      is_expected.to contain_class('kubernetes::master')
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let :facts do
+        facts.merge({:puppetversion => Puppet.version})
+      end
+
+      it 'test default install' do
+        is_expected.to compile.with_all_deps
+        is_expected.to contain_class('kubernetes::client')
+        is_expected.to contain_class('kubernetes::master')
 
-      is_expected.to contain_package('kubernetes-master').with_ensure('present')
-      is_expected.to contain_file('/etc/kubernetes/').with({ 'ensure'  => 'directory',  })
+        is_expected.to contain_package('kubernetes-master').with_ensure('present')
+        is_expected.to contain_file('/etc/kubernetes/').with({ 'ensure'  => 'directory',  })
+      end
     end
   end
 end
diff --git a/spec/classes/kubernetes_node_kube_proxy_spec.rb b/spec/classes/kubernetes_node_kube_proxy_spec.rb
@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe 'kubernetes::node::kube_proxy', :type => :class do
-  context 'with defaults for all parameters on RedHat' do
-    let :facts do
-      {
-        :kernel   => 'Linux',
-        :osfamily => 'RedHat',
-      }
-    end
-    it 'test default install' do
-      is_expected.to compile.with_all_deps
-      is_expected.to contain_class('kubernetes::node')
-      is_expected.to contain_class('kubernetes::node::kube_proxy')
-      is_expected.to contain_class('kubernetes::node::params')
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let :facts do
+        facts.merge({:puppetversion => Puppet.version})
+      end
+
+      it 'test default install' do
+        is_expected.to compile.with_all_deps
+        is_expected.to contain_class('kubernetes::node')
+        is_expected.to contain_class('kubernetes::node::kube_proxy')
+        is_expected.to contain_class('kubernetes::node::params')
 
-      is_expected.to contain_file('/etc/kubernetes/proxy').with({ 'ensure'  => 'file',  })
-      is_expected.to contain_file('/etc/kubernetes/proxy').with_content(/### file managed by puppet/)
-      is_expected.to contain_service('kube-proxy')
+        is_expected.to contain_file('/etc/kubernetes/proxy').with({ 'ensure'  => 'file',  })
+        is_expected.to contain_file('/etc/kubernetes/proxy').with_content(/### file managed by puppet/)
+        is_expected.to contain_service('kube-proxy')
+      end
     end
   end
 end
diff --git a/spec/classes/kubernetes_node_kubelet_spec.rb b/spec/classes/kubernetes_node_kubelet_spec.rb
@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe 'kubernetes::node::kubelet', :type => :class do
-  context 'with defaults for all parameters on RedHat' do
-    let :facts do
-      {
-        :kernel   => 'Linux',
-        :osfamily => 'RedHat',
-      }
-    end
-    it 'test default install' do
-      is_expected.to compile.with_all_deps
-      is_expected.to contain_class('kubernetes::node')
-      is_expected.to contain_class('kubernetes::node::kubelet')
-      is_expected.to contain_class('kubernetes::node::params')
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let :facts do
+        facts.merge({:puppetversion => Puppet.version})
+      end
+
+      it 'test default install' do
+        is_expected.to compile.with_all_deps
+        is_expected.to contain_class('kubernetes::node')
+        is_expected.to contain_class('kubernetes::node::kubelet')
+        is_expected.to contain_class('kubernetes::node::params')
 
-      is_expected.to contain_file('/etc/kubernetes/kubelet').with({ 'ensure'  => 'file', })
-      is_expected.to contain_file('/etc/kubernetes/kubelet').with_content(/### file managed by puppet/)
-      is_expected.to contain_service('kubelet')
+        is_expected.to contain_file('/etc/kubernetes/kubelet').with({ 'ensure'  => 'file', })
+        is_expected.to contain_file('/etc/kubernetes/kubelet').with_content(/### file managed by puppet/)
+        is_expected.to contain_service('kubelet')
+      end
     end
   end
 end