From 6a18b55f90a4006a2934d6e9a46a111ade38ee9d Mon Sep 17 00:00:00 2001
From: Mikhail Petrov <mikhail.petrov@lazada.com>
Date: Thu, 8 Feb 2018 21:06:02 +0300
Subject: [PATCH] bootstrap-config

---
 manifests/node/kubelet.pp            | 6 +++---
 manifests/node/params.pp             | 2 +-
 templates/etc/kubernetes/kubelet.erb | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/node/kubelet.pp b/manifests/node/kubelet.pp
index 9a6b6f3..b7483e0 100644
--- a/manifests/node/kubelet.pp
+++ b/manifests/node/kubelet.pp
@@ -201,8 +201,8 @@
 #   Comma-separated whitelist of unsafe sysctls or unsafe sysctl patterns (ending in *). Use these at your own risk.
 #   Defaults to undef
 #
-# [*experimental_bootstrap_kubeconfig*]
-#   <Warning: Experimental feature> Path to a kubeconfig file that will be used to get client certificate for kubelet.
+# [*bootstrap_kubeconfig*]
+#   Path to a kubeconfig file that will be used to get client certificate for kubelet.
 #   If the file specified by --kubeconfig does not exist, the bootstrap kubeconfig is used to request a client certificate
 #   from the API server. On success, a kubeconfig file referencing the generated key and obtained certificate is written
 #   to the path specified by --kubeconfig. The certificate and key file will be stored in the directory pointed by --cert-dir.
@@ -566,7 +566,7 @@
   $eviction_soft_grace_period                        = $kubernetes::node::params::kubelet_eviction_soft_grace_period,
   $exit_on_lock_contention                           = $kubernetes::node::params::kubelet_exit_on_lock_contention,
   $experimental_allowed_unsafe_sysctls               = $kubernetes::node::params::kubelet_experimental_allowed_unsafe_sysctls,
-  $experimental_bootstrap_kubeconfig                 = $kubernetes::node::params::kubelet_experimental_bootstrap_kubeconfig,
+  $bootstrap_kubeconfig                              = $kubernetes::node::params::kubelet_bootstrap_kubeconfig,
   $experimental_cgroups_per_qos                      = $kubernetes::node::params::kubelet_experimental_cgroups_per_qos,
   $experimental_check_node_capabilities_before_mount = $kubernetes::node::params::kubelet_experimental_check_node_capabilities_before_mount,
   $experimental_cri                                  = $kubernetes::node::params::kubelet_experimental_cri,
diff --git a/manifests/node/params.pp b/manifests/node/params.pp
index 244819c..1e17910 100644
--- a/manifests/node/params.pp
+++ b/manifests/node/params.pp
@@ -48,7 +48,7 @@
   $kubelet_eviction_soft_grace_period = undef
   $kubelet_exit_on_lock_contention = undef
   $kubelet_experimental_allowed_unsafe_sysctls = undef
-  $kubelet_experimental_bootstrap_kubeconfig = undef
+  $kubelet_bootstrap_kubeconfig = undef
   $kubelet_experimental_cgroups_per_qos = undef
   $kubelet_experimental_check_node_capabilities_before_mount = undef
   $kubelet_experimental_cri = undef
diff --git a/templates/etc/kubernetes/kubelet.erb b/templates/etc/kubernetes/kubelet.erb
index 1d74f6c..2291f1f 100644
--- a/templates/etc/kubernetes/kubelet.erb
+++ b/templates/etc/kubernetes/kubelet.erb
@@ -131,8 +131,8 @@ KUBELET_ARGS="<% -%>
 <% if @experimental_allowed_unsafe_sysctls -%>
   --experimental-allowed-unsafe-sysctls=<%= scope['kubernetes::node::kubelet::experimental_allowed_unsafe_sysctls'] -%>
 <% end -%>
-<% if @experimental_bootstrap_kubeconfig -%>
-  --experimental-bootstrap-kubeconfig=<%= scope['kubernetes::node::kubelet::experimental_bootstrap_kubeconfig'] -%>
+<% if @bootstrap_kubeconfig -%>
+  --bootstrap-kubeconfig=<%= scope['kubernetes::node::kubelet::bootstrap_kubeconfig'] -%>
 <% end -%>
 <% if @experimental_cgroups_per_qos -%>
   --experimental-cgroups-per-qos=<%= scope['kubernetes::node::kubelet::experimental_cgroups_per_qos'] -%>