Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

manage_packages for client and node set through kubernetes::node::kubelet #18

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

manage_packages for client and node set through kubernetes::node::kubelet #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c015da1
Allowing to set manage_package for kubernetes-node and kubernetes-cli…
Feb 2, 2017
1f4f6a2
fixed typos
Feb 2, 2017
a5dbaa4
Allowing to set manage_package for kubernetes-node and kubernetes-cli…
Feb 2, 2017
16e0976
Merge branch 'master' of https://github.com/davideagle/puppet-kubernetes
Feb 2, 2017
fcfa28c
removed node include
Feb 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions manifests/node.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, } ->
Expand Down
20 changes: 19 additions & 1 deletion manifests/node/kubelet.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -556,8 +566,16 @@
) inherits kubernetes::node::params {
validate_re($ensure, '^(running|stopped)$')
validate_bool($enable)
validate_bool($manage_package_node)
validate_bool($manage_package_client)

include ::kubernetes::node
class { '::kubernetes::node':
manage_package => $manage_package_node,
}

class { '::kubernetes::client':
manage_package => $manage_package_client,
}

if $cert_dir and ($tls_cert_file or $tls_private_key_file) {
fail('You can\'t use both of cert_dir and tls_*.')
Expand Down
2 changes: 2 additions & 0 deletions manifests/node/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down