Yuvipanda has submitted this change and it was merged.
Change subject: k8s: Don't have kubelet confibure cbr0
......................................................................
k8s: Don't have kubelet confibure cbr0
According to user 'beeps' from IRC, this is causing trouble
when used with flannel
Change-Id: I6534d8f4fa4d059ce885d468dca63f5ce760553b
---
M modules/k8s/templates/initscripts/kubelet.systemd.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/k8s/templates/initscripts/kubelet.systemd.erb
b/modules/k8s/templates/initscripts/kubelet.systemd.erb
index c702da3..6f59001 100644
--- a/modules/k8s/templates/initscripts/kubelet.systemd.erb
+++ b/modules/k8s/templates/initscripts/kubelet.systemd.erb
@@ -5,7 +5,7 @@
ExecStart=/usr/local/bin/kubelet \
--api-servers=http://<%= @master_ip %>:8080 \
--config=/etc/kubernetes/manifests \
- --configure-cbr0=true
+ --configure-cbr0=false
[Install]
WantedBy=multi-user.target
--
To view, visit https://gerrit.wikimedia.org/r/230161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6534d8f4fa4d059ce885d468dca63f5ce760553b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
