Skip to content

Commit

Permalink
Get daemon building again
Browse files Browse the repository at this point in the history
  • Loading branch information
@josephdrichard
josephdrichard committed Jun 17, 2024
1 parent 35b92a3 commit d6698a1
Show file tree
Hide file tree
Showing 18 changed files with 26 additions and 655 deletions.
6 changes: 3 additions & 3 deletions addons/intel/e810.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"

"github.com/golang/glog"
"github.com/openshift/linuxptp-daemon/pkg/dpll"
"github.com/openshift/linuxptp-daemon/pkg/plugin"
ptpv1 "github.com/openshift/ptp-operator/api/v1"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/dpll"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/plugin"
ptpv1 "github.com/k8snetworkplumbingwg/ptp-operator/api/v1"
)

type E810Opts struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
ptpclient "github.com/k8snetworkplumbingwg/ptp-operator/pkg/client/clientset/versioned"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/config"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/daemon"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/leap"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/leap"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
)
Expand Down
3 changes: 1 addition & 2 deletions pkg/daemon/daemon/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/openshift/linuxptp-daemon/pkg/config"
"github.com/openshift/linuxptp-daemon/pkg/event"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/config"
"os"
"strconv"
"strings"
Expand Down
4 changes: 2 additions & 2 deletions pkg/daemon/daemon/daemon.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"github.com/golang/glog"
"k8s.io/client-go/kubernetes"

"github.com/k8snetworkplumbingwg/ptp-operator/pkg/leap"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/leap"

ptpnetwork "github.com/openshift/linuxptp-daemon/pkg/network"
ptpnetwork "github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/network"
ptpv1 "github.com/k8snetworkplumbingwg/ptp-operator/api/v1"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/daemon/daemon/daemon_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package daemon_test
import (
"flag"
"fmt"
ptpv1 "github.com/openshift/ptp-operator/api/v1"
ptpv1 "github.com/k8snetworkplumbingwg/ptp-operator/api/v1"
"k8s.io/utils/pointer"
"os"
"strings"
"testing"

"github.com/openshift/linuxptp-daemon/pkg/config"
"github.com/openshift/linuxptp-daemon/pkg/daemon"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/config"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/daemon"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/testutil"
"github.com/stretchr/testify/assert"
Expand Down
5 changes: 2 additions & 3 deletions pkg/daemon/daemon/gpsd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ import (
"syscall"
"time"

"github.com/openshift/linuxptp-daemon/pkg/event"
"github.com/openshift/linuxptp-daemon/pkg/gnss"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/leap"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/gnss"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/leap"
gpsdlib "github.com/stratoberry/go-gpsd"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/daemon/gpspipe.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package daemon

import (
"fmt"
"github.com/openshift/linuxptp-daemon/pkg/config"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/config"
"os"
"os/exec"
"sync"
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/daemon/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/golang/glog"
"github.com/prometheus/client_golang/prometheus/collectors"

"github.com/openshift/linuxptp-daemon/pkg/config"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/config"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
utilwait "k8s.io/apimachinery/pkg/util/wait"

Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/daemon/process.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package daemon

import "github.com/openshift/linuxptp-daemon/pkg/config"
import "github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/config"

type process interface {
Name() string
Expand Down
5 changes: 2 additions & 3 deletions pkg/daemon/dpll/dpll.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ import (

"github.com/golang/glog"
"github.com/mdlayher/genetlink"
"github.com/openshift/linuxptp-daemon/pkg/config"
nl "github.com/openshift/linuxptp-daemon/pkg/daemon/dpll-netlink"
"github.com/openshift/linuxptp-daemon/pkg/event"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/config"
nl "github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/dpll-netlink"
"golang.org/x/sync/semaphore"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/daemon/dpll/dpll_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ package dpll_test

import (
"fmt"
nl "github.com/openshift/linuxptp-daemon/pkg/dpll-netlink"
nl "github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/dpll-netlink"
"strconv"
"strings"
"testing"
"time"

"github.com/golang/glog"
"github.com/openshift/linuxptp-daemon/pkg/config"
"github.com/openshift/linuxptp-daemon/pkg/daemon/dpll"
"github.com/openshift/linuxptp-daemon/pkg/event"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/config"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/dpll"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/event"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/daemon/gnss/gnss.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"time"

"github.com/golang/glog"
"github.com/openshift/linuxptp-daemon/pkg/event"
"github.com/openshift/linuxptp-daemon/pkg/daemon/ublox/"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/event"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/ublox"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/leap/leap-file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"time"

"github.com/golang/glog"
"github.com/openshift/linuxptp-daemon/pkg/daemon/ublox"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/ublox"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/leap/leap-file_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

leaphash "github.com/facebook/time/leaphash"
"github.com/openshift/linuxptp-daemon/pkg/daemon/ublox"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/daemon/ublox"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/ublox/ublox_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ublox_test

import (
"github.com/openshift/linuxptp-daemon/pkg/daemon/ublox/"
"github.com/k8snetworkplumbingwg/ptp-operator/pkg/daemon/daemon/ublox/"
"github.com/stretchr/testify/assert"
"regexp"
"testing"
Expand Down
Loading

0 comments on commit d6698a1

Please sign in to comment.