diff --git a/cfg/1.11-json/config.yaml b/cfg/1.11-json/config.yaml index ce3c054804051ee2132f5633b200cda811e01bfd..1091b13200d74656c2fd6f94101a6403c1818b07 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 4079c0bfd1f7f847b39865aa73d6bb92d26e83b0..d6bd9bc4924e5051da5e71cef380eb093cd7a33a 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 c3c911797e9b1dd9f25922f859fac670fe0afc80..7093d50cafc90828917327c3e719119a072041cb 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 284ff847b4616af602bf07fa1a36aa0549226dbf..9dc66a500e33e885dbf9193cf1db53f8cef80188 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 09fdc093329195a9ec4efd1dfdfdf3fda984b811..1c86219f45fb1a428d106ae515dcfdf3efee41a4 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: