Get daemon buildable

k8snetworkplumbingwg · Jun 18, 2024 · bad59fc · bad59fc
1 parent 6842e22
commit bad59fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/daemon/cmd/main.go b/pkg/daemon/cmd/main.go
@@ -120,7 +120,6 @@ func main() {
 		plugins,
 		&hwconfigs,
 		&refreshNodePtpDevice,
-		closeProcessManager,
 		cp.pmcPollInterval,
 		lm,
 	).Run()

diff --git a/pkg/daemon/daemon/daemon.go b/pkg/daemon/daemon/daemon.go
@@ -57,6 +57,7 @@ var (
 // or stopped simultaneously.
 type ProcessManager struct {
 	process []*ptpProcess
+	eventChannel    chan event.EventChannel
 }
 
 // NewProcessManager is used by unit tests
@@ -112,6 +113,7 @@ type ptpProcess struct {
 	ptp4lConfigPath   string
 	configName        string
 	messageTag        string
+	eventCh           chan event.EventChannel
 	exitCh            chan bool
 	execMutex         sync.Mutex
 	stopped           bool
@@ -434,7 +436,6 @@ func (dn *Daemon) applyNodePtpProfile(runID int, nodeProfile *ptpv1.PtpProfile)
 			configFile = fmt.Sprintf("phc2sys.%d.config", runID)
 			configPath = fmt.Sprintf("/var/run/%s", configFile)
 		case ts2phcProcessName:
-			clockType = event.GM
 			configInput = nodeProfile.Ts2PhcConf
 			configOpts = nodeProfile.Ts2PhcOpts
 			socketPath = fmt.Sprintf("/var/run/ptp4l.%d.socket", runID)
@@ -760,7 +761,7 @@ func (p *ptpProcess) cmdRun() {
 				output := scanner.Text()
 				if p.pmcCheck {
 					p.pmcCheck = false
-					go p.updateClockClass(&c)
+					go p.updateClockClass(nil)
 				}
 
 				if regexErr != nil || !logFilterRegex.MatchString(output) {