From 57969c1b52ce0c3c27ccbf02ecc52ebc1b8533d9 Mon Sep 17 00:00:00 2001 From: kkkkun Date: Sat, 6 May 2023 19:40:40 +0800 Subject: [PATCH] Fix etcd3 config changed --- .../apiserver/pkg/storage/etcd3/testserver/test_server.go | 8 ++++---- .../pkg/storage/storagebackend/factory/tls_test.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/testserver/test_server.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/testserver/test_server.go index f34cdf1f636..ff1c04e220e 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/testserver/test_server.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/testserver/test_server.go @@ -66,10 +66,10 @@ func NewTestConfig(t testing.TB) *embed.Config { clientURL := url.URL{Scheme: "http", Host: net.JoinHostPort("localhost", strconv.Itoa(ports[0]))} peerURL := url.URL{Scheme: "http", Host: net.JoinHostPort("localhost", strconv.Itoa(ports[1]))} - cfg.LPUrls = []url.URL{peerURL} - cfg.APUrls = []url.URL{peerURL} - cfg.LCUrls = []url.URL{clientURL} - cfg.ACUrls = []url.URL{clientURL} + cfg.ListenPeerUrls = []url.URL{peerURL} + cfg.AdvertisePeerUrls = []url.URL{peerURL} + cfg.ListenClientUrls = []url.URL{clientURL} + cfg.AdvertiseClientUrls = []url.URL{clientURL} cfg.InitialCluster = cfg.InitialClusterFromName(cfg.Name) cfg.ZapLoggerBuilder = embed.NewZapLoggerBuilder(zaptest.NewLogger(t, zaptest.Level(zapcore.ErrorLevel)).Named("etcd-server")) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go index 8d21d23383e..eafcc411982 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go @@ -62,11 +62,11 @@ func TestTLSConnection(t *testing.T) { KeyFile: keyFile, TrustedCAFile: caFile, } - for i := range etcdConfig.LCUrls { - etcdConfig.LCUrls[i].Scheme = "https" + for i := range etcdConfig.ListenClientUrls { + etcdConfig.ListenClientUrls[i].Scheme = "https" } - for i := range etcdConfig.ACUrls { - etcdConfig.ACUrls[i].Scheme = "https" + for i := range etcdConfig.AdvertiseClientUrls { + etcdConfig.AdvertiseClientUrls[i].Scheme = "https" } client := testserver.RunEtcd(t, etcdConfig)