Yuvipanda has submitted this change and it was merged.
Change subject: k8s: Have docker service start after the flannel one
......................................................................
k8s: Have docker service start after the flannel one
To prevent it from setting up a different network config
Also setup a dep between kube-proxy and kubelet since
kube-proxy depends on kube-config from kubelet
Change-Id: Ief109cc995b881454a17ebedf608ef6d431c3bec
---
M manifests/role/tools.pp
1 file changed, 9 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/manifests/role/tools.pp b/manifests/role/tools.pp
index c848dec..4a18c7d 100644
--- a/manifests/role/tools.pp
+++ b/manifests/role/tools.pp
@@ -57,7 +57,6 @@
# ferm and kube-proxy will conflict
include toollabs::infrastructure
- require k8s::docker
$master_host = hiera('k8s_master')
$etcd_url = join(prefix(suffix(hiera('etcd_hosts', [$master_host]),
':2379'), 'https://'), ',')
@@ -71,13 +70,20 @@
etcd_endpoints => $etcd_url,
}
- class { 'k8s::proxy':
- master_host => $master_host,
+ class { '::k8s::docker':
+ require => Class['::k8s::flannel'],
}
class { 'k8s::kubelet':
master_host => $master_host,
+ require => Class['::k8s::docker'],
}
+
+ class { 'k8s::proxy':
+ master_host => $master_host,
+ require => Class['::k8s::kubelet']
+ }
+
}
class role::toollabs::k8s::webproxy {
--
To view, visit https://gerrit.wikimedia.org/r/260501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief109cc995b881454a17ebedf608ef6d431c3bec
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
