created syncermetrics at the top level of multiproject

Author: priyapande

cmd/glbc/main.go

@@ -267,6 +267,8 @@ func main() {
 				nodeTopologyFactory = informernodetopology.NewSharedInformerFactory(nodeTopologyClient, flags.F.ResyncPeriod)
 			}
 			ctx := context.Background()
+			syncerMetrics := syncMetrics.NewNegMetricsCollector(flags.F.NegMetricsExportInterval, rootLogger, "")
+
 			if flags.F.LeaderElection.LeaderElect {
 				err := multiprojectstart.StartWithLeaderElection(
 					ctx,
@@ -285,6 +287,7 @@ func main() {
 					gceCreator,
 					namer,
 					stopCh,
+					syncerMetrics,
 				)
 				if err != nil {
 					rootLogger.Error(err, "Failed to start multi-project syncer with leader election")
@@ -305,6 +308,7 @@ func main() {
 					gceCreator,
 					namer,
 					stopCh,
+					syncerMetrics,
 				)
 			}
 		}, rOption.wg)

pkg/multiproject/manager/manager.go

@@ -15,6 +15,7 @@ import (
 	"k8s.io/ingress-gce/pkg/multiproject/finalizer"
 	"k8s.io/ingress-gce/pkg/multiproject/gce"
 	"k8s.io/ingress-gce/pkg/multiproject/neg"
+	syncMetrics "k8s.io/ingress-gce/pkg/neg/metrics/metricscollector"
 	"k8s.io/ingress-gce/pkg/neg/syncers/labels"
 	providerconfigclient "k8s.io/ingress-gce/pkg/providerconfig/client/clientset/versioned"
 	svcnegclient "k8s.io/ingress-gce/pkg/svcneg/client/clientset/versioned"
@@ -44,6 +45,7 @@ type ProviderConfigControllersManager struct {
 	lpConfig             labels.PodLabelPropagationConfig
 	gceCreator           gce.GCECreator
 	globalStopCh         <-chan struct{}
+	syncerMetrics        *syncMetrics.SyncerMetrics
 }
 
 type ControllerSet struct {
@@ -66,6 +68,7 @@ func NewProviderConfigControllerManager(
 	gceCreator gce.GCECreator,
 	globalStopCh <-chan struct{},
 	logger klog.Logger,
+	syncerMetrics *syncMetrics.SyncerMetrics,
 ) *ProviderConfigControllersManager {
 	return &ProviderConfigControllersManager{
 		controllers:          make(map[string]*ControllerSet),
@@ -84,6 +87,7 @@ func NewProviderConfigControllerManager(
 		lpConfig:             lpConfig,
 		gceCreator:           gceCreator,
 		globalStopCh:         globalStopCh,
+		syncerMetrics:        syncerMetrics,
 	}
 }
 
@@ -133,6 +137,7 @@ func (pccm *ProviderConfigControllersManager) StartControllersForProviderConfig(
 		pccm.globalStopCh,
 		logger,
 		pc,
+		pccm.syncerMetrics,
 	)
 	if err != nil {
 		cleanupErr := finalizer.DeleteProviderConfigNEGCleanupFinalizer(pc, pccm.providerConfigClient, logger)

pkg/multiproject/neg/neg.go

@@ -68,6 +68,7 @@ func StartNEGController(
 	globalStopCh <-chan struct{},
 	logger klog.Logger,
 	providerConfig *providerconfig.ProviderConfig,
+	syncerMetrics *syncMetrics.SyncerMetrics,
 ) (chan<- struct{}, error) {
 	providerConfigName := providerConfig.Name
 	logger.V(2).Info("Initializing NEG controller", "providerConfig", providerConfigName)
@@ -130,6 +131,7 @@ func StartNEGController(
 		joinedStopCh,
 		logger,
 		providerConfigID,
+		syncerMetrics,
 	)
 
 	if err != nil {
@@ -289,6 +291,7 @@ func createNEGController(
 	stopCh <-chan struct{},
 	logger klog.Logger,
 	providerConfigID string,
+	syncerMetrics *syncMetrics.SyncerMetrics,
 ) (*neg.Controller, error) {
 
 	// The adapter uses Network SelfLink
@@ -301,7 +304,6 @@ func createNEGController(
 	noDefaultBackendServicePort := utils.ServicePort{}
 	var noNodeTopologyInformer cache.SharedIndexInformer
 	negMetrics := metrics.NewNegMetrics(providerConfigID)
-	syncerMetrics := syncMetrics.NewNegMetricsCollector(flags.F.NegMetricsExportInterval, logger, negMetrics.ProviderConfigID)
 	negController, err := neg.NewController(
 		kubeClient,
 		svcNegClient,

pkg/multiproject/start/start.go

@@ -19,10 +19,13 @@ import (
 	pccontroller "k8s.io/ingress-gce/pkg/multiproject/controller"
 	"k8s.io/ingress-gce/pkg/multiproject/gce"
 	"k8s.io/ingress-gce/pkg/multiproject/manager"
+	"k8s.io/ingress-gce/pkg/neg/metrics"
+	syncMetrics "k8s.io/ingress-gce/pkg/neg/metrics/metricscollector"
 	"k8s.io/ingress-gce/pkg/neg/syncers/labels"
 	providerconfigclient "k8s.io/ingress-gce/pkg/providerconfig/client/clientset/versioned"
 	providerconfiginformers "k8s.io/ingress-gce/pkg/providerconfig/client/informers/externalversions"
 	"k8s.io/ingress-gce/pkg/recorders"
+
 	svcnegclient "k8s.io/ingress-gce/pkg/svcneg/client/clientset/versioned"
 	informersvcneg "k8s.io/ingress-gce/pkg/svcneg/client/informers/externalversions"
 	"k8s.io/ingress-gce/pkg/utils/namer"
@@ -31,6 +34,12 @@ import (
 
 const multiProjectLeaderElectionLockName = "ingress-gce-multi-project-lock"
 
+func init() {
+	// register prometheus metrics
+	metrics.RegisterMetrics()
+	syncMetrics.RegisterMetrics()
+}
+
 // StartWithLeaderElection starts the ProviderConfig controller with leader election.
 func StartWithLeaderElection(
 	parentCtx context.Context,
@@ -49,12 +58,13 @@ func StartWithLeaderElection(
 	gceCreator gce.GCECreator,
 	rootNamer *namer.Namer,
 	stopCh <-chan struct{},
+	syncerMetrics *syncMetrics.SyncerMetrics,
 ) error {
 	logger.V(1).Info("Starting multi-project controller with leader election", "host", hostname)
 
 	recordersManager := recorders.NewManager(eventRecorderKubeClient, logger)
 
-	leConfig, err := makeLeaderElectionConfig(leaderElectKubeClient, hostname, recordersManager, logger, kubeClient, svcNegClient, kubeSystemUID, eventRecorderKubeClient, providerConfigClient, informersFactory, svcNegFactory, networkFactory, nodeTopologyFactory, gceCreator, rootNamer)
+	leConfig, err := makeLeaderElectionConfig(leaderElectKubeClient, hostname, recordersManager, logger, kubeClient, svcNegClient, kubeSystemUID, eventRecorderKubeClient, providerConfigClient, informersFactory, svcNegFactory, networkFactory, nodeTopologyFactory, gceCreator, rootNamer, syncerMetrics)
 	if err != nil {
 		return err
 	}
@@ -88,6 +98,7 @@ func makeLeaderElectionConfig(
 	nodeTopologyFactory informernodetopology.SharedInformerFactory,
 	gceCreator gce.GCECreator,
 	rootNamer *namer.Namer,
+	syncerMetrics *syncMetrics.SyncerMetrics,
 ) (*leaderelection.LeaderElectionConfig, error) {
 	recorder := recordersManager.Recorder(flags.F.LeaderElection.LockObjectNamespace)
 	// add a uniquifier so that two processes on the same host don't accidentally both become active
@@ -116,7 +127,7 @@ func makeLeaderElectionConfig(
 		Callbacks: leaderelection.LeaderCallbacks{
 			OnStartedLeading: func(ctx context.Context) {
 				logger.Info("Became leader, starting multi-project controller")
-				Start(logger, kubeClient, svcNegClient, kubeSystemUID, eventRecorderKubeClient, providerConfigClient, informersFactory, svcNegFactory, networkFactory, nodeTopologyFactory, gceCreator, rootNamer, ctx.Done())
+				Start(logger, kubeClient, svcNegClient, kubeSystemUID, eventRecorderKubeClient, providerConfigClient, informersFactory, svcNegFactory, networkFactory, nodeTopologyFactory, gceCreator, rootNamer, ctx.Done(), syncerMetrics)
 			},
 			OnStoppedLeading: func() {
 				logger.Info("Stop running multi-project leader election")
@@ -143,6 +154,7 @@ func Start(
 	gceCreator gce.GCECreator,
 	rootNamer *namer.Namer,
 	stopCh <-chan struct{},
+	syncerMetrics *syncMetrics.SyncerMetrics,
 ) {
 	logger.V(1).Info("Starting ProviderConfig controller")
 	lpConfig := labels.PodLabelPropagationConfig{}
@@ -173,6 +185,7 @@ func Start(
 		gceCreator,
 		stopCh,
 		logger,
+		syncerMetrics,
 	)
 	logger.V(1).Info("Initialized ProviderConfig controller manager")
 

pkg/multiproject/start/start_test.go

@@ -30,8 +30,10 @@ import (
 	"k8s.io/ingress-gce/pkg/multiproject/finalizer"
 	multiprojectgce "k8s.io/ingress-gce/pkg/multiproject/gce"
 	"k8s.io/ingress-gce/pkg/multiproject/testutil"
+	syncMetrics "k8s.io/ingress-gce/pkg/neg/metrics/metricscollector"
 	negtypes "k8s.io/ingress-gce/pkg/neg/types"
 	pcclientfake "k8s.io/ingress-gce/pkg/providerconfig/client/clientset/versioned/fake"
+
 	svcnegfake "k8s.io/ingress-gce/pkg/svcneg/client/clientset/versioned/fake"
 	informersvcneg "k8s.io/ingress-gce/pkg/svcneg/client/informers/externalversions"
 	"k8s.io/ingress-gce/pkg/utils/namer"
@@ -242,6 +244,7 @@ func TestStartProviderConfigIntegration(t *testing.T) {
 					gceCreator,
 					rootNamer,
 					stopCh,
+					syncMetrics.FakeSyncerMetrics(),
 				)
 			}()
 
@@ -347,7 +350,7 @@ func TestSharedInformers_PC1Stops_PC2AndPC3KeepWorking(t *testing.T) {
 	go Start(
 		logger, kubeClient, svcNegClient, kubeSystemUID, kubeClient,
 		pcClient, informersFactory, svcNegFactory, networkFactory, nodeTopoFactory,
-		gceCreator, rootNamer, globalStop,
+		gceCreator, rootNamer, globalStop, syncMetrics.FakeSyncerMetrics(),
 	)
 
 	// --- pc-1: create and validate baseline service ---
@@ -971,6 +974,7 @@ func TestProviderConfigErrorCases(t *testing.T) {
 					gceCreator,
 					rootNamer,
 					stopCh,
+					syncMetrics.FakeSyncerMetrics(),
 				)
 			}()