sds: Remove unused services list from SDS struct

Signed-off-by: Delyan Raychev <delyan.raychev@microsoft.com>
openservicemesh · Feb 26, 2021 · 6b7d1aa · 6b7d1aa
1 parent 5c137bd
commit 6b7d1aa
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 29 deletions.
diff --git a/pkg/envoy/sds/response.go b/pkg/envoy/sds/response.go
@@ -21,13 +21,6 @@ import (
 func NewResponse(meshCatalog catalog.MeshCataloger, proxy *envoy.Proxy, request *xds_discovery.DiscoveryRequest, cfg configurator.Configurator, certManager certificate.Manager) (*xds_discovery.DiscoveryResponse, error) {
 	log.Debug().Msgf("Composing SDS Discovery Response for Envoy with certificate SerialNumber=%s on Pod with UID=%s", proxy.GetCertificateSerialNumber(), proxy.GetPodUID())
 
-	svcList, err := meshCatalog.GetServicesFromEnvoyCertificate(proxy.GetCertificateCommonName())
-	if err != nil {
-		log.Error().Err(err).Msgf("Error getting services associated with Envoy with certificate SerialNumber=%s on Pod with UID=%s",
-			proxy.GetCertificateSerialNumber(), proxy.GetPodUID())
-		return nil, err
-	}
-
 	// OSM currently relies on kubernetes ServiceAccount for service identity
 	svcAccount, err := catalog.GetServiceAccountFromProxyCertificate(proxy.GetCertificateCommonName())
 	if err != nil {
@@ -36,18 +29,17 @@ func NewResponse(meshCatalog catalog.MeshCataloger, proxy *envoy.Proxy, request
 		return nil, err
 	}
 
-	sdsImpl := newSDSImpl(proxy, meshCatalog, certManager, cfg, svcList, svcAccount)
+	sdsImpl := newSDSImpl(proxy, meshCatalog, certManager, cfg, svcAccount)
 	return sdsImpl.createDiscoveryResponse(request)
 }
 
-func newSDSImpl(proxy *envoy.Proxy, meshCatalog catalog.MeshCataloger, certManager certificate.Manager, cfg configurator.Configurator, proxyServices []service.MeshService, svcAccount service.K8sServiceAccount) *sdsImpl {
+func newSDSImpl(proxy *envoy.Proxy, meshCatalog catalog.MeshCataloger, certManager certificate.Manager, cfg configurator.Configurator, svcAccount service.K8sServiceAccount) *sdsImpl {
 	impl := &sdsImpl{
-		proxy:         proxy,
-		meshCatalog:   meshCatalog,
-		certManager:   certManager,
-		cfg:           cfg,
-		svcAccount:    svcAccount,
-		proxyServices: proxyServices,
+		proxy:       proxy,
+		meshCatalog: meshCatalog,
+		certManager: certManager,
+		cfg:         cfg,
+		svcAccount:  svcAccount,
 	}
 
 	return impl

diff --git a/pkg/envoy/sds/response_test.go b/pkg/envoy/sds/response_test.go
@@ -137,10 +137,9 @@ func TestGetRootCert(t *testing.T) {
 			certCommonName := certificate.CommonName(fmt.Sprintf("%s.%s.%s", uuid.New().String(), "sa-1", "ns-1"))
 			certSerialNumber := certificate.SerialNumber("123456")
 			s := &sdsImpl{
-				proxyServices: []service.MeshService{tc.proxyService},
-				svcAccount:    tc.proxySvcAccount,
-				proxy:         envoy.NewProxy(certCommonName, certSerialNumber, nil),
-				certManager:   mockCertManager,
+				svcAccount:  tc.proxySvcAccount,
+				proxy:       envoy.NewProxy(certCommonName, certSerialNumber, nil),
+				certManager: mockCertManager,
 
 				// these points to the dynamic mocks which gets updated for each test
 				meshCatalog: d.mockCatalog,
@@ -356,10 +355,9 @@ func TestGetSDSSecrets(t *testing.T) {
 			certCommonName := certificate.CommonName(fmt.Sprintf("%s.%s.%s", uuid.New().String(), "sa-1", "ns-1"))
 			certSerialNumber := certificate.SerialNumber("123456")
 			s := &sdsImpl{
-				proxyServices: []service.MeshService{tc.proxyService},
-				svcAccount:    tc.proxySvcAccount,
-				proxy:         envoy.NewProxy(certCommonName, certSerialNumber, nil),
-				certManager:   mockCertManager,
+				svcAccount:  tc.proxySvcAccount,
+				proxy:       envoy.NewProxy(certCommonName, certSerialNumber, nil),
+				certManager: mockCertManager,
 
 				// these points to the dynamic mocks which gets updated for each test
 				meshCatalog: d.mockCatalog,

diff --git a/pkg/envoy/sds/types.go b/pkg/envoy/sds/types.go
@@ -16,10 +16,9 @@ var (
 
 // sdsImpl is the type that implements the internal functionality of SDS
 type sdsImpl struct {
-	proxy         *envoy.Proxy
-	proxyServices []service.MeshService
-	svcAccount    service.K8sServiceAccount
-	meshCatalog   catalog.MeshCataloger
-	cfg           configurator.Configurator
-	certManager   certificate.Manager
+	proxy       *envoy.Proxy
+	svcAccount  service.K8sServiceAccount
+	meshCatalog catalog.MeshCataloger
+	cfg         configurator.Configurator
+	certManager certificate.Manager
 }