Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391805 )
Change subject: Add parameter for kubelet's kubeconfig
......................................................................
Add parameter for kubelet's kubeconfig
Add a parameter to kubelet and the including profile that allows
specifying the configuration file that should be used by kubelet.
Amend templates to support that. The reason we are going forward
with this is to maintain compatibility with labs while allowing specifying
different users to be defined
Bug: T177393
Change-Id: I97fdfe78dd815c896579e9175780c2cfcf29cae4
---
M modules/k8s/manifests/kubelet.pp
M modules/k8s/templates/kubelet.default.erb
M modules/profile/manifests/kubernetes/node.pp
3 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/k8s/manifests/kubelet.pp b/modules/k8s/manifests/kubelet.pp
index b835344..08e7273 100644
--- a/modules/k8s/manifests/kubelet.pp
+++ b/modules/k8s/manifests/kubelet.pp
@@ -10,6 +10,7 @@
$cni=false,
$cni_bin_dir='/opt/cni/bin',
$cni_conf_dir='/etc/cni/net.d',
+ $kubeconfig='/etc/kubernetes/kubeconfig',
) {
require ::k8s::infrastructure_config
@@ -40,7 +41,7 @@
service { 'kubelet':
ensure => running,
subscribe => [
- File['/etc/kubernetes/kubeconfig'],
+ File[$kubeconfig],
File['/etc/default/kubelet'],
],
}
diff --git a/modules/k8s/templates/kubelet.default.erb
b/modules/k8s/templates/kubelet.default.erb
index 118009f..d4171cc 100644
--- a/modules/k8s/templates/kubelet.default.erb
+++ b/modules/k8s/templates/kubelet.default.erb
@@ -25,7 +25,7 @@
<%-
daemon_args = [
- '--kubeconfig=/etc/kubernetes/kubeconfig',
+ "--kubeconfig=#{@kubeconfig}",
]
if @pod_infra_container_image
diff --git a/modules/profile/manifests/kubernetes/node.pp
b/modules/profile/manifests/kubernetes/node.pp
index 1763df5..9e085fc 100644
--- a/modules/profile/manifests/kubernetes/node.pp
+++ b/modules/profile/manifests/kubernetes/node.pp
@@ -6,6 +6,7 @@
$masquerade_all = hiera('profile::kubernetes::node::masquerade_all', true),
$username = hiera('profile::kubernetes::node::username',
'client-infrastructure'),
$prometheus_nodes = hiera('prometheus_nodes', []),
+ $kubelet_config = hiera('profile::kubernetes::node::kubelet_config',
'/etc/kubernetes/kubeconfig'),
) {
base::expose_puppet_certs { '/etc/kubernetes':
@@ -28,6 +29,7 @@
cluster_domain => undef,
tls_cert => '/etc/kubernetes/ssl/cert.pem',
tls_key => '/etc/kubernetes/ssl/server.key',
+ kubeconfig => $kubelet_config,
}
class { '::k8s::proxy':
master_host => $master_fqdn,
--
To view, visit https://gerrit.wikimedia.org/r/391805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97fdfe78dd815c896579e9175780c2cfcf29cae4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
