OSSM-1689 Simplify IOR

go.mod

@@ -48,7 +48,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0
 	github.com/lestrrat-go/jwx v1.2.25
 	github.com/lucas-clemente/quic-go v0.29.0
-	github.com/maistra/xns-informer v0.0.0-20230111124621-73ee35e5f523
+	github.com/maistra/xns-informer v0.0.0-20230213111714-f8d2c0b0070d
 	github.com/mattn/go-isatty v0.0.16
 	github.com/miekg/dns v1.1.50
 	github.com/mitchellh/copystructure v1.2.0
@@ -229,7 +229,7 @@ require (
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/stoewer/go-strcase v1.2.0 // indirect
-	github.com/stretchr/testify v1.8.0
+	github.com/stretchr/testify v1.8.0 // indirect
 	github.com/subosito/gotenv v1.4.1 // indirect
 	github.com/vbatts/tar-split v0.11.2 // indirect
 	github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect

go.sum

@@ -805,8 +805,8 @@ github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/maistra/xns-informer v0.0.0-20230111124621-73ee35e5f523 h1:NjeYQr1oG3nrSWUqmOIQMIYucJI8t/nPp0txdKwraYk=
-github.com/maistra/xns-informer v0.0.0-20230111124621-73ee35e5f523/go.mod h1:2DP6ps5pmbxaazskTazVHwwLF+RiW+EtcJqQxLBaWH8=
+github.com/maistra/xns-informer v0.0.0-20230213111714-f8d2c0b0070d h1:r5dEcBh/3VTleWxk9vwWarGHNIkHm9ckL8hSi0RuXwM=
+github.com/maistra/xns-informer v0.0.0-20230213111714-f8d2c0b0070d/go.mod h1:spcyztqFmNgRgHI9LgWfh4pjamak9cSphQfI3PxGxJM=
 github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU=
 github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
 github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=

pilot/pkg/bootstrap/configcontroller.go

@@ -149,8 +149,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)
@@ -160,32 +158,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.GetMemberRoll(), 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
@@ -248,6 +220,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