From 9583b1d636a1e1f8b490907894ee86d5cd28ca66 Mon Sep 17 00:00:00 2001 From: Ivan Kolodyazhny Date: Thu, 22 Jul 2021 19:47:50 +0300 Subject: [PATCH] Use k8snetworkplumbingwg repo instead of dougbtv in sources --- .github/workflows/image-build.yml | 2 +- Dockerfile | 8 ++++---- Dockerfile.arm64 | 6 +++--- Dockerfile.openshift | 6 +++--- README.md | 4 ++-- cmd/reconciler/ip.go | 6 +++--- cmd/reconciler/ip_test.go | 4 ++-- cmd/reconciler/suite_test.go | 2 +- cmd/suite_test.go | 2 +- cmd/whereabouts.go | 14 +++++++------- cmd/whereabouts_test.go | 4 ++-- doc/logo-sticker.svg | 2 +- doc/logo.svg | 2 +- go.mod | 2 +- hack/build-go.sh | 8 ++++---- pkg/allocate/allocate.go | 4 ++-- pkg/allocate/allocate_test.go | 2 +- pkg/config/config.go | 4 ++-- pkg/reconciler/iploop.go | 12 ++++++------ pkg/reconciler/iploop_test.go | 4 ++-- pkg/reconciler/wrappedPod.go | 4 ++-- pkg/storage/etcd.go | 6 +++--- pkg/storage/kubernetes/client.go | 6 +++--- pkg/storage/kubernetes/ipam.go | 10 +++++----- pkg/storage/storage.go | 2 +- 25 files changed, 63 insertions(+), 63 deletions(-) diff --git a/.github/workflows/image-build.yml b/.github/workflows/image-build.yml index 5343d597..d3828096 100644 --- a/.github/workflows/image-build.yml +++ b/.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: diff --git a/Dockerfile b/Dockerfile index 45964032..489fae02 100644 --- a/Dockerfile +++ b/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"] diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 4f64df3c..d9a13eb8 100644 --- a/Dockerfile.arm64 +++ b/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"] diff --git a/Dockerfile.openshift b/Dockerfile.openshift index f582d414..ac414caf 100644 --- a/Dockerfile.openshift +++ b/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" \ diff --git a/README.md b/README.md index d99ccc4c..9160fd74 100644 --- a/README.md +++ b/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 \ diff --git a/cmd/reconciler/ip.go b/cmd/reconciler/ip.go index 61116c94..dcaad3ce 100644 --- a/cmd/reconciler/ip.go +++ b/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() { diff --git a/cmd/reconciler/ip_test.go b/cmd/reconciler/ip_test.go index 4ef1a708..b2b838bd 100644 --- a/cmd/reconciler/ip_test.go +++ b/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" diff --git a/cmd/reconciler/suite_test.go b/cmd/reconciler/suite_test.go index a6b51abc..65fa382e 100644 --- a/cmd/reconciler/suite_test.go +++ b/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" diff --git a/cmd/suite_test.go b/cmd/suite_test.go index 92489d3f..6f7da8af 100644 --- a/cmd/suite_test.go +++ b/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" diff --git a/cmd/whereabouts.go b/cmd/whereabouts.go index 3990a07d..1b6b8419 100644 --- a/cmd/whereabouts.go +++ b/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() { diff --git a/cmd/whereabouts_test.go b/cmd/whereabouts_test.go index c7c429a3..8400e04d 100644 --- a/cmd/whereabouts_test.go +++ b/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" diff --git a/doc/logo-sticker.svg b/doc/logo-sticker.svg index a589944b..0eec4a0e 100644 --- a/doc/logo-sticker.svg +++ b/doc/logo-sticker.svg @@ -16,7 +16,7 @@ id="svg1491" inkscape:version="0.92.4 (unknown)" sodipodi:docname="logo-sticker.svg" - inkscape:export-filename="/home/doug/codebase/src/github.com/dougbtv/whereabouts/doc/logo.png" + inkscape:export-filename="/home/doug/codebase/src/github.com/k8snetworkplumbingwg/whereabouts/doc/logo.png" inkscape:export-xdpi="107.32" inkscape:export-ydpi="107.32">