From caf3fbd0a0142a2ed917fc395f27830d88ae289b Mon Sep 17 00:00:00 2001
From: Liz Rice <liz@lizrice.com>
Date: Mon, 13 May 2019 18:20:57 +0100
Subject: [PATCH] Moving more config into master config file
---
cfg/1.11-json/config.yaml | 4 ----
cfg/1.11/config.yaml | 8 --------
cfg/1.13/config.yaml | 8 --------
cfg/1.8/config.yaml | 9 ---------
cfg/config.yaml | 4 ++++
5 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/cfg/1.11-json/config.yaml b/cfg/1.11-json/config.yaml
index ce3c054..1091b13 100644
--- a/cfg/1.11-json/config.yaml
+++ b/cfg/1.11-json/config.yaml
@@ -9,10 +9,6 @@ node:
- "/var/lib/kubelet/kubeconfig"
kubelet:
- bins:
- - "hyperkube kubelet"
- - "kubelet"
- defaultconf: "/etc/kubernetes/kubelet/kubelet-config.json"
defaultsvc: "/etc/systemd/system/kubelet.service"
defaultkubeconfig: "/var/lib/kubelet/kubeconfig"
diff --git a/cfg/1.11/config.yaml b/cfg/1.11/config.yaml
index 4079c0b..d6bd9bc 100644
--- a/cfg/1.11/config.yaml
+++ b/cfg/1.11/config.yaml
@@ -31,11 +31,3 @@ master:
- /etc/kubernetes/manifests/etcd.yaml
- /etc/kubernetes/manifests/etcd.manifest
defaultconf: /etc/kubernetes/manifests/etcd.yaml
-
-node:
- kubelet:
- defaultconf: /etc/kubernetes/kubelet.conf
- defaultsvc: /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
-
- proxy:
- defaultconf: /etc/kubernetes/addons/kube-proxy-daemonset.yaml
diff --git a/cfg/1.13/config.yaml b/cfg/1.13/config.yaml
index c3c9117..7093d50 100644
--- a/cfg/1.13/config.yaml
+++ b/cfg/1.13/config.yaml
@@ -31,11 +31,3 @@ master:
- /etc/kubernetes/manifests/etcd.yaml
- /etc/kubernetes/manifests/etcd.manifest
defaultconf: /etc/kubernetes/manifests/etcd.yaml
-
-node:
- kubelet:
- defaultconf: /etc/kubernetes/kubelet.conf
- defaultsvc: /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
-
- proxy:
- defaultconf: /etc/kubernetes/addons/kube-proxy-daemonset.yaml
diff --git a/cfg/1.8/config.yaml b/cfg/1.8/config.yaml
index 284ff84..9dc66a5 100644
--- a/cfg/1.8/config.yaml
+++ b/cfg/1.8/config.yaml
@@ -31,12 +31,3 @@ master:
- /etc/kubernetes/manifests/etcd.yaml
- /etc/kubernetes/manifests/etcd.manifest
defaultconf: /etc/kubernetes/manifests/etcd.yaml
-
-node:
- kubelet:
- defaultconf: /var/lib/kubelet/config.yaml
- defaultsvc: /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
- defaultkubeconfig: /etc/kubernetes/kubelet.conf
-
- proxy:
- defaultconf: /etc/kubernetes/addons/kube-proxy-daemonset.yaml
diff --git a/cfg/config.yaml b/cfg/config.yaml
index 09fdc09..1c86219 100644
--- a/cfg/config.yaml
+++ b/cfg/config.yaml
@@ -81,6 +81,9 @@ node:
bins:
- "hyperkube kubelet"
- "kubelet"
+ confs:
+ - "/var/lib/kubelet/config.yaml"
+ - "/etc/kubernetes/kubelet/kubelet-config.json"
defaultconf: "/var/lib/kubelet/config.yaml"
defaultsvc: "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf"
defaultkubeconfig: "/etc/kubernetes/kubelet.conf"
@@ -93,6 +96,7 @@ node:
confs:
- /etc/kubernetes/proxy
- /etc/kubernetes/addons/kube-proxy-daemonset.yaml
+ defaultconf: /etc/kubernetes/addons/kube-proxy-daemonset.yaml
defaultkubeconfig: "/etc/kubernetes/proxy.conf"
federated:
--
GitLab