Skip to content

Commit

Permalink
resolved merge conflict as there isnt npm lite in v1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
huntergregory authored and rayaisaiah committed Jan 14, 2025
1 parent a9fa665 commit 423842c
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions npm/cmd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,10 @@ func start(config npmconfig.Config, flags npmconfig.Flags) error {
klog.Infof("Resync period for NPM pod is set to %d.", int(resyncPeriod/time.Minute))
factory := informers.NewSharedInformerFactory(clientset, resyncPeriod)

k8sServerVersion := k8sServerVersion(clientset)
err = metrics.CreateTelemetryHandle(config.NPMVersion(), version, npm.GetAIMetadata())
if err != nil {
klog.Infof("CreateTelemetryHandle failed with error %v. AITelemetry is not initialized.", err)
}

var dp dataplane.GenericDataplane
stopChannel := wait.NeverStop
Expand Down Expand Up @@ -184,11 +187,9 @@ func start(config npmconfig.Config, flags npmconfig.Flags) error {
}
dp.RunPeriodicTasks()
}

k8sServerVersion := k8sServerVersion(clientset)
npMgr := npm.NewNetworkPolicyManager(config, factory, dp, exec.New(), version, k8sServerVersion)
err = metrics.CreateTelemetryHandle(config.NPMVersion(), version, npm.GetAIMetadata())
if err != nil {
klog.Infof("CreateTelemetryHandle failed with error %v. AITelemetry is not initialized.", err)
}

go restserver.NPMRestServerListenAndServe(config, npMgr)

Expand Down

0 comments on commit 423842c

Please sign in to comment.