OSSM-1689 Simplify IOR (maistra#747)

* Rework IOR initialization Signed-off-by: Yann Liu <[email protected]> * Remove `initialSync` `initialSync` is not needed. - During boostrap, `SetNamesapces`is always called with no namespaces. - When removing or adding a namespace, the underlaying informer will trigger an `ADD` event for all resources the informer watches Signed-off-by: Yann Liu <[email protected]> * DIsable TestPref Signed-off-by: Yann Liu <[email protected]> * Rename Signed-off-by: Yann Liu <[email protected]> * Call `findService` once for each gateway Signed-off-by: Yann Liu <[email protected]> * Use original host to generate Route name Signed-off-by: Yann Liu <[email protected]> * Skip duplicate update test Signed-off-by: Yann Liu <[email protected]> * Improve concurrency test Signed-off-by: Yann Liu <[email protected]> * Introduce update Route on Gateway update Signed-off-by: Yann Liu <[email protected]> * Fix data race Signed-off-by: Yann Liu <[email protected]> * Format and lint Signed-off-by: Yann Liu <[email protected]> * Respect log level Signed-off-by: Yann Liu <[email protected]> * Refactor IOR - `gatawayMap` is removed. `Routes` are retrived via API. - `reconcileGateway` is used to achieve the desired state. - `processEvent` will only process the latest and try to abort early. Signed-off-by: Yann Liu <[email protected]> * Remove unused functions Signed-off-by: Yann Liu <[email protected]> * Use `Lister` for finding target service Signed-off-by: Yann Liu <[email protected]> * Start IOR before kube client Signed-off-by: Yann Liu <[email protected]> * Remove unused properties Signed-off-by: Yann Liu <[email protected]> * Rework test initialization Signed-off-by: Yann Liu <[email protected]> * Log correct debug information Signed-off-by: Yann Liu <[email protected]> * Remove unnecessary parameters Signed-off-by: Yann Liu <[email protected]> * Remove ResourceVersion usage Signed-off-by: Yann Liu <[email protected]> * Avoid deletion of a route when failing to update Signed-off-by: Yann Liu <[email protected]> * Update FakeRouter to record API call counts Signed-off-by: Yann Liu <[email protected]> * Rework initialization Signed-off-by: Yann Liu <[email protected]> * Keep startup process order consistent Signed-off-by: Yann Liu <[email protected]> * Fix creating matching service Signed-off-by: Yann Liu <[email protected]> * Test IOR to be idempotent Signed-off-by: Yann Liu <[email protected]> * Remove unused parameters Signed-off-by: Yann Liu <[email protected]> * Rename symbol Signed-off-by: Yann Liu <[email protected]> * Remove used struct Signed-off-by: Yann Liu <[email protected]> * Improve styling and wording Signed-off-by: Yann Liu <[email protected]> * Add support list across namespaces in faker Signed-off-by: Yann Liu <[email protected]> * Lint and format Signed-off-by: Yann Liu <[email protected]> * Introduce Openshift Route informer Signed-off-by: Yann Liu <[email protected]> * Lint Signed-off-by: Yann Liu <[email protected]> * Run make gen Signed-off-by: Yann Liu <[email protected]> * Fix data race Signed-off-by: Yann Liu <[email protected]> * Fix test data race Signed-off-by: Yann Liu <[email protected]> * Lint Signed-off-by: Yann Liu <[email protected]> * Rename variables Signed-off-by: Yann Liu <[email protected]> * Fix update route Signed-off-by: Yann Liu <[email protected]> * Linit Signed-off-by: Yann Liu <[email protected]> * Increase wait for the delete Signed-off-by: Yann Liu <[email protected]> * Maximize time to wait for the route deletion * Fix route update Signed-off-by: Yann Liu <[email protected]> * Fix route update Signed-off-by: Yann Liu <[email protected]> * Test with a 30 second wait Signed-off-by: Yann Liu <[email protected]> * Fix flaky test Signed-off-by: Yann Liu <[email protected]> * Add disabling IOR and clean up Signed-off-by: Yann Liu <[email protected]> * Defer clean up Signed-off-by: Yann Liu <[email protected]> * Clear only ior routes Signed-off-by: Yann Liu <[email protected]> * rename newRoute to newRouteController * rename route.go to controller.go --------- Signed-off-by: Yann Liu <[email protected]> Co-authored-by: Marko Lukša <[email protected]> Signed-off-by: Yann Liu <[email protected]>
yannuil · Sep 4, 2023 · 466ae69 · 466ae69
1 parent afe4692
commit 466ae69
Show file tree

Hide file tree

Showing 13 changed files with 828 additions and 1,381 deletions.
diff --git a/go.mod b/go.mod
@@ -212,7 +212,7 @@ require (
 	github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pkg/errors v0.9.1
 	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/prometheus/prom2json v1.3.2 // indirect
 	github.com/prometheus/statsd_exporter v0.23.0 // indirect
@@ -226,7 +226,7 @@ require (
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/stoewer/go-strcase v1.3.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.2 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/vbatts/tar-split v0.11.2 // indirect
 	github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect

diff --git a/pilot/pkg/bootstrap/configcontroller.go b/pilot/pkg/bootstrap/configcontroller.go
@@ -124,8 +124,6 @@ func (s *Server) initConfigController(args *PilotArgs) error {
 	// Create the config store.
 	s.environment.ConfigStore = aggregateConfigController
 
-	s.startIOR(args)
-
 	// Defer starting the controller until after the service is created.
 	s.addStartFunc(func(stop <-chan struct{}) error {
 		go s.configController.Run(stop)
@@ -135,32 +133,6 @@ func (s *Server) initConfigController(args *PilotArgs) error {
 	return nil
 }
 
-// startIOR tries to start IOR, if it's enabled. If it encounters any failure, it logs an error and continue
-func (s *Server) startIOR(args *PilotArgs) {
-	if !features.EnableIOR {
-		return
-	}
-
-	routerClient, err := ior.NewRouterClient()
-	if err != nil {
-		ior.IORLog.Errorf("error creating an openshift router client: %v", err)
-		return
-	}
-
-	iorKubeClient := ior.NewKubeClient(s.kubeClient)
-
-	s.addStartFunc(func(stop <-chan struct{}) error {
-		go leaderelection.
-			NewLeaderElection(args.Namespace, args.PodName, leaderelection.IORController, args.Revision, s.kubeClient).
-			AddRunFunction(func(stop <-chan struct{}) {
-				if err := ior.Register(iorKubeClient, routerClient, s.configController, args.Namespace, s.kubeClient.GetMemberRollController(), stop, nil); err != nil {
-					ior.IORLog.Error(err)
-				}
-			}).Run(stop)
-		return nil
-	})
-}
-
 func (s *Server) initK8SConfigStore(args *PilotArgs) error {
 	if s.kubeClient == nil {
 		return nil
@@ -233,6 +205,16 @@ func (s *Server) initK8SConfigStore(args *PilotArgs) error {
 			return err
 		}
 	}
+	if features.EnableIOR {
+		s.addTerminatingStartFunc(func(stop <-chan struct{}) error {
+			leaderelection.
+				NewLeaderElection(args.Namespace, args.PodName, leaderelection.IORController, args.Revision, s.kubeClient).
+				AddRunFunction(func(leaderStop <-chan struct{}) {
+					ior.Run(s.kubeClient, configController, leaderStop)
+				}).Run(stop)
+			return nil
+		})
+	}
 	s.RWConfigStore, err = configaggregate.MakeWriteableCache(s.ConfigStores, configController)
 	if err != nil {
 		return err