From 9efd942bcc3701a62c2b1b4c7871da817d3921ce Mon Sep 17 00:00:00 2001 From: Mathis Kretz Date: Mon, 16 Mar 2020 13:37:32 +0100 Subject: [PATCH] Add config paths for microk8s (#556) * Add config paths for microk8s * Fix order for kube-proxy conf path and fix yaml linting issue Co-authored-by: Mathis Kretz Co-authored-by: Liz Rice --- cfg/config.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cfg/config.yaml b/cfg/config.yaml index 2240bd8..66d3aca 100644 --- a/cfg/config.yaml +++ b/cfg/config.yaml @@ -30,6 +30,7 @@ master: - /etc/kubernetes/manifests/kube-apiserver.yml - /etc/kubernetes/manifests/kube-apiserver.manifest - /var/snap/kube-apiserver/current/args + - /var/snap/microk8s/current/args/kube-apiserver defaultconf: /etc/kubernetes/manifests/kube-apiserver.yaml scheduler: @@ -43,6 +44,7 @@ master: - /etc/kubernetes/manifests/kube-scheduler.yml - /etc/kubernetes/manifests/kube-scheduler.manifest - /var/snap/kube-scheduler/current/args + - /var/snap/microk8s/current/args/kube-scheduler defaultconf: /etc/kubernetes/manifests/kube-scheduler.yaml controllermanager: @@ -57,6 +59,7 @@ master: - /etc/kubernetes/manifests/kube-controller-manager.yml - /etc/kubernetes/manifests/kube-controller-manager.manifest - /var/snap/kube-controller-manager/current/args + - /var/snap/microk8s/current/args/kube-controller-manager defaultconf: /etc/kubernetes/manifests/kube-controller-manager.yaml etcd: @@ -70,6 +73,7 @@ master: - /etc/etcd/etcd.conf - /var/snap/etcd/common/etcd.conf.yml - /var/snap/etcd/common/etcd.conf.yaml + - /var/snap/microk8s/current/args/etcd defaultconf: /etc/kubernetes/manifests/etcd.yaml flanneld: @@ -93,6 +97,7 @@ node: - "/etc/kubernetes/pki/ca.crt" - "/etc/kubernetes/certs/ca.crt" - "/etc/kubernetes/cert/ca.pem" + - "/var/snap/microk8s/current/certs/ca.crt" svc: # These paths must also be included # in the 'confs' property below @@ -100,6 +105,7 @@ node: - "/etc/systemd/system/kubelet.service" - "/lib/systemd/system/kubelet.service" - "/etc/systemd/system/snap.kubelet.daemon.service" + - "/etc/systemd/system/snap.microk8s.daemon-kubelet.service" bins: - "hyperkube kubelet" - "kubelet" @@ -107,6 +113,7 @@ node: - "/etc/kubernetes/kubelet.conf" - "/var/lib/kubelet/kubeconfig" - "/etc/kubernetes/kubelet-kubeconfig" + - "/var/snap/microk8s/current/credentials/kubelet.config" confs: - "/var/lib/kubelet/config.yaml" - "/var/lib/kubelet/config.yml" @@ -116,6 +123,7 @@ node: - "/etc/default/kubelet" - "/var/lib/kubelet/kubeconfig" - "/var/snap/kubelet/current/args" + - "/var/snap/microk8s/current/args/kubelet" ## Due to the fact that the kubelet might be configured ## without a kubelet-config file, we use a work-around ## of pointing to the systemd service file (which can also @@ -125,6 +133,7 @@ node: - "/etc/systemd/system/kubelet.service" - "/lib/systemd/system/kubelet.service" - "/etc/systemd/system/snap.kubelet.daemon.service" + - "/etc/systemd/system/snap.microk8s.daemon-kubelet.service" defaultconf: "/var/lib/kubelet/config.yaml" defaultsvc: "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf" defaultkubeconfig: "/etc/kubernetes/kubelet.conf" @@ -142,11 +151,14 @@ node: - /etc/kubernetes/addons/kube-proxy-daemonset.yaml - /etc/kubernetes/addons/kube-proxy-daemonset.yml - /var/snap/kube-proxy/current/args + - /var/snap/microk8s/current/args/kube-proxy kubeconfig: - "/etc/kubernetes/kubelet-kubeconfig" - "/var/lib/kubelet/kubeconfig" + - "/var/snap/microk8s/current/credentials/proxy.config" svc: - "/lib/systemd/system/kube-proxy.service" + - "/etc/systemd/system/snap.microk8s.daemon-proxy.service" defaultconf: /etc/kubernetes/addons/kube-proxy-daemonset.yaml defaultkubeconfig: "/etc/kubernetes/proxy.conf" @@ -164,6 +176,7 @@ etcd: - /etc/etcd/etcd.conf - /var/snap/etcd/common/etcd.conf.yml - /var/snap/etcd/common/etcd.conf.yaml + - /var/snap/microk8s/current/args/etcd defaultconf: /etc/kubernetes/manifests/etcd.yaml controlplane: