Kubelet docs are missing now the api-servers param and was removed. R…

…eadd it as a class parameter.
cristifalcas · Oct 6, 2016 · 91e1ebb · 91e1ebb
1 parent df73cab
commit 91e1ebb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/manifests/node/kubelet.pp b/manifests/node/kubelet.pp
@@ -31,6 +31,11 @@
 #   If true, allow containers to request privileged mode.
 #   Defaults to false
 #
+# [*api_servers*]
+#   List of Kubernetes API servers for publishing events, and reading pods and services. (ip:port), comma separated.
+#   Type: Array or String
+#   Defaults to 'http://127.0.0.1:8080'
+#
 # [*cadvisor_port*]
 #   The port of the localhost cAdvisor endpoint
 #   Defaults to undef
@@ -449,6 +454,7 @@
   $pod_manifest_path_purge               = $kubernetes::node::params::kubelet_pod_manifest_path_purge,
   $address                               = $kubernetes::node::params::kubelet_address,
   $allow_privileged                      = $kubernetes::node::params::kubelet_allow_privileged,
+  $api_servers                           = $kubernetes::node::params::kubelet_api_servers,
   $cadvisor_port                         = $kubernetes::node::params::kubelet_cadvisor_port,
   $cert_dir                              = $kubernetes::node::params::kubelet_cert_dir,
   $cgroup_root                           = $kubernetes::node::params::kubelet_cgroup_root,

diff --git a/manifests/node/params.pp b/manifests/node/params.pp
@@ -10,6 +10,7 @@
   $kubelet_pod_manifest_path_purge = false
   $kubelet_address = '0.0.0.0'
   $kubelet_allow_privileged = false
+  $kubelet_api_servers = ['http://127.0.0.1:8080']
   $kubelet_cadvisor_port = undef
   $kubelet_cert_dir = undef
   $kubelet_cgroup_root = undef

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
 	"name": "cristifalcas-kubernetes",
-	"version": "3.1.1",
+	"version": "3.2.0",
 	"author": "Cristian Falcas",
 	"license": "Apache-2.0",
 	"summary": "Configuring and installing kubernetes",

diff --git a/templates/etc/kubernetes/kubelet.erb b/templates/etc/kubernetes/kubelet.erb
@@ -10,6 +10,9 @@ KUBELET_PORT="--port=<%= scope['kubernetes::node::kubelet::port'] %>"
 # You may leave this blank to use the actual hostname
 KUBELET_HOSTNAME="--hostname-override=<%= scope['kubernetes::node::kubelet::hostname_override'] %>"
 
+# location of the api-server
+KUBELET_API_SERVER="--api-servers=<%= Array(scope['kubernetes::node::kubelet::api_servers']).join(',') %>" 
+
 # Add your own!
 KUBELET_ARGS="<% -%>
  --allow-privileged=<%= scope['kubernetes::node::kubelet::allow_privileged'] -%>