From 7ec10211a5c744c93f104d0e42caf7a8c212a41e Mon Sep 17 00:00:00 2001
From: daniellohausen <daniel.lohausen@cognotekt.com>
Date: Wed, 8 May 2019 13:52:08 +0200
Subject: [PATCH] Added KOPS-specific paths
---
cfg/1.11/config.yaml | 15 ++++++++++++++-
cfg/1.13/config.yaml | 15 ++++++++++++++-
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/cfg/1.11/config.yaml b/cfg/1.11/config.yaml
index 1d51f6c..ef8e4d7 100644
--- a/cfg/1.11/config.yaml
+++ b/cfg/1.11/config.yaml
@@ -9,21 +9,34 @@
master:
apiserver:
+ confs:
+ - /etc/kubernetes/manifests/kube-apiserver.yaml
+ - /etc/kubernetes/manifests/kube-apiserver.manifest
defaultconf: /etc/kubernetes/manifests/kube-apiserver.yaml
scheduler:
+ confs:
+ - /etc/kubernetes/manifests/kube-scheduler.yaml
+ - /etc/kubernetes/manifests/kube-scheduler.manifest
defaultconf: /etc/kubernetes/manifests/kube-scheduler.yaml
controllermanager:
+ confs:
+ - /etc/kubernetes/manifests/kube-controller-manager.yaml
+ - /etc/kubernetes/manifests/kube-controller-manager.manifest
defaultconf: /etc/kubernetes/manifests/kube-controller-manager.yaml
etcd:
+ confs:
+ - /etc/kubernetes/manifests/etcd.yaml
+ - /etc/kubernetes/manifests/etcd.manifest
defaultconf: /etc/kubernetes/manifests/etcd.yaml
node:
kubelet:
- defaultconf: /etc/kubernetes/kubelet.conf
+ 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/1.13/config.yaml b/cfg/1.13/config.yaml
index 3a63b4d..4374f39 100644
--- a/cfg/1.13/config.yaml
+++ b/cfg/1.13/config.yaml
@@ -9,21 +9,34 @@
master:
apiserver:
+ confs:
+ - /etc/kubernetes/manifests/kube-apiserver.yaml
+ - /etc/kubernetes/manifests/kube-apiserver.manifest
defaultconf: /etc/kubernetes/manifests/kube-apiserver.yaml
scheduler:
+ confs:
+ - /etc/kubernetes/manifests/kube-scheduler.yaml
+ - /etc/kubernetes/manifests/kube-scheduler.manifest
defaultconf: /etc/kubernetes/manifests/kube-scheduler.yaml
controllermanager:
+ confs:
+ - /etc/kubernetes/manifests/kube-controller-manager.yaml
+ - /etc/kubernetes/manifests/kube-controller-manager.manifest
defaultconf: /etc/kubernetes/manifests/kube-controller-manager.yaml
etcd:
+ confs:
+ - /etc/kubernetes/manifests/etcd.yaml
+ - /etc/kubernetes/manifests/etcd.manifest
defaultconf: /etc/kubernetes/manifests/etcd.yaml
node:
kubelet:
- defaultconf: /etc/kubernetes/kubelet.conf
+ 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
--
GitLab