Skip to content

K
k3s
Commit e1720af7 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #41183 from xilabao/fix-ca-cert-in-kubeadm

Automatic merge from submit-queue (batch tested with PRs 40917, 41181, 41123, 36592, 41183) fix ca cert in kubeadm [certificates] Valid certificates and keys now exist in "/etc/kubernetes/pki"
parents 85b4d2e5 ab72934a
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
cmd/kubeadm/app/cmd/reset.go
View file @ e1720af7
...@@ -27,7 +27,6 @@ import ( ...@@ -27,7 +27,6 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
"k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig" "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig"
"k8s.io/kubernetes/cmd/kubeadm/app/preflight" "k8s.io/kubernetes/cmd/kubeadm/app/preflight"
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
...@@ -224,7 +223,6 @@ func resetConfigDir(configPathDir, pkiPathDir string) { ...@@ -224,7 +223,6 @@ func resetConfigDir(configPathDir, pkiPathDir string) {
filesToClean := []string{ filesToClean := []string{
filepath.Join(configPathDir, kubeconfig.AdminKubeConfigFileName), filepath.Join(configPathDir, kubeconfig.AdminKubeConfigFileName),
filepath.Join(configPathDir, kubeconfig.KubeletKubeConfigFileName), filepath.Join(configPathDir, kubeconfig.KubeletKubeConfigFileName),
filepath.Join(configPathDir, kubeadmconstants.CACertName),
} }
fmt.Printf("[reset] Deleting files: %v\n", filesToClean) fmt.Printf("[reset] Deleting files: %v\n", filesToClean)
for _, path := range filesToClean { for _, path := range filesToClean {
......
cmd/kubeadm/app/preflight/checks.go
View file @ e1720af7
...@@ -361,7 +361,7 @@ func RunJoinNodeChecks(cfg *kubeadmapi.NodeConfiguration) error { ...@@ -361,7 +361,7 @@ func RunJoinNodeChecks(cfg *kubeadmapi.NodeConfiguration) error {
PortOpenCheck{port: 10250}, PortOpenCheck{port: 10250},
DirAvailableCheck{Path: filepath.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, "manifests")}, DirAvailableCheck{Path: filepath.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, "manifests")},
DirAvailableCheck{Path: "/var/lib/kubelet"}, DirAvailableCheck{Path: "/var/lib/kubelet"},
FileAvailableCheck{Path: filepath.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, kubeadmconstants.CACertName)}, FileAvailableCheck{Path: filepath.Join(kubeadmapi.GlobalEnvParams.HostPKIPath, kubeadmconstants.CACertName)},
FileAvailableCheck{Path: filepath.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, kubeconfig.KubeletKubeConfigFileName)}, FileAvailableCheck{Path: filepath.Join(kubeadmapi.GlobalEnvParams.KubernetesDir, kubeconfig.KubeletKubeConfigFileName)},
FileContentCheck{Path: bridgenf, Content: []byte{'1'}}, FileContentCheck{Path: bridgenf, Content: []byte{'1'}},
InPathCheck{executable: "ip", mandatory: true}, InPathCheck{executable: "ip", mandatory: true},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment