Alexandros Kosiaris has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/329606 )
Change subject: Enable the calico profile on kubernetes::worker
......................................................................
Enable the calico profile on kubernetes::worker
Add the needed hiera keys and include the profile
Change-Id: Idb39a19afd2cdf3d48263d288307b5a0d9ad0d77
---
M hieradata/role/common/kubernetes/worker.yaml
M modules/k8s/manifests/kubelet.pp
M modules/k8s/templates/initscripts/kubelet.systemd.erb
M modules/k8s/templates/kubelet.default.erb
M modules/role/manifests/kubernetes/worker.pp
5 files changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/329606/1
diff --git a/hieradata/role/common/kubernetes/worker.yaml
b/hieradata/role/common/kubernetes/worker.yaml
index 4de0f3f..7c8746a 100644
--- a/hieradata/role/common/kubernetes/worker.yaml
+++ b/hieradata/role/common/kubernetes/worker.yaml
@@ -13,3 +13,8 @@
iptables: false
ip-masq: false
base::monitoring::host::nrpe_check_disk_options: -w 10% -c 5% -l -e -A -i
/var/lib/docker/containers/* -i /run/docker/netns/* --exclude-type=tracefs
+profile::calico::kubernetes::etcd_endpoints:
+- https://etcd1001.eqiad.wmnet:2379
+- https://etcd1002.eqiad.wmnet:2379
+- https://etcd1003.eqiad.wmnet:2379
+profile::calico::kubernetes::docker::registry: darmstadtium.eqiad.wmnet
diff --git a/modules/k8s/manifests/kubelet.pp b/modules/k8s/manifests/kubelet.pp
index 17cab67..2e65df4 100644
--- a/modules/k8s/manifests/kubelet.pp
+++ b/modules/k8s/manifests/kubelet.pp
@@ -8,6 +8,9 @@
$cluster_domain = 'kube',
$tls_cert = '/var/lib/kubernetes/ssl/certs/cert.pem',
$tls_key = '/var/lib/kubernetes/ssl/private_keys/server.key',
+ $cni=false,
+ $cni_bin_dir='/opt/cni/bin',
+ $cni_conf_dir='/etc/cni/net.d',
) {
include ::k8s::infrastructure_config
diff --git a/modules/k8s/templates/initscripts/kubelet.systemd.erb
b/modules/k8s/templates/initscripts/kubelet.systemd.erb
index 311ac80..1d2f665 100644
--- a/modules/k8s/templates/initscripts/kubelet.systemd.erb
+++ b/modules/k8s/templates/initscripts/kubelet.systemd.erb
@@ -8,6 +8,7 @@
Conflicts=cadvisor.service
[Service]
+<<<<<<< HEAD
WorkingDirectory=/var/lib/kubelet
# The shared kubernetes configurations file
EnvironmentFile=-/etc/kubernetes/config
diff --git a/modules/k8s/templates/kubelet.default.erb
b/modules/k8s/templates/kubelet.default.erb
index fd51938..e2429c9 100644
--- a/modules/k8s/templates/kubelet.default.erb
+++ b/modules/k8s/templates/kubelet.default.erb
@@ -39,5 +39,11 @@
if @cluster_domain
daemon_args.push("--cluster-domain=#{@cluster_domain}")
end
+if @cni
+ daemon_args.push("--network-plugin=cni")
+ daemon_args.push("--cni-bin-dir=#{@cni_bin_dir}")
+ daemon_args.push("--cni-conf-dir=#{@cni_conf_dir}")
+end
+
-%>
DAEMON_ARGS="<%= daemon_args.join(' ') %>"
diff --git a/modules/role/manifests/kubernetes/worker.pp
b/modules/role/manifests/kubernetes/worker.pp
index 580bb25..605b22f 100644
--- a/modules/role/manifests/kubernetes/worker.pp
+++ b/modules/role/manifests/kubernetes/worker.pp
@@ -6,4 +6,5 @@
include ::profile::docker::storage
include ::profile::docker::engine
include ::profile::kubernetes::node
+ include ::profile::calico::kubernetes
}
--
To view, visit https://gerrit.wikimedia.org/r/329606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb39a19afd2cdf3d48263d288307b5a0d9ad0d77
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
