Yuvipanda has submitted this change and it was merged.
Change subject: k8s: Stop using packages for k8s workers
......................................................................
k8s: Stop using packages for k8s workers
Bug: T130972
Change-Id: I73ce331234363e574eadbf8d9c5fc4864743e7ce
---
M modules/k8s/manifests/kubelet.pp
M modules/k8s/manifests/proxy.pp
M modules/k8s/templates/initscripts/kube-proxy.systemd.erb
M modules/k8s/templates/initscripts/kubelet.systemd.erb
4 files changed, 2 insertions(+), 4 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/k8s/manifests/kubelet.pp b/modules/k8s/manifests/kubelet.pp
index b05b58e..8e6539e 100644
--- a/modules/k8s/manifests/kubelet.pp
+++ b/modules/k8s/manifests/kubelet.pp
@@ -3,7 +3,6 @@
$cluster_dns_ip = '192.168.0.100',
) {
include ::k8s::infrastructure_config
- require_package('kubelet')
file { [
'/etc/kubernetes/',
diff --git a/modules/k8s/manifests/proxy.pp b/modules/k8s/manifests/proxy.pp
index 50ee97d..37c0b6b 100644
--- a/modules/k8s/manifests/proxy.pp
+++ b/modules/k8s/manifests/proxy.pp
@@ -2,7 +2,6 @@
$master_host,
) {
include ::k8s::infrastructure_config
- require_package('kube-proxy')
$master_ip = ipresolve($master_host, 4, $::nameservers[0])
diff --git a/modules/k8s/templates/initscripts/kube-proxy.systemd.erb
b/modules/k8s/templates/initscripts/kube-proxy.systemd.erb
index 3ce1cd1..07c84c4 100644
--- a/modules/k8s/templates/initscripts/kube-proxy.systemd.erb
+++ b/modules/k8s/templates/initscripts/kube-proxy.systemd.erb
@@ -2,7 +2,7 @@
Description=Kubernetes Proxy
[Service]
-ExecStart=/usr/bin/kube-proxy \
+ExecStart=/usr/local/bin/kube-proxy \
--kubeconfig=/etc/kubernetes/kubeconfig \
--proxy-mode=iptables \
--masquerade-all=true
diff --git a/modules/k8s/templates/initscripts/kubelet.systemd.erb
b/modules/k8s/templates/initscripts/kubelet.systemd.erb
index 03f5d31..bcd0ccf 100644
--- a/modules/k8s/templates/initscripts/kubelet.systemd.erb
+++ b/modules/k8s/templates/initscripts/kubelet.systemd.erb
@@ -2,7 +2,7 @@
Description=Kubelet
[Service]
-ExecStart=/usr/bin/kubelet \
+ExecStart=/usr/local/bin/kubelet \
--config=/etc/kubernetes/manifests \
--kubeconfig=/etc/kubernetes/kubeconfig \
--api-servers=https://<%= @master_host %>:6443 \
--
To view, visit https://gerrit.wikimedia.org/r/281587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73ce331234363e574eadbf8d9c5fc4864743e7ce
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Gehel <[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
