Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386753 )
Change subject: Remove $cluster_cidr from k8s::controller
......................................................................
Remove $cluster_cidr from k8s::controller
The --cluster-cidr parameter only makes sense if
--allocate-node-cidrs=true is also specified and a proper cloud-provider
is specified. We probably won't ever have a proper cloud-provider in
production and in labs, where the openstack cloud provider could be
used, we don't use it yet. When and if we decide to use the openstack
cloud provider in tool labs we can revisit this
Change-Id: I45c840c6bc4b96a51c6a361c1806ac70dfae75af
---
M modules/k8s/manifests/controller.pp
M modules/k8s/templates/kube-controller-manager.default.erb
2 files changed, 2 insertions(+), 4 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/k8s/manifests/controller.pp
b/modules/k8s/manifests/controller.pp
index 28f87e7..d84c65d 100644
--- a/modules/k8s/manifests/controller.pp
+++ b/modules/k8s/manifests/controller.pp
@@ -1,6 +1,4 @@
-class k8s::controller(
- $cluster_cidr = '192.168.0.0/24',
-){
+class k8s::controller {
require_package('kubernetes-master')
file { '/etc/default/kube-controller-manager':
diff --git a/modules/k8s/templates/kube-controller-manager.default.erb
b/modules/k8s/templates/kube-controller-manager.default.erb
index 43acfc7..2bf7270 100644
--- a/modules/k8s/templates/kube-controller-manager.default.erb
+++ b/modules/k8s/templates/kube-controller-manager.default.erb
@@ -3,5 +3,5 @@
#
## defaults from config and apiserver should be adequate
# This is the default anyway in 1.4 at least, but specify to ensure backwards
compatibility
-DAEMON_ARGS="--cluster-cidr=<%= @cluster_cidr %> --leader-elect=true"
+DAEMON_ARGS="--leader-elect=true"
#
--
To view, visit https://gerrit.wikimedia.org/r/386753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45c840c6bc4b96a51c6a361c1806ac70dfae75af
Gerrit-PatchSet: 2
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
