Skip to content

Commit

Permalink
Fix repo paths
Browse files Browse the repository at this point in the history
  • Loading branch information
@josephdrichard
josephdrichard committed Dec 4, 2024
1 parent e1f0785 commit 7fb73b2
Show file tree
Hide file tree
Showing 34 changed files with 69 additions and 69 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM golang:1.22.4 AS builder
WORKDIR /go/src/github.com/josephdrichard/linuxptp-daemon
WORKDIR /go/src/github.com/k8snetworkplumbingwg/linuxptp-daemon
COPY . .
RUN make clean && make

Expand All @@ -17,6 +17,6 @@ RUN ln -s /usr/sbin/gpsd /usr/local/sbin/gpsd
RUN ln -s /usr/bin/ubxtool /usr/local/bin/ubxtool


COPY --from=builder /go/src/github.com/josephdrichard/linuxptp-daemon/bin/ptp /usr/local/bin/
COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/linuxptp-daemon/bin/ptp /usr/local/bin/

CMD ["/usr/local/bin/ptp"]
4 changes: 2 additions & 2 deletions Dockerfile.art
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
WORKDIR /go/src/github.com/josephdrichard/linuxptp-daemon
WORKDIR /go/src/github.com/k8snetworkplumbingwg/linuxptp-daemon
COPY . .
RUN make clean && make

Expand All @@ -18,7 +18,7 @@ RUN ln -s /usr/bin/gpspipe /usr/local/bin/gpspipe
RUN ln -s /usr/sbin/gpsd /usr/local/sbin/gpsd
RUN ln -s /usr/bin/ubxtool /usr/local/bin/ubxtool

COPY --from=builder /go/src/github.com/josephdrichard/linuxptp-daemon/bin/ptp /usr/local/bin/
COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/linuxptp-daemon/bin/ptp /usr/local/bin/
COPY ./extra/leap-seconds.list /usr/share/zoneinfo/leap-seconds.list

CMD ["/usr/local/bin/ptp"]
2 changes: 1 addition & 1 deletion addons/generic/generic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package generic
import (
"encoding/json"
"github.com/golang/glog"
"github.com/josephdrichard/linuxptp-daemon/pkg/plugin"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/plugin"
ptpv1 "github.com/k8snetworkplumbingwg/ptp-operator/api/v1"
)

Expand Down
4 changes: 2 additions & 2 deletions addons/intel/e810.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strings"

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

Expand Down
2 changes: 1 addition & 1 deletion addons/intel/phaseAdjust.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"

"github.com/golang/glog"
dpll "github.com/josephdrichard/linuxptp-daemon/pkg/dpll-netlink"
dpll "github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/dpll-netlink"
ptpv1 "github.com/k8snetworkplumbingwg/ptp-operator/api/v1"
"sigs.k8s.io/yaml"
)
Expand Down
6 changes: 3 additions & 3 deletions addons/mapping.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package mapping

import (
"github.com/josephdrichard/linuxptp-daemon/addons/generic"
"github.com/josephdrichard/linuxptp-daemon/addons/intel"
"github.com/josephdrichard/linuxptp-daemon/pkg/plugin"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/addons/generic"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/addons/intel"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/plugin"
)

var PluginMapping = map[string]plugin.New{
Expand Down
6 changes: 3 additions & 3 deletions cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"github.com/golang/glog"
"k8s.io/client-go/kubernetes"

"github.com/josephdrichard/linuxptp-daemon/pkg/config"
"github.com/josephdrichard/linuxptp-daemon/pkg/daemon"
"github.com/josephdrichard/linuxptp-daemon/pkg/leap"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/config"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/daemon"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/leap"
ptpv1 "github.com/k8snetworkplumbingwg/ptp-operator/api/v1"
ptpclient "github.com/k8snetworkplumbingwg/ptp-operator/pkg/client/clientset/versioned"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion glide.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package: github.com/josephdrichard/linuxptp-daemon
package: github.com/k8snetworkplumbingwg/linuxptp-daemon
import:
- package: github.com/jaypipes/ghw
version: ^0.4.0
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/josephdrichard/linuxptp-daemon
module github.com/k8snetworkplumbingwg/linuxptp-daemon

go 1.22

Expand Down
2 changes: 1 addition & 1 deletion hack/build.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

ORG_PATH="github.com/josephdrichard"
ORG_PATH="github.com/k8snetworkplumbingwg"
REPO_PATH="${ORG_PATH}/linuxptp-daemon"

if [ ! -h .gopath/src/${REPO_PATH} ]; then
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"

"github.com/josephdrichard/linuxptp-daemon/pkg/event"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/event"

"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
Expand Down
6 changes: 3 additions & 3 deletions pkg/daemon/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"strconv"
"strings"

"github.com/josephdrichard/linuxptp-daemon/pkg/synce"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/synce"

"github.com/josephdrichard/linuxptp-daemon/pkg/config"
"github.com/josephdrichard/linuxptp-daemon/pkg/event"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/config"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/event"

"github.com/golang/glog"

Expand Down
14 changes: 7 additions & 7 deletions pkg/daemon/daemon.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ import (
"syscall"
"time"

"github.com/josephdrichard/linuxptp-daemon/pkg/synce"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/synce"

"github.com/josephdrichard/linuxptp-daemon/pkg/config"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/config"

"github.com/josephdrichard/linuxptp-daemon/pkg/dpll"
"github.com/josephdrichard/linuxptp-daemon/pkg/leap"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/dpll"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/leap"

"github.com/josephdrichard/linuxptp-daemon/pkg/event"
ptpnetwork "github.com/josephdrichard/linuxptp-daemon/pkg/network"
"github.com/josephdrichard/linuxptp-daemon/pkg/pmc"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/event"
ptpnetwork "github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/network"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/pmc"

"github.com/golang/glog"
"k8s.io/client-go/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/daemon_internal_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"github.com/bigkevmcd/go-configparser"
"github.com/josephdrichard/linuxptp-daemon/pkg/leap"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/leap"
ptpv1 "github.com/k8snetworkplumbingwg/ptp-operator/api/v1"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/yaml"
Expand Down
10 changes: 5 additions & 5 deletions pkg/daemon/daemon_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import (
"strings"
"testing"

"github.com/josephdrichard/linuxptp-daemon/pkg/event"
"github.com/josephdrichard/linuxptp-daemon/pkg/leap"
"github.com/josephdrichard/linuxptp-daemon/pkg/synce"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/event"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/leap"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/synce"
ptpv1 "github.com/k8snetworkplumbingwg/ptp-operator/api/v1"
"github.com/sirupsen/logrus"
"k8s.io/utils/pointer"

"github.com/josephdrichard/linuxptp-daemon/pkg/config"
"github.com/josephdrichard/linuxptp-daemon/pkg/daemon"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/config"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/daemon"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/testutil"
"github.com/stretchr/testify/assert"
Expand Down
8 changes: 4 additions & 4 deletions pkg/daemon/gpsd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"time"

"github.com/golang/glog"
"github.com/josephdrichard/linuxptp-daemon/pkg/config"
"github.com/josephdrichard/linuxptp-daemon/pkg/event"
"github.com/josephdrichard/linuxptp-daemon/pkg/leap"
"github.com/josephdrichard/linuxptp-daemon/pkg/ublox"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/config"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/event"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/leap"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/ublox"
gpsdlib "github.com/stratoberry/go-gpsd"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/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/josephdrichard/linuxptp-daemon/pkg/config"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/config"
"os"
"os/exec"
"sync"
Expand Down
4 changes: 2 additions & 2 deletions pkg/daemon/metrics.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/josephdrichard/linuxptp-daemon/pkg/synce"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/synce"
"net/http"
"strconv"
"strings"
Expand All @@ -12,7 +12,7 @@ import (
"github.com/golang/glog"
"github.com/prometheus/client_golang/prometheus/collectors"

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

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

import (
"github.com/golang/glog"
"github.com/josephdrichard/linuxptp-daemon/addons"
"github.com/josephdrichard/linuxptp-daemon/pkg/plugin"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/addons"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/plugin"
ptpv1 "github.com/k8snetworkplumbingwg/ptp-operator/api/v1"
)

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

import "github.com/josephdrichard/linuxptp-daemon/pkg/config"
import "github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/config"

type process interface {
Name() string
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/ptpdev.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
ptpv1 "github.com/k8snetworkplumbingwg/ptp-operator/api/v1"
ptpclient "github.com/k8snetworkplumbingwg/ptp-operator/pkg/client/clientset/versioned"

ptpnetwork "github.com/josephdrichard/linuxptp-daemon/pkg/network"
ptpnetwork "github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/network"
)

func populateNodePTPDevices(nodePTPDev *ptpv1.NodePtpDevice, hwconfigs *[]ptpv1.HwConfig) (*ptpv1.NodePtpDevice, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/debug/debug_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package debug_test

import (
"github.com/josephdrichard/linuxptp-daemon/pkg/debug"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/debug"
"testing"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/dpll/dpll.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (

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

Expand Down
8 changes: 4 additions & 4 deletions pkg/dpll/dpll_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"testing"
"time"

nl "github.com/josephdrichard/linuxptp-daemon/pkg/dpll-netlink"
nl "github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/dpll-netlink"

"github.com/josephdrichard/linuxptp-daemon/pkg/config"
"github.com/josephdrichard/linuxptp-daemon/pkg/dpll"
"github.com/josephdrichard/linuxptp-daemon/pkg/event"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/config"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/dpll"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/event"
"github.com/stretchr/testify/assert"
)

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

import (
"fmt"
"github.com/josephdrichard/linuxptp-daemon/pkg/debug"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/debug"
"net"
"sort"
"strconv"
"strings"
"sync"
"time"

"github.com/josephdrichard/linuxptp-daemon/pkg/pmc"
"github.com/josephdrichard/linuxptp-daemon/pkg/protocol"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/pmc"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/protocol"

fbprotocol "github.com/facebook/time/ptp/protocol"
"github.com/golang/glog"
"github.com/josephdrichard/linuxptp-daemon/pkg/leap"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/leap"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/event/event_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (

fbprotocol "github.com/facebook/time/ptp/protocol"
"github.com/golang/glog"
"github.com/josephdrichard/linuxptp-daemon/pkg/event"
"github.com/josephdrichard/linuxptp-daemon/pkg/leap"
"github.com/josephdrichard/linuxptp-daemon/pkg/protocol"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/event"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/leap"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/protocol"
"github.com/stretchr/testify/assert"
)

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

import (
"github.com/golang/glog"
"github.com/josephdrichard/linuxptp-daemon/pkg/event"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/event"
"github.com/stretchr/testify/assert"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/event/stats_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package event_test

import (
"github.com/josephdrichard/linuxptp-daemon/pkg/event"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/event"
"github.com/stretchr/testify/assert"
"testing"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/leap/leap-file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"time"

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

leaphash "github.com/facebook/time/leaphash"
"github.com/josephdrichard/linuxptp-daemon/pkg/ublox"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/ublox"
"github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/pmc/pmc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/golang/glog"
expect "github.com/google/goexpect"
"github.com/josephdrichard/linuxptp-daemon/pkg/protocol"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/protocol"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/synce/synce.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

"github.com/golang/glog"
"github.com/josephdrichard/linuxptp-daemon/pkg/event"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/event"
)

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

import (
"fmt"
"github.com/josephdrichard/linuxptp-daemon/pkg/synce"
"github.com/k8snetworkplumbingwg/linuxptp-daemon/pkg/synce"
"github.com/stretchr/testify/assert"
"k8s.io/utils/pointer"
"testing"
Expand Down
Loading

0 comments on commit 7fb73b2

Please sign in to comment.