From 8c25265314f69d2618ab90f8b588897f57a45e1d Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Sun, 1 Oct 2017 22:57:08 -0400 Subject: [PATCH] Change default --cert-dir for kubelet to a non-transient location --- cmd/kubeadm/app/preflight/checks.go | 2 -- cmd/kubelet/app/options/options.go | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index 02ae6e12d7..7e48e5d59b 100644 --- a/cmd/kubeadm/app/preflight/checks.go +++ b/cmd/kubeadm/app/preflight/checks.go @@ -650,7 +650,6 @@ func RunInitMasterChecks(cfg *kubeadmapi.MasterConfiguration) error { PortOpenCheck{port: 10252}, HTTPProxyCheck{Proto: "https", Host: cfg.API.AdvertiseAddress, Port: int(cfg.API.BindPort)}, DirAvailableCheck{Path: filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.ManifestsSubDirName)}, - DirAvailableCheck{Path: "/var/lib/kubelet"}, FileContentCheck{Path: bridgenf, Content: []byte{'1'}}, SwapCheck{}, InPathCheck{executable: "ip", mandatory: true}, @@ -711,7 +710,6 @@ func RunJoinNodeChecks(cfg *kubeadmapi.NodeConfiguration) error { ServiceCheck{Service: "docker", CheckIfActive: true}, PortOpenCheck{port: 10250}, DirAvailableCheck{Path: filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.ManifestsSubDirName)}, - DirAvailableCheck{Path: "/var/lib/kubelet"}, FileAvailableCheck{Path: cfg.CACertPath}, FileAvailableCheck{Path: filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.KubeletKubeConfigFileName)}, FileContentCheck{Path: bridgenf, Content: []byte{'1'}}, diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 8d3074b815..8c5f50e83b 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -120,7 +120,7 @@ func NewKubeletFlags() *KubeletFlags { RequireKubeConfig: false, KubeConfig: flag.NewStringFlag("/var/lib/kubelet/kubeconfig"), ContainerRuntimeOptions: *NewContainerRuntimeOptions(), - CertDirectory: "/var/run/kubernetes", + CertDirectory: "/var/lib/kubelet/pki", RootDirectory: v1alpha1.DefaultRootDir, // DEPRECATED: auto detecting cloud providers goes against the initiative // for out-of-tree cloud providers as we'll now depend on cAdvisor integrations