Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391806 )
Change subject: Add kubeconfig parameter to k8s::proxy
......................................................................
Add kubeconfig parameter to k8s::proxy
Add a parameter to kubeproxy and the including profile that allows
specifying the configuration file that should be used by kubeproxy.
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: I6f5c5518136a81bc5a51d39c6745abb13259f780
---
M modules/k8s/manifests/proxy.pp
M modules/k8s/templates/kube-proxy.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/proxy.pp b/modules/k8s/manifests/proxy.pp
index a890ea8..9d410e9 100644
--- a/modules/k8s/manifests/proxy.pp
+++ b/modules/k8s/manifests/proxy.pp
@@ -2,6 +2,7 @@
$master_host,
$proxy_mode = 'iptables',
$masquerade_all = true,
+ $kubeconfig = '/etc/kubernetes/kubeconfig',
) {
require ::k8s::infrastructure_config
@@ -31,7 +32,7 @@
service { 'kube-proxy':
ensure => running,
subscribe => [
- File['/etc/kubernetes/kubeconfig'],
+ File[$kubeconfig],
File['/etc/default/kube-proxy'],
],
diff --git a/modules/k8s/templates/kube-proxy.default.erb
b/modules/k8s/templates/kube-proxy.default.erb
index 1f13d54..6c9d65d 100644
--- a/modules/k8s/templates/kube-proxy.default.erb
+++ b/modules/k8s/templates/kube-proxy.default.erb
@@ -4,7 +4,7 @@
# default config should be adequate
<%-
-daemon_args = ['--kubeconfig=/etc/kubernetes/kubeconfig']
+daemon_args = ["--kubeconfig=#{@kubeconfig}"]
if @proxy_mode
daemon_args.push("--proxy-mode='#{@proxy_mode}'")
end
diff --git a/modules/profile/manifests/kubernetes/node.pp
b/modules/profile/manifests/kubernetes/node.pp
index 9e085fc..c49b3e2 100644
--- a/modules/profile/manifests/kubernetes/node.pp
+++ b/modules/profile/manifests/kubernetes/node.pp
@@ -7,6 +7,7 @@
$username = hiera('profile::kubernetes::node::username',
'client-infrastructure'),
$prometheus_nodes = hiera('prometheus_nodes', []),
$kubelet_config = hiera('profile::kubernetes::node::kubelet_config',
'/etc/kubernetes/kubeconfig'),
+ $kubeproxy_config = hiera('profile::kubernetes::node::kubeproxy_config',
'/etc/kubernetes/kubeconfig'),
) {
base::expose_puppet_certs { '/etc/kubernetes':
@@ -34,6 +35,7 @@
class { '::k8s::proxy':
master_host => $master_fqdn,
masquerade_all => $masquerade_all,
+ kubeconfig => $kubeproxy_config,
}
$master_hosts_ferm = join($master_hosts, ' ')
--
To view, visit https://gerrit.wikimedia.org/r/391806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f5c5518136a81bc5a51d39c6745abb13259f780
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
