Refactor upstream implementation in state package

- Adds new component relationship.Capturer to capture and report on
  relationships between resources.
- Replaces ServiceStore component with a new component ServiceResolver.
- Adds the "kubernetes.io/service-name" as an index field to the EndpointSlice
  resolver. This allows for a quick lookup on EndpointSlices given a Service
name.
- Adds a ServicePortsChangedPredicate function as an event filter for Service
  events. This filters out Service updates that don't involve port changes.
Also, fixed bug where we weren't updating nginx config on a Service port update.
- Moves captureResourceChanges methods from ChangeProcessor to the store.
- Moves storeChanged boolean to the store.
- Removes helpers.getNamespacedName in favor of third party function.
- Plumbs context from EventHandler through ServiceResolver.Resolver() function.

internal/events/handler.go

@@ -29,8 +29,6 @@ type EventHandler interface {
 type EventHandlerConfig struct {
 	// Processor is the state ChangeProcessor.
 	Processor state.ChangeProcessor
-	// ServiceStore is the state ServiceStore.
-	ServiceStore state.ServiceStore
 	// SecretStore is the state SecretStore.
 	SecretStore state.SecretStore
 	// SecretMemoryManager is the state SecretMemoryManager.
@@ -74,7 +72,7 @@ func (h *EventHandlerImpl) HandleEventBatch(ctx context.Context, batch EventBatc
 		}
 	}
 
-	changed, conf, statuses := h.cfg.Processor.Process()
+	changed, conf, statuses := h.cfg.Processor.Process(ctx)
 	if !changed {
 		h.cfg.Logger.Info("Handling events didn't result into NGINX configuration changes")
 		return
@@ -121,7 +119,6 @@ func (h *EventHandlerImpl) propagateUpsert(e *UpsertEvent) {
 	case *v1beta1.HTTPRoute:
 		h.cfg.Processor.CaptureUpsertChange(r)
 	case *apiv1.Service:
-		h.cfg.ServiceStore.Upsert(r)
 		h.cfg.Processor.CaptureUpsertChange(r)
 	case *apiv1.Secret:
 		// FIXME(kate-osborn): need to handle certificate rotation
@@ -142,7 +139,6 @@ func (h *EventHandlerImpl) propagateDelete(e *DeleteEvent) {
 	case *v1beta1.HTTPRoute:
 		h.cfg.Processor.CaptureDeleteChange(e.Type, e.NamespacedName)
 	case *apiv1.Service:
-		h.cfg.ServiceStore.Delete(e.NamespacedName)
 		h.cfg.Processor.CaptureDeleteChange(e.Type, e.NamespacedName)
 	case *apiv1.Secret:
 		// FIXME(kate-osborn): make sure that affected servers are updated

internal/events/handler_test.go

@@ -40,7 +40,6 @@ var _ = Describe("EventHandler", func() {
 	var (
 		handler                 *events.EventHandlerImpl
 		fakeProcessor           *statefakes.FakeChangeProcessor
-		fakeServiceStore        *statefakes.FakeServiceStore
 		fakeSecretStore         *statefakes.FakeSecretStore
 		fakeSecretMemoryManager *statefakes.FakeSecretDiskMemoryManager
 		fakeGenerator           *configfakes.FakeGenerator
@@ -69,7 +68,6 @@ var _ = Describe("EventHandler", func() {
 
 	BeforeEach(func() {
 		fakeProcessor = &statefakes.FakeChangeProcessor{}
-		fakeServiceStore = &statefakes.FakeServiceStore{}
 		fakeSecretMemoryManager = &statefakes.FakeSecretDiskMemoryManager{}
 		fakeSecretStore = &statefakes.FakeSecretStore{}
 		fakeGenerator = &configfakes.FakeGenerator{}
@@ -79,7 +77,6 @@ var _ = Describe("EventHandler", func() {
 
 		handler = events.NewEventHandlerImpl(events.EventHandlerConfig{
 			Processor:           fakeProcessor,
-			ServiceStore:        fakeServiceStore,
 			SecretStore:         fakeSecretStore,
 			SecretMemoryManager: fakeSecretMemoryManager,
 			Generator:           fakeGenerator,
@@ -234,13 +231,6 @@ var _ = Describe("EventHandler", func() {
 			Expect(passedNsName).Should(Equal(d.NamespacedName))
 		}
 
-		// Check Service-related expectations
-		Expect(fakeServiceStore.UpsertCallCount()).Should(Equal(1))
-		Expect(fakeServiceStore.UpsertArgsForCall(0)).Should(Equal(svc))
-
-		Expect(fakeServiceStore.DeleteCallCount()).Should(Equal(1))
-		Expect(fakeServiceStore.DeleteArgsForCall(0)).Should(Equal(svcNsName))
-
 		// Check Secret-related expectations
 		Expect(fakeSecretStore.UpsertCallCount()).Should(Equal(1))
 		Expect(fakeSecretStore.UpsertArgsForCall(0)).Should(Equal(secret))

internal/manager/manager.go

@@ -25,6 +25,7 @@ import (
 	"github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/file"
 	ngxruntime "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/runtime"
 	"github.com/nginxinc/nginx-kubernetes-gateway/internal/state"
+	"github.com/nginxinc/nginx-kubernetes-gateway/internal/state/resolver"
 	"github.com/nginxinc/nginx-kubernetes-gateway/internal/status"
 	"github.com/nginxinc/nginx-kubernetes-gateway/pkg/sdk"
 )
@@ -91,12 +92,11 @@ func Start(cfg config.Config) error {
 	secretStore := state.NewSecretStore()
 	secretMemoryMgr := state.NewSecretDiskMemoryManager(secretsFolder, secretStore)
 
-	serviceStore := state.NewServiceStore(mgr.GetClient())
 	processor := state.NewChangeProcessorImpl(state.ChangeProcessorConfig{
 		GatewayCtlrName:     cfg.GatewayCtlrName,
 		GatewayClassName:    cfg.GatewayClassName,
 		SecretMemoryManager: secretMemoryMgr,
-		ServiceStore:        serviceStore,
+		ServiceResolver:     resolver.NewServiceResolverImpl(mgr.GetClient()),
 		Logger:              cfg.Logger.WithName("changeProcessor"),
 	})
 
@@ -116,7 +116,6 @@ func Start(cfg config.Config) error {
 
 	eventHandler := events.NewEventHandlerImpl(events.EventHandlerConfig{
 		Processor:           processor,
-		ServiceStore:        serviceStore,
 		SecretStore:         secretStore,
 		SecretMemoryManager: secretMemoryMgr,
 		Generator:           configGenerator,

internal/nginx/config/generator_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/nginxinc/nginx-kubernetes-gateway/internal/helpers"
 	"github.com/nginxinc/nginx-kubernetes-gateway/internal/state"
+	"github.com/nginxinc/nginx-kubernetes-gateway/internal/state/resolver"
 )
 
 func TestGenerate(t *testing.T) {
@@ -386,7 +387,7 @@ func TestGenerateHTTPUpstreams(t *testing.T) {
 	stateUpstreams := []state.Upstream{
 		{
 			Name: "up1",
-			Endpoints: []state.Endpoint{
+			Endpoints: []resolver.Endpoint{
 				{
 					Address: "10.0.0.0",
 					Port:    80,
@@ -403,7 +404,7 @@ func TestGenerateHTTPUpstreams(t *testing.T) {
 		},
 		{
 			Name: "up2",
-			Endpoints: []state.Endpoint{
+			Endpoints: []resolver.Endpoint{
 				{
 					Address: "11.0.0.0",
 					Port:    80,
@@ -412,7 +413,7 @@ func TestGenerateHTTPUpstreams(t *testing.T) {
 		},
 		{
 			Name:      "up3",
-			Endpoints: []state.Endpoint{},
+			Endpoints: []resolver.Endpoint{},
 		},
 	}
 
@@ -482,15 +483,15 @@ func TestGenerateUpstream(t *testing.T) {
 		{
 			stateUpstream: state.Upstream{
 				Name:      "no-endpoints",
-				Endpoints: []state.Endpoint{},
+				Endpoints: []resolver.Endpoint{},
 			},
 			expectedUpstream: upstream{Name: "no-endpoints", Servers: []upstreamServer{{Address: nginx502Server}}},
 			msg:              "no endpoints",
 		},
 		{
 			stateUpstream: state.Upstream{
 				Name: "multiple-endpoints",
-				Endpoints: []state.Endpoint{
+				Endpoints: []resolver.Endpoint{
 					{
 						Address: "10.0.0.1",
 						Port:    80,

internal/nginx/config/upstreams_template.go

@@ -4,8 +4,8 @@ package config
 var httpUpstreamsTemplate = `{{ range $u := .Upstreams }}
 upstream {{ $u.Name }} {
     random two least_conn;
-	{{ range $server := $u.Servers }} 
-	server {{ $server.Address }};
-	{{ end }}
+    {{ range $server := $u.Servers }} 
+    server {{ $server.Address }};
+    {{ end }}
 }
 {{ end }}`