Merge pull request #1554 from marquiz/devel/topology-updater-no-publish

k8s-ci-robot · web-flow · commit 9be4f042181a · 2024-01-22T13:34:18.000+01:00
topology-updater: initialize properly with -no-publish
diff --git a/pkg/nfd-topology-updater/nfd-topology-updater.go b/pkg/nfd-topology-updater/nfd-topology-updater.go
@@ -131,13 +131,12 @@ func (w *nfdTopologyUpdater) Run() error {
 		return fmt.Errorf("failed to get PodResource Client: %w", err)
 	}
 
-	if !w.args.NoPublish {
-		kubeconfig, err := apihelper.GetKubeconfig(w.args.KubeConfigFile)
-		if err != nil {
-			return err
-		}
-		w.apihelper = apihelper.K8sHelpers{Kubeconfig: kubeconfig}
+	kubeconfig, err := apihelper.GetKubeconfig(w.args.KubeConfigFile)
+	if err != nil {
+		return err
 	}
+	w.apihelper = apihelper.K8sHelpers{Kubeconfig: kubeconfig}
+
 	if err := w.configure(); err != nil {
 		return fmt.Errorf("faild to configure Node Feature Discovery Topology Updater: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -131,13 +131,12 @@ func (w *nfdTopologyUpdater) Run() error {`
`131`	`131`	`return fmt.Errorf("failed to get PodResource Client: %w", err)`
`132`	`132`	`}`
`133`	`133`
`134`		`- if !w.args.NoPublish {`
`135`		`- kubeconfig, err := apihelper.GetKubeconfig(w.args.KubeConfigFile)`
`136`		`- if err != nil {`
`137`		`- return err`
`138`		`- }`
`139`		`- w.apihelper = apihelper.K8sHelpers{Kubeconfig: kubeconfig}`
	`134`	`+ kubeconfig, err := apihelper.GetKubeconfig(w.args.KubeConfigFile)`
	`135`	`+ if err != nil {`
	`136`	`+ return err`
`140`	`137`	`}`
	`138`	`+ w.apihelper = apihelper.K8sHelpers{Kubeconfig: kubeconfig}`
	`139`	`+`
`141`	`140`	`if err := w.configure(); err != nil {`
`142`	`141`	`return fmt.Errorf("faild to configure Node Feature Discovery Topology Updater: %w", err)`
`143`	`142`	`}`