github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #76636 from mdaniel/kubeadm-issue-1507 

Output missing cert or key name in DownloadCerts
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-16 16:20:28 -07:00 committed by GitHub
parent 92e087c402 b0814869b0
commit 9746a40e44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/phases/copycerts/copycerts.go
View File

@ -231,7 +231,7 @@ func DownloadCerts(client clientset.Interface, cfg *kubeadmapi.InitConfiguration
for certOrKeyName, certOrKeyPath := range certsToTransfer(cfg) { for certOrKeyName, certOrKeyPath := range certsToTransfer(cfg) {
certOrKeyData, found := secretData[certOrKeyNameToSecretName(certOrKeyName)] certOrKeyData, found := secretData[certOrKeyNameToSecretName(certOrKeyName)]
if !found { if !found {
return errors.New("couldn't find required certificate or key in Secret") return errors.Errorf("the Secret does not include the required certificate or key - name: %s, path: %s", certOrKeyName, certOrKeyPath)
} }
if len(certOrKeyData) == 0 { if len(certOrKeyData) == 0 {
klog.V(1).Infof("[download-certs] Not saving %q to disk, since it is empty in the %q Secret\n", certOrKeyName, kubeadmconstants.KubeadmCertsSecret) klog.V(1).Infof("[download-certs] Not saving %q to disk, since it is empty in the %q Secret\n", certOrKeyName, kubeadmconstants.KubeadmCertsSecret)