From ec6d181172882d2af56dbd22067c04ff19d9c6ad Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Thu, 28 Jul 2022 22:27:19 +0200 Subject: [PATCH] Use cabundle for etcd CA files --- nodeup/pkg/model/etcd_manager_tls.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nodeup/pkg/model/etcd_manager_tls.go b/nodeup/pkg/model/etcd_manager_tls.go index 2d6307d120627..bb0d84c958f8d 100644 --- a/nodeup/pkg/model/etcd_manager_tls.go +++ b/nodeup/pkg/model/etcd_manager_tls.go @@ -17,7 +17,10 @@ limitations under the License. package model import ( + "path/filepath" + "k8s.io/kops/upup/pkg/fi" + "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" ) // EtcdManagerTLSBuilder configures TLS support for etcd-manager @@ -50,9 +53,16 @@ func (b *EtcdManagerTLSBuilder) Build(ctx *fi.ModelBuilderContext) error { } for fileName, keystoreName := range keys { - if err := b.buildCertificatePairTask(ctx, keystoreName, d, fileName, nil, nil, true); err != nil { + if err := b.buildCertificatePairTask(ctx, keystoreName, d, fileName, nil, nil, false); err != nil { return err } + ctx.AddTask(&nodetasks.File{ + Path: filepath.Join(d, fileName+".crt"), + Contents: fi.NewStringResource(b.NodeupConfig.CAs[keystoreName]), + Type: nodetasks.FileType_File, + Mode: fi.String("0644"), + }) + } }