Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/288761
Change subject: tools: Enable host automounts
......................................................................
tools: Enable host automounts
Will list automounts in wikitech Hiera
Bug: T134748
Change-Id: Ie5537263629d421a889c24fc37c3c8b182603c69
---
M modules/k8s/manifests/apiserver.pp
M modules/k8s/templates/initscripts/kube-apiserver.systemd.erb
2 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/288761/1
diff --git a/modules/k8s/manifests/apiserver.pp
b/modules/k8s/manifests/apiserver.pp
index 6a99991..9ac7aa3 100644
--- a/modules/k8s/manifests/apiserver.pp
+++ b/modules/k8s/manifests/apiserver.pp
@@ -2,6 +2,7 @@
$etcd_servers,
$master_host,
$docker_registry,
+ $host_automounts = [],
) {
include k8s::users
@@ -12,6 +13,8 @@
mode => '0700',
}
+ $host_automounts_string = join($host_automounts, ',')
+
$users = hiera('k8s_users')
file { '/etc/kubernetes/tokenauth':
content => template('k8s/tokenauth.csv.erb'),
diff --git a/modules/k8s/templates/initscripts/kube-apiserver.systemd.erb
b/modules/k8s/templates/initscripts/kube-apiserver.systemd.erb
index 380c5ea..4479465 100644
--- a/modules/k8s/templates/initscripts/kube-apiserver.systemd.erb
+++ b/modules/k8s/templates/initscripts/kube-apiserver.systemd.erb
@@ -14,7 +14,8 @@
--tls-private-key-file=/var/lib/kubernetes/ssl/private_keys/server.key \
--tls-cert-file=/var/lib/kubernetes/ssl/certs/cert.pem \
--service-account-key-file=/var/lib/kubernetes/ssl/private_keys/server.key
\
- --enforced-docker-registry=<%= @docker_registry %>
+ --enforced-docker-registry=<%= @docker_registry %> \
+ --host-automounts=<%= @host_automounts_string %>
[Install]
WantedBy=multi-user.target
--
To view, visit https://gerrit.wikimedia.org/r/288761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5537263629d421a889c24fc37c3c8b182603c69
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
