Merge pull request #123 from e0ne/k8snetworkplumbingwg-group

Use k8snetworkplumbingwg repo instead of dougbtv in sources

.github/workflows/image-build.yml

@@ -34,7 +34,7 @@ jobs:
         with:
           context: .
           push: false
-          tags: dougbtv/whereabouts-ocp
+          tags: k8snetworkplumbingwg/whereabouts-ocp
           file: Dockerfile.openshift
 
   build-arm64:

Dockerfile

@@ -1,13 +1,13 @@
 FROM golang:1.13
 ADD . /usr/src/whereabouts
-RUN mkdir -p $GOPATH/src/github.com/dougbtv/whereabouts
-WORKDIR $GOPATH/src/github.com/dougbtv/whereabouts
+RUN mkdir -p $GOPATH/src/github.com/k8snetworkplumbingwg/whereabouts
+WORKDIR $GOPATH/src/github.com/k8snetworkplumbingwg/whereabouts
 COPY . .
 RUN ./hack/build-go.sh
 
 FROM alpine:latest
 LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/whereabouts
-COPY --from=0 /go/src/github.com/dougbtv/whereabouts/bin/whereabouts .
-COPY --from=0 /go/src/github.com/dougbtv/whereabouts/bin/ip-reconciler .
+COPY --from=0 /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/whereabouts .
+COPY --from=0 /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/ip-reconciler .
 COPY script/install-cni.sh .
 CMD ["/install-cni.sh"]

Dockerfile.arm64

@@ -4,13 +4,13 @@ ADD . /usr/src/whereabouts
 ENV GOARCH "arm64"
 ENV GOOS "linux"
 
-RUN mkdir -p $GOPATH/src/github.com/dougbtv/whereabouts
-WORKDIR $GOPATH/src/github.com/dougbtv/whereabouts
+RUN mkdir -p $GOPATH/src/github.com/k8snetworkplumbingwg/whereabouts
+WORKDIR $GOPATH/src/github.com/k8snetworkplumbingwg/whereabouts
 COPY . .
 RUN ./hack/build-go.sh
 
 FROM arm64v8/alpine:latest
 LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/whereabouts
-COPY --from=0 /go/src/github.com/dougbtv/whereabouts/bin/whereabouts .
+COPY --from=0 /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/whereabouts .
 COPY script/install-cni.sh .
 CMD ["/install-cni.sh"]

Dockerfile.openshift

@@ -1,7 +1,7 @@
 # This dockerfile is used for building for OpenShift
 FROM openshift/origin-release:golang-1.15 as builder
-ADD . /go/src/github.com/dougbtv/whereabouts
-WORKDIR /go/src/github.com/dougbtv/whereabouts
+ADD . /go/src/github.com/k8snetworkplumbingwg/whereabouts
+WORKDIR /go/src/github.com/k8snetworkplumbingwg/whereabouts
 ENV CGO_ENABLED=1
 ENV GO111MODULE=on
 RUN go build -mod vendor -o bin/whereabouts cmd/whereabouts.go
@@ -10,7 +10,7 @@ WORKDIR /
 FROM openshift/origin-base
 RUN mkdir -p /usr/src/whereabouts/images && \
        mkdir -p /usr/src/whereabouts/bin
-COPY --from=builder /go/src/github.com/dougbtv/whereabouts/bin/whereabouts /usr/src/whereabouts/bin
+COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/whereabouts/bin/whereabouts /usr/src/whereabouts/bin
 
 LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/whereabouts
 LABEL io.k8s.display-name="Whereabouts CNI" \

README.md

@@ -1,5 +1,5 @@
 # whereabouts
-![Travis CI status](https://travis-ci.org/dougbtv/whereabouts.svg?branch=master) ![Go report card](https://goreportcard.com/badge/github.com/dougbtv/whereabouts)
+![Travis CI status](https://travis-ci.org/k8snetworkplumbingwg/whereabouts.svg?branch=master) ![Go report card](https://goreportcard.com/badge/github.com/k8snetworkplumbingwg/whereabouts)
 
 ![whereabouts-logo](doc/logo.png)
 
@@ -41,7 +41,7 @@ Further installation options (including etcd usage) and configuration parameters
 You can install this plugin with a Daemonset, using:
 
 ```
-git clone https://github.com/dougbtv/whereabouts && cd whereabouts
+git clone https://github.com/k8snetworkplumbingwg/whereabouts && cd whereabouts
 kubectl apply \
     -f doc/crds/daemonset-install.yaml \
     -f doc/crds/whereabouts.cni.cncf.io_ippools.yaml \

cmd/reconciler/ip.go

@@ -3,11 +3,11 @@ package main
 import (
 	"context"
 	"flag"
-	"github.com/dougbtv/whereabouts/pkg/storage"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/storage"
 	"os"
 
-	"github.com/dougbtv/whereabouts/pkg/logging"
-	"github.com/dougbtv/whereabouts/pkg/reconciler"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/logging"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/reconciler"
 )
 
 func main() {

cmd/reconciler/ip_test.go

@@ -10,8 +10,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/dougbtv/whereabouts/pkg/api/v1alpha1"
-	"github.com/dougbtv/whereabouts/pkg/reconciler"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/api/v1alpha1"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/reconciler"
 	multusv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 
 	v1 "k8s.io/api/core/v1"

cmd/reconciler/suite_test.go

@@ -13,7 +13,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	whereaboutsv1alpha1 "github.com/dougbtv/whereabouts/pkg/api/v1alpha1"
+	whereaboutsv1alpha1 "github.com/k8snetworkplumbingwg/whereabouts/pkg/api/v1alpha1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"

cmd/suite_test.go

@@ -12,7 +12,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	whereaboutsv1alpha1 "github.com/dougbtv/whereabouts/pkg/api/v1alpha1"
+	whereaboutsv1alpha1 "github.com/k8snetworkplumbingwg/whereabouts/pkg/api/v1alpha1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"

cmd/whereabouts.go

@@ -10,13 +10,13 @@ import (
 	cnitypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/containernetworking/cni/pkg/types/current"
 	cniversion "github.com/containernetworking/cni/pkg/version"
-	"github.com/dougbtv/whereabouts/pkg/allocate"
-	"github.com/dougbtv/whereabouts/pkg/config"
-	"github.com/dougbtv/whereabouts/pkg/logging"
-	"github.com/dougbtv/whereabouts/pkg/storage"
-	"github.com/dougbtv/whereabouts/pkg/storage/kubernetes"
-	"github.com/dougbtv/whereabouts/pkg/types"
-	"github.com/dougbtv/whereabouts/pkg/version"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/allocate"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/config"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/logging"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/storage"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/storage/kubernetes"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/types"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/version"
 )
 
 func main() {

cmd/whereabouts_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/containernetworking/cni/pkg/types"
 	"github.com/containernetworking/cni/pkg/types/current"
 	"github.com/containernetworking/plugins/pkg/testutils"
-	"github.com/dougbtv/whereabouts/pkg/allocate"
-	whereaboutstypes "github.com/dougbtv/whereabouts/pkg/types"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/allocate"
+	whereaboutstypes "github.com/k8snetworkplumbingwg/whereabouts/pkg/types"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

go.mod

@@ -1,4 +1,4 @@
-module github.com/dougbtv/whereabouts
+module github.com/k8snetworkplumbingwg/whereabouts
 
 go 1.15
 

hack/build-go.sh

@@ -38,10 +38,10 @@ echo "VERSION: ${VERSION}"
 echo "GIT_SHA: ${GIT_SHA}"
 echo "GIT_TREE_STATE: ${GIT_TREE_STATE}"
 echo "RELEASE_STATUS: ${RELEASE_STATUS}"
-VERSION_LDFLAGS="-X github.com/dougbtv/whereabouts/pkg/version.Version=${VERSION} \
--X github.com/dougbtv/whereabouts/pkg/version.GitSHA=${GIT_SHA} \
--X github.com/dougbtv/whereabouts/pkg/version.GitTreeState=${GIT_TREE_STATE} \
--X github.com/dougbtv/whereabouts/pkg/version.ReleaseStatus=${RELEASE_STATUS}"
+VERSION_LDFLAGS="-X github.com/k8snetworkplumbingwg/whereabouts/pkg/version.Version=${VERSION} \
+-X github.com/k8snetworkplumbingwg/whereabouts/pkg/version.GitSHA=${GIT_SHA} \
+-X github.com/k8snetworkplumbingwg/whereabouts/pkg/version.GitTreeState=${GIT_TREE_STATE} \
+-X github.com/k8snetworkplumbingwg/whereabouts/pkg/version.ReleaseStatus=${RELEASE_STATUS}"
 GLDFLAGS="${GLDFLAGS} ${VERSION_LDFLAGS}"
 
 CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} ${GO} build ${GOFLAGS} -ldflags "${GLDFLAGS}" -o bin/${cmd} cmd/${cmd}.go

pkg/allocate/allocate.go

@@ -5,8 +5,8 @@ import (
 	"math"
 	"net"
 
-	"github.com/dougbtv/whereabouts/pkg/logging"
-	"github.com/dougbtv/whereabouts/pkg/types"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/logging"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/types"
 )
 
 // AssignmentError defines an IP assignment error.

pkg/allocate/allocate_test.go

@@ -2,7 +2,7 @@ package allocate
 
 import (
 	"fmt"
-	"github.com/dougbtv/whereabouts/pkg/types"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/types"
 	"math"
 	"math/big"
 	"net"

pkg/config/config.go

@@ -10,8 +10,8 @@ import (
 
 	cnitypes "github.com/containernetworking/cni/pkg/types"
 	types020 "github.com/containernetworking/cni/pkg/types/020"
-	"github.com/dougbtv/whereabouts/pkg/logging"
-	"github.com/dougbtv/whereabouts/pkg/types"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/logging"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/types"
 	"github.com/imdario/mergo"
 )
 

pkg/reconciler/iploop.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/dougbtv/whereabouts/pkg/allocate"
-	whereaboutsv1alpha1 "github.com/dougbtv/whereabouts/pkg/api/v1alpha1"
-	"github.com/dougbtv/whereabouts/pkg/logging"
-	"github.com/dougbtv/whereabouts/pkg/storage"
-	"github.com/dougbtv/whereabouts/pkg/storage/kubernetes"
-	"github.com/dougbtv/whereabouts/pkg/types"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/allocate"
+	whereaboutsv1alpha1 "github.com/k8snetworkplumbingwg/whereabouts/pkg/api/v1alpha1"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/logging"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/storage"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/storage/kubernetes"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/types"
 
 	v1 "k8s.io/api/core/v1"
 )

pkg/reconciler/iploop_test.go

@@ -9,8 +9,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	whereaboutsv1alpha1 "github.com/dougbtv/whereabouts/pkg/api/v1alpha1"
-	"github.com/dougbtv/whereabouts/pkg/types"
+	whereaboutsv1alpha1 "github.com/k8snetworkplumbingwg/whereabouts/pkg/api/v1alpha1"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/types"
 )
 
 func TestIPReconciler(t *testing.T) {

pkg/reconciler/wrappedPod.go

@@ -3,8 +3,8 @@ package reconciler
 import (
 	"encoding/json"
 
-	"github.com/dougbtv/whereabouts/pkg/logging"
-	"github.com/dougbtv/whereabouts/pkg/storage"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/logging"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/storage"
 	k8snetworkplumbingwgv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 
 	v1 "k8s.io/api/core/v1"

pkg/storage/etcd.go

@@ -10,9 +10,9 @@ import (
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/concurrency"
 	"github.com/coreos/etcd/pkg/transport"
-	"github.com/dougbtv/whereabouts/pkg/allocate"
-	"github.com/dougbtv/whereabouts/pkg/logging"
-	"github.com/dougbtv/whereabouts/pkg/types"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/allocate"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/logging"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/types"
 )
 
 const whereaboutsPrefix = "/whereabouts"

pkg/storage/kubernetes/client.go

@@ -2,9 +2,9 @@ package kubernetes
 
 import (
 	"context"
-	whereaboutsv1alpha1 "github.com/dougbtv/whereabouts/pkg/api/v1alpha1"
-	"github.com/dougbtv/whereabouts/pkg/logging"
-	"github.com/dougbtv/whereabouts/pkg/storage"
+	whereaboutsv1alpha1 "github.com/k8snetworkplumbingwg/whereabouts/pkg/api/v1alpha1"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/logging"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/storage"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 

pkg/storage/kubernetes/ipam.go

@@ -14,11 +14,11 @@ import (
 	"k8s.io/client-go/tools/leaderelection"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 
-	"github.com/dougbtv/whereabouts/pkg/allocate"
-	whereaboutsv1alpha1 "github.com/dougbtv/whereabouts/pkg/api/v1alpha1"
-	"github.com/dougbtv/whereabouts/pkg/logging"
-	"github.com/dougbtv/whereabouts/pkg/storage"
-	whereaboutstypes "github.com/dougbtv/whereabouts/pkg/types"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/allocate"
+	whereaboutsv1alpha1 "github.com/k8snetworkplumbingwg/whereabouts/pkg/api/v1alpha1"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/logging"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/storage"
+	whereaboutstypes "github.com/k8snetworkplumbingwg/whereabouts/pkg/types"
 	jsonpatch "gomodules.xyz/jsonpatch/v2"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/storage/storage.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/dougbtv/whereabouts/pkg/types"
+	"github.com/k8snetworkplumbingwg/whereabouts/pkg/types"
 )
 
 var (