Hello Madhuvishy, Chasemp, Yuvipanda, Alexandros Kosiaris,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/336238
to review the following change.
Change subject: k8s: Use same logic for systemd and upstart configuration
......................................................................
k8s: Use same logic for systemd and upstart configuration
Currently the options "--masquerade-all=true" and
"--proxy-mode=iptables" are passed unconditionally to kube-proxy in
upstart environments, but depend on class parameters in systemd. This
change uses the latter logic for upstart as well.
Change-Id: I543dd37c20760d90c5a102805be8a50849b0090e
---
M modules/k8s/templates/initscripts/kube-proxy.upstart.erb
1 file changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/336238/1
diff --git a/modules/k8s/templates/initscripts/kube-proxy.upstart.erb
b/modules/k8s/templates/initscripts/kube-proxy.upstart.erb
index bd1ae24..61cbd8e 100644
--- a/modules/k8s/templates/initscripts/kube-proxy.upstart.erb
+++ b/modules/k8s/templates/initscripts/kube-proxy.upstart.erb
@@ -5,9 +5,16 @@
setuid root
setgid root
+<%-
+daemon_args = ['--kubeconfig=/etc/kubernetes/kubeconfig']
+if @proxy_mode
+ daemon_args.push("--proxy-mode=#{@proxy_mode}")
+end
+if @masquerade_all
+ daemon_args.push("--masquerade-all=true")
+end
+-%>
exec /usr/bin/kube-proxy \
- --kubeconfig=/etc/kubernetes/kubeconfig \
- --proxy-mode=iptables \
- --masquerade-all=true
+ <%= daemon_args.join(" \\\n ") %>
respawn
--
To view, visit https://gerrit.wikimedia.org/r/336238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I543dd37c20760d90c5a102805be8a50849b0090e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Chasemp <r...@wikimedia.org>
Gerrit-Reviewer: Madhuvishy <mviswanat...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
