Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374556 )
Change subject: kubelet: Remove configure-cbr0 parameter
......................................................................
kubelet: Remove configure-cbr0 parameter
configure-cbr0 has been deprecated for some time, has been removed fully
in 1.5 and specifying it causes kubelet to not start past that
kubernetes version. In our setups it's anyway a noop as we are using CNI
or flannel and not the old cbr0 setup or kubenet. Also setup notify from
the default file to kubelet so that changes are picked up
Bug: T170119
Change-Id: I74e319a6ba6b5c100b95f6d953e91cff0a43002c
---
M modules/k8s/manifests/kubelet.pp
M modules/k8s/templates/kubelet.default.erb
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/k8s/manifests/kubelet.pp b/modules/k8s/manifests/kubelet.pp
index 95778ba..885c894 100644
--- a/modules/k8s/manifests/kubelet.pp
+++ b/modules/k8s/manifests/kubelet.pp
@@ -24,6 +24,7 @@
group => 'root',
mode => '0644',
content => template('k8s/kubelet.default.erb'),
+ notify => Service['kubelet'],
}
file { [
diff --git a/modules/k8s/templates/kubelet.default.erb
b/modules/k8s/templates/kubelet.default.erb
index e2429c9..118009f 100644
--- a/modules/k8s/templates/kubelet.default.erb
+++ b/modules/k8s/templates/kubelet.default.erb
@@ -22,11 +22,9 @@
# Other options:
# --container_runtime=rkt
-# --configure-cbr0={true|false}
<%-
daemon_args = [
- '--configure-cbr0=false',
'--kubeconfig=/etc/kubernetes/kubeconfig',
]
--
To view, visit https://gerrit.wikimedia.org/r/374556
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74e319a6ba6b5c100b95f6d953e91cff0a43002c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Chasemp <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Madhuvishy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
