Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/281586
Change subject: k8s: Stop using packages for master components
......................................................................
k8s: Stop using packages for master components
Bug: T130972
Change-Id: I991788d274c0c32ad233aa9d799fe760716b9d23
---
M modules/k8s/manifests/apiserver.pp
M modules/k8s/manifests/controller.pp
M modules/k8s/manifests/scheduler.pp
M modules/k8s/templates/initscripts/controller-manager.systemd.erb
M modules/k8s/templates/initscripts/kube-apiserver.systemd.erb
M modules/k8s/templates/initscripts/kube-scheduler.systemd.erb
6 files changed, 3 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/281586/1
diff --git a/modules/k8s/manifests/apiserver.pp
b/modules/k8s/manifests/apiserver.pp
index 889afd4..09ab9e2 100644
--- a/modules/k8s/manifests/apiserver.pp
+++ b/modules/k8s/manifests/apiserver.pp
@@ -2,8 +2,6 @@
$etcd_servers,
$master_host,
) {
- require_package('kube-apiserver')
-
include k8s::users
file { '/etc/kubernetes':
diff --git a/modules/k8s/manifests/controller.pp
b/modules/k8s/manifests/controller.pp
index 6a4d52d..491beb2 100644
--- a/modules/k8s/manifests/controller.pp
+++ b/modules/k8s/manifests/controller.pp
@@ -1,6 +1,4 @@
class k8s::controller {
- require_package('kube-controller-manager')
-
include k8s::users
base::service_unit { 'controller-manager':
diff --git a/modules/k8s/manifests/scheduler.pp
b/modules/k8s/manifests/scheduler.pp
index bede4f1..b2717af 100644
--- a/modules/k8s/manifests/scheduler.pp
+++ b/modules/k8s/manifests/scheduler.pp
@@ -1,6 +1,4 @@
class k8s::scheduler {
- require_package('kube-scheduler')
-
include k8s::users
base::service_unit { 'kube-scheduler':
diff --git a/modules/k8s/templates/initscripts/controller-manager.systemd.erb
b/modules/k8s/templates/initscripts/controller-manager.systemd.erb
index 9cc9f25..a3d69ab 100644
--- a/modules/k8s/templates/initscripts/controller-manager.systemd.erb
+++ b/modules/k8s/templates/initscripts/controller-manager.systemd.erb
@@ -4,7 +4,7 @@
[Service]
User=kubernetes
Group=kubernetes
-ExecStart=/usr/bin/kube-controller-manager \
+ExecStart=/usr/local/bin/kube-controller-manager \
--cluster-cidr=192.168.0.0/24 \
--master=http://127.0.0.1:8080 \
--service-account-private-key-file=/var/lib/kubernetes/ssl/private_keys/server.key
diff --git a/modules/k8s/templates/initscripts/kube-apiserver.systemd.erb
b/modules/k8s/templates/initscripts/kube-apiserver.systemd.erb
index 1f31a3f..790f079 100644
--- a/modules/k8s/templates/initscripts/kube-apiserver.systemd.erb
+++ b/modules/k8s/templates/initscripts/kube-apiserver.systemd.erb
@@ -4,7 +4,7 @@
[Service]
User=kubernetes
Group=kubernetes
-ExecStart=/usr/bin/kube-apiserver \
+ExecStart=/usr/local/bin/kube-apiserver \
--etcd-servers=<%= @etcd_servers %> \
--service-cluster-ip-range=192.168.0.0/24 \
--token-auth-file=/etc/kubernetes/tokenauth \
diff --git a/modules/k8s/templates/initscripts/kube-scheduler.systemd.erb
b/modules/k8s/templates/initscripts/kube-scheduler.systemd.erb
index f351742..138687a 100644
--- a/modules/k8s/templates/initscripts/kube-scheduler.systemd.erb
+++ b/modules/k8s/templates/initscripts/kube-scheduler.systemd.erb
@@ -4,7 +4,7 @@
[Service]
User=kubernetes
Group=kubernetes
-ExecStart=/usr/bin/kube-scheduler \
+ExecStart=/usr/local/bin/kube-scheduler \
--master=http://127.0.0.1:8080
[Install]
--
To view, visit https://gerrit.wikimedia.org/r/281586
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I991788d274c0c32ad233aa9d799fe760716b9d23
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
