From 15aa61cc227e88dee57d236e211708c62b466472 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Fri, 10 Nov 2017 21:53:48 +0200 Subject: [PATCH] WIP add extra args to running services --- cluster.yml | 2 ++ services/etcd.go | 1 + services/kubeapi.go | 1 + services/kubecontroller.go | 1 + services/kubelet.go | 1 + services/kubeproxy.go | 2 +- services/scheduler.go | 1 + 7 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cluster.yml b/cluster.yml index 6b95ae38..6a2dfc4e 100644 --- a/cluster.yml +++ b/cluster.yml @@ -20,6 +20,8 @@ services: kube-api: image: quay.io/coreos/hyperkube:v1.7.5_coreos.0 service_cluster_ip_range: 10.233.0.0/18 + extra_args: + - --v=4 kube-controller: image: quay.io/coreos/hyperkube:v1.7.5_coreos.0 cluster_cidr: 10.233.64.0/18 diff --git a/services/etcd.go b/services/etcd.go index c02d54c2..02bdca08 100644 --- a/services/etcd.go +++ b/services/etcd.go @@ -54,6 +54,7 @@ func buildEtcdConfig(host hosts.Host, etcdService v1.ETCDService) (*container.Co }, }, } + imageCfg.Cmd = append(imageCfg.Cmd, etcdService.ExtraArgs...) return imageCfg, hostCfg } diff --git a/services/kubeapi.go b/services/kubeapi.go index 7ee30856..385bf885 100644 --- a/services/kubeapi.go +++ b/services/kubeapi.go @@ -51,5 +51,6 @@ func buildKubeAPIConfig(host hosts.Host, kubeAPIService v1.KubeAPIService, etcdC }, }, } + imageCfg.Cmd = append(imageCfg.Cmd, kubeAPIService.ExtraArgs...) return imageCfg, hostCfg } diff --git a/services/kubecontroller.go b/services/kubecontroller.go index 0ed04462..2b27e6fd 100644 --- a/services/kubecontroller.go +++ b/services/kubecontroller.go @@ -38,5 +38,6 @@ func buildKubeControllerConfig(kubeControllerService v1.KubeControllerService) ( }, RestartPolicy: container.RestartPolicy{Name: "always"}, } + imageCfg.Cmd = append(imageCfg.Cmd, kubeControllerService.ExtraArgs...) return imageCfg, hostCfg } diff --git a/services/kubelet.go b/services/kubelet.go index 082a75ad..9fbeabf3 100644 --- a/services/kubelet.go +++ b/services/kubelet.go @@ -67,5 +67,6 @@ func buildKubeletConfig(host hosts.Host, kubeletService v1.KubeletService, isMas }, }, } + imageCfg.Cmd = append(imageCfg.Cmd, kubeletService.ExtraArgs...) return imageCfg, hostCfg } diff --git a/services/kubeproxy.go b/services/kubeproxy.go index 69add76a..5f13397e 100644 --- a/services/kubeproxy.go +++ b/services/kubeproxy.go @@ -31,6 +31,6 @@ func buildKubeproxyConfig(host hosts.Host, kubeproxyService v1.KubeproxyService) RestartPolicy: container.RestartPolicy{Name: "always"}, Privileged: true, } - + imageCfg.Cmd = append(imageCfg.Cmd, kubeproxyService.ExtraArgs...) return imageCfg, hostCfg } diff --git a/services/scheduler.go b/services/scheduler.go index 4dcbf87f..25d0f2df 100644 --- a/services/scheduler.go +++ b/services/scheduler.go @@ -29,5 +29,6 @@ func buildSchedulerConfig(host hosts.Host, schedulerService v1.SchedulerService) }, RestartPolicy: container.RestartPolicy{Name: "always"}, } + imageCfg.Cmd = append(imageCfg.Cmd, schedulerService.ExtraArgs...) return imageCfg, hostCfg }