From c015da10c4ef22a20bdcafa94a80829a26b12988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dav=C3=AD=C3=B0=20=C3=96rn=20J=C3=B3hannsson?= Date: Thu, 2 Feb 2017 13:47:22 +0000 Subject: [PATCH 1/4] Allowing to set manage_package for kubernetes-node and kubernetes-client packages --- manifests/node.pp | 2 -- manifests/node/kubelet.pp | 20 ++++++++++++++++++++ manifests/node/params.pp | 2 ++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/manifests/node.pp b/manifests/node.pp index 0d0b2f9..5cde0ef 100644 --- a/manifests/node.pp +++ b/manifests/node.pp @@ -18,8 +18,6 @@ ) { validate_string($ensure) - include ::kubernetes::client - if $manage_package { # this should ensure also that all files from /etc/kubernetes are managed after package install package { ['kubernetes-node']: ensure => $ensure, } -> diff --git a/manifests/node/kubelet.pp b/manifests/node/kubelet.pp index b2200a3..fb9f199 100644 --- a/manifests/node/kubelet.pp +++ b/manifests/node/kubelet.pp @@ -267,6 +267,14 @@ # If true, kubelet will ensure iptables utility rules are present on host. # Defaults to undef. (default true) # +# [*manage_package_client*] +# Wether to manage installation of kubernetes-client package +# Defaults to true +# +# [*manage_package_node*] +# Wether to manage installation of kubernetes-node package +# Defaults to true +# # [*manifest_url*] # URL for accessing the container manifest # Defaults to undef @@ -511,6 +519,8 @@ $lock_file = $kubernetes::node::params::kubelet_lock_file, $low_diskspace_threshold_mb = $kubernetes::node::params::kubelet_low_diskspace_threshold_mb, $make_iptables_util_chains = $kubernetes::node::params::kubelet_make_iptables_util_chains, + $manage_package_client = $kubernetes::node::params::kubelet_manage_package_client, + $manage_package_node = $kubernetes::node::params::kubelet_manage_package_node, $manifest_url = $kubernetes::node::params::kubelet_manifest_url, $manifest_url_header = $kubernetes::node::params::kubelet_manifest_url_header, $master_service_namespace = $kubernetes::node::params::kubelet_master_service_namespace, @@ -556,6 +566,16 @@ ) inherits kubernetes::node::params { validate_re($ensure, '^(running|stopped)$') validate_bool($enable) + validate_bool($manage_package_node) + validate_bool($manage_package_client) + + class { ':kubernetes::node': + manage_package => $manage_package_node, + } + + class { ':kubernetes::node': + manage_package => $manage_package_client, + } include ::kubernetes::node diff --git a/manifests/node/params.pp b/manifests/node/params.pp index 55185a1..5da5b52 100644 --- a/manifests/node/params.pp +++ b/manifests/node/params.pp @@ -64,6 +64,8 @@ $kubelet_lock_file = undef $kubelet_low_diskspace_threshold_mb = 256 $kubelet_make_iptables_util_chains = undef + $kubelet_manage_package_client = true + $kubelet_manage_package_node = true $kubelet_manifest_url = undef $kubelet_manifest_url_header = undef $kubelet_master_service_namespace = undef From 1f4f6a2f1054d215d3501ebb3200639b5b0cea74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dav=C3=AD=C3=B0=20=C3=96rn=20J=C3=B3hannsson?= Date: Thu, 2 Feb 2017 13:54:22 +0000 Subject: [PATCH 2/4] fixed typos --- manifests/node/kubelet.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/node/kubelet.pp b/manifests/node/kubelet.pp index fb9f199..ed0db48 100644 --- a/manifests/node/kubelet.pp +++ b/manifests/node/kubelet.pp @@ -569,11 +569,11 @@ validate_bool($manage_package_node) validate_bool($manage_package_client) - class { ':kubernetes::node': + class { '::kubernetes::node': manage_package => $manage_package_node, } - class { ':kubernetes::node': + class { '::kubernetes::client': manage_package => $manage_package_client, } From a5dbaa4f8954c234b5ed049ff85ca33235821040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dav=C3=AD=C3=B0=20=C3=96rn=20J=C3=B3hannsson?= Date: Thu, 2 Feb 2017 13:47:22 +0000 Subject: [PATCH 3/4] Allowing to set manage_package for kubernetes-node and kubernetes-client packages fixed typos --- manifests/node.pp | 2 -- manifests/node/kubelet.pp | 20 ++++++++++++++++++++ manifests/node/params.pp | 2 ++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/manifests/node.pp b/manifests/node.pp index 0d0b2f9..5cde0ef 100644 --- a/manifests/node.pp +++ b/manifests/node.pp @@ -18,8 +18,6 @@ ) { validate_string($ensure) - include ::kubernetes::client - if $manage_package { # this should ensure also that all files from /etc/kubernetes are managed after package install package { ['kubernetes-node']: ensure => $ensure, } -> diff --git a/manifests/node/kubelet.pp b/manifests/node/kubelet.pp index b2200a3..ed0db48 100644 --- a/manifests/node/kubelet.pp +++ b/manifests/node/kubelet.pp @@ -267,6 +267,14 @@ # If true, kubelet will ensure iptables utility rules are present on host. # Defaults to undef. (default true) # +# [*manage_package_client*] +# Wether to manage installation of kubernetes-client package +# Defaults to true +# +# [*manage_package_node*] +# Wether to manage installation of kubernetes-node package +# Defaults to true +# # [*manifest_url*] # URL for accessing the container manifest # Defaults to undef @@ -511,6 +519,8 @@ $lock_file = $kubernetes::node::params::kubelet_lock_file, $low_diskspace_threshold_mb = $kubernetes::node::params::kubelet_low_diskspace_threshold_mb, $make_iptables_util_chains = $kubernetes::node::params::kubelet_make_iptables_util_chains, + $manage_package_client = $kubernetes::node::params::kubelet_manage_package_client, + $manage_package_node = $kubernetes::node::params::kubelet_manage_package_node, $manifest_url = $kubernetes::node::params::kubelet_manifest_url, $manifest_url_header = $kubernetes::node::params::kubelet_manifest_url_header, $master_service_namespace = $kubernetes::node::params::kubelet_master_service_namespace, @@ -556,6 +566,16 @@ ) inherits kubernetes::node::params { validate_re($ensure, '^(running|stopped)$') validate_bool($enable) + validate_bool($manage_package_node) + validate_bool($manage_package_client) + + class { '::kubernetes::node': + manage_package => $manage_package_node, + } + + class { '::kubernetes::client': + manage_package => $manage_package_client, + } include ::kubernetes::node diff --git a/manifests/node/params.pp b/manifests/node/params.pp index 55185a1..5da5b52 100644 --- a/manifests/node/params.pp +++ b/manifests/node/params.pp @@ -64,6 +64,8 @@ $kubelet_lock_file = undef $kubelet_low_diskspace_threshold_mb = 256 $kubelet_make_iptables_util_chains = undef + $kubelet_manage_package_client = true + $kubelet_manage_package_node = true $kubelet_manifest_url = undef $kubelet_manifest_url_header = undef $kubelet_master_service_namespace = undef From fcfa28cfde6425587af0bfd14170eb6f41ac4f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dav=C3=AD=C3=B0=20=C3=96rn=20J=C3=B3hannsson?= Date: Thu, 2 Feb 2017 14:14:26 +0000 Subject: [PATCH 4/4] removed node include --- manifests/node/kubelet.pp | 2 -- 1 file changed, 2 deletions(-) diff --git a/manifests/node/kubelet.pp b/manifests/node/kubelet.pp index ed0db48..005e4d6 100644 --- a/manifests/node/kubelet.pp +++ b/manifests/node/kubelet.pp @@ -577,8 +577,6 @@ manage_package => $manage_package_client, } - include ::kubernetes::node - if $cert_dir and ($tls_cert_file or $tls_private_key_file) { fail('You can\'t use both of cert_dir and tls_*.') }