From 336811617225d68773b96179c09703bb520dded2 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Tue, 8 Mar 2022 11:38:28 -0800 Subject: [PATCH] [Release-1.21] Populate EtcdConfig in runtime from datastore when etcd is disabled (#5229) * Populate EtcdConfig in runtime from datastore when etcd is disabled (#5222) Fixes issue with secrets-encrypt rotate not having any etcd endpoints available on nodes without a local etcd server. Signed-off-by: Brad Davidson * Revert to old Kine naming Signed-off-by: Derek Nola Co-authored-by: Brad Davidson --- pkg/cluster/cluster.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index cc8799b7f5..00656d8c98 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -65,6 +65,9 @@ func (c *Cluster) Start(ctx context.Context) (<-chan struct{}, error) { logrus.Warnf("Failed to remove this node from etcd members") } + c.config.Runtime.EtcdConfig.Endpoints = strings.Split(c.config.Datastore.Endpoint, ",") + c.config.Runtime.EtcdConfig.TLSConfig = c.config.Datastore.Config + return ready, nil }