kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9302 from johngmyers/fix-legacy-manager 

Don't try building TLS for etcd-manager if not using etcd-manager
This commit is contained in:
Kubernetes Prow Robot 2020-06-09 07:41:18 -07:00 committed by GitHub
parent 0b8ead9cc8 bacaf87f0e
commit 7a5dd523ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nodeup/pkg/model/etcd_manager_tls.go
View File

@ -18,8 +18,8 @@ package model
import (
"crypto/x509/pkix"
"fmt"
"k8s.io/klog"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
)
@ -33,7 +33,7 @@ var _ fi.ModelBuilder = &EtcdManagerTLSBuilder{}
// Build is responsible for TLS configuration for etcd-manager
func (b *EtcdManagerTLSBuilder) Build(ctx *fi.ModelBuilderContext) error {
if !b.IsMaster {
if !b.IsMaster || !b.UseEtcdManager() {
return nil
}
@ -52,8 +52,7 @@ func (b *EtcdManagerTLSBuilder) Build(ctx *fi.ModelBuilderContext) error {
return err
}
if cert == nil {
klog.Warningf("keypair %q not found, won't configure", keystoreName)
continue
return fmt.Errorf("keypair %q not found", keystoreName)
}
if err := b.BuildCertificateTask(ctx, keystoreName, d+"/"+fileName+".crt"); err != nil {