Fix panic when use generators

Function InitGenerators depends on s.environment.IstioConfigStore initialized in function initControllers.initConfigController, IstioConfigStore is initialized after Function InitGenerator。

Move from the previously initialized position to the current position, and no function using Generators is found in the middle

Author: ChenglongGao327

pilot/pkg/bootstrap/server.go

@@ -22,7 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"istio.io/istio/pilot/pkg/networking/apigen"
 	"net"
 	"net/http"
 	"os"
@@ -266,7 +265,7 @@ func NewServer(args *PilotArgs, initFuncs ...func(*Server)) (*Server, error) {
 		return nil, err
 	}
 
-	s.XDSServer.Generators["api"] = apigen.NewGenerator(e.IstioConfigStore)
+	s.XDSServer.InitGenerators(e, args.Namespace)
 
 	// Initialize workloadTrustBundle after CA has been initialized
 	if err := s.initWorkloadTrustBundle(args); err != nil {

pilot/pkg/xds/discovery.go

@@ -196,8 +196,6 @@ func NewDiscoveryServer(env *model.Environment, plugins []string, instanceID str
 
 	out.initJwksResolver()
 
-	out.initGenerators(env, systemNameSpace)
-
 	if features.EnableXDSCaching {
 		out.Cache = model.NewXdsCache()
 	}
@@ -536,8 +534,8 @@ func (s *DiscoveryServer) sendPushes(stopCh <-chan struct{}) {
 	doSendPushes(stopCh, s.concurrentPushLimit, s.pushQueue)
 }
 
-// initGenerators initializes generators to be used by XdsServer.
-func (s *DiscoveryServer) initGenerators(env *model.Environment, systemNameSpace string) {
+// InitGenerators initializes generators to be used by XdsServer.
+func (s *DiscoveryServer) InitGenerators(env *model.Environment, systemNameSpace string) {
 	edsGen := &EdsGenerator{Server: s}
 	s.StatusGen = NewStatusGen(s)
 	s.Generators[v3.ClusterType] = &CdsGenerator{Server: s}

pilot/pkg/xds/fake.go

@@ -115,6 +115,7 @@ func NewFakeDiscoveryServer(t test.Failer, opts FakeOptions) *FakeDiscoveryServe
 	// Init with a dummy environment, since we have a circular dependency with the env creation.
 	s := NewDiscoveryServer(&model.Environment{PushContext: model.NewPushContext()}, []string{plugin.AuthzCustom, plugin.Authn, plugin.Authz},
 		"pilot-123", "istio-system")
+	s.InitGenerators(&model.Environment{PushContext: model.NewPushContext()}, "istio-system")
 	t.Cleanup(func() {
 		s.JwtKeyResolver.Close()
 		s.pushQueue.ShutDown()

pilot/pkg/xds/simple.go

@@ -80,6 +80,7 @@ func NewXDS(stop chan struct{}) *SimpleServer {
 	env.Init()
 
 	ds := NewDiscoveryServer(env, nil, "istiod", "istio-system")
+	ds.InitGenerators(env, "istio-system")
 	ds.CachesSynced()
 
 	// Config will have a fixed format: