diff --git a/manifests/init.pp b/manifests/init.pp index 94c4479..81f39e0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,21 +1,8 @@ # Class: kubernetes # -# This module manages kubernetes +# This module manages nothing. # -# Parameters: +# Parameters: None # -# [*ensure*] -# Set package version to be installed or use 'installed'/'latest' -# Defaults to installed -# -class kubernetes ($ensure = 'installed',) { - # /etc/kubernetes/config is managed by both master and node rpms - # so we take care of it here - package { 'kubernetes-client': ensure => $ensure, } -> - file { '/etc/kubernetes/': ensure => 'directory', } -> - file { '/etc/kubernetes/config': - ensure => 'file', - force => true, - content => template("${module_name}/etc/kubernetes/config.erb"), - } +class kubernetes { } diff --git a/manifests/master.pp b/manifests/master.pp index b5edcf3..9330982 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -9,7 +9,7 @@ # Defaults to present # class kubernetes::master ($ensure = 'present',) { - include ::kubernetes + include ::kubernetes::client # this should ensure also that all files from /etc/kubernetes are managed after package install package { 'kubernetes-master': ensure => $ensure, } -> File['/etc/kubernetes/'] diff --git a/manifests/node.pp b/manifests/node.pp index 6da8a7a..ba20211 100644 --- a/manifests/node.pp +++ b/manifests/node.pp @@ -9,7 +9,7 @@ # Defaults to present # class kubernetes::node ($ensure = 'present',) { - include ::kubernetes + include ::kubernetes::client # this should ensure also that all files from /etc/kubernetes are managed after package install package { ['kubernetes-node']: ensure => $ensure, } -> File['/etc/kubernetes/'] -> diff --git a/manifests/node/kubelet.pp b/manifests/node/kubelet.pp index 4dac13a..eaa0c9f 100644 --- a/manifests/node/kubelet.pp +++ b/manifests/node/kubelet.pp @@ -233,7 +233,7 @@ # # [*args*] # Add your own! - +# class kubernetes::node::kubelet ( $ensure = $kubernetes::node::params::kubelet_service_ensure, $enable = $kubernetes::node::params::kubelet_service_enable, diff --git a/metadata.json b/metadata.json index 73167aa..cf32ce9 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "cristifalcas-kubernetes", - "version": "1.0.0", + "version": "1.1.0", "author": "Cristian Falcas", "license": "Apache-2.0", "summary": "Configuring and installing kubernetes", @@ -43,7 +43,7 @@ "version_requirement": "4.x" },{ "name": "puppetlabs/concat", - "version_requirement": "1.x" + "version_requirement": "2.x" },{ "name": "cristifalcas/docker", "version_requirement": "5.x"