diff --git a/.github/workflows/image-push.yaml b/.github/workflows/image-push.yaml index 84ea677c..f7e48542 100644 --- a/.github/workflows/image-push.yaml +++ b/.github/workflows/image-push.yaml @@ -6,7 +6,7 @@ on: tags: - 'v*.*.*' env: - image-push-owner: 'maiqueb' + image-push-owner: 'k8snetworkplumbingwg' jobs: push-amd64: name: Image push/amd64 @@ -19,7 +19,7 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Login to Container Registry - if: github.repository_owner == 'maiqueb' + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: registry: ghcr.io @@ -27,7 +27,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Push container image - if: github.repository_owner == 'maiqueb' + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/build-push-action@v2 with: context: . diff --git a/Makefile b/Makefile index 60adb73b..f899b67d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ GO ?= go OCI_BIN ?= docker -IMAGE_REGISTRY ?= ghcr.io/maiqueb +IMAGE_REGISTRY ?= ghcr.io/k8snetworkplumbingwg IMAGE_NAME ?= multus-dynamic-networks-controller IMAGE_TAG ?= latest-amd64 NAMESPACE ?= kube-system diff --git a/cmd/dynamic-networks-controller/networks-controller.go b/cmd/dynamic-networks-controller/networks-controller.go index 5664a266..4c6e98e1 100644 --- a/cmd/dynamic-networks-controller/networks-controller.go +++ b/cmd/dynamic-networks-controller/networks-controller.go @@ -21,13 +21,13 @@ import ( nadclient "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned" nadinformers "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/informers/externalversions" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/config" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/controller" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri/containerd" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri/crio" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/logging" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/multuscni" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/config" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/controller" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/cri" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/cri/containerd" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/cri/crio" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/logging" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/multuscni" ) const ( diff --git a/e2e/client/types.go b/e2e/client/types.go index 8748cc0e..8840ce24 100644 --- a/e2e/client/types.go +++ b/e2e/client/types.go @@ -17,7 +17,7 @@ import ( nettypes "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" netclient "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/annotations" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/annotations" ) type E2EClient struct { diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 8ed08867..fc9700a9 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -14,9 +14,9 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/e2e/client" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/e2e/status" nettypes "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" - "github.com/maiqueb/multus-dynamic-networks-controller/e2e/client" - "github.com/maiqueb/multus-dynamic-networks-controller/e2e/status" ) func TestDynamicNetworksControllerE2E(t *testing.T) { diff --git a/e2e/status/helpers.go b/e2e/status/helpers.go index d33c528d..79d91c85 100644 --- a/e2e/status/helpers.go +++ b/e2e/status/helpers.go @@ -8,7 +8,7 @@ import ( nettypes "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" - "github.com/maiqueb/multus-dynamic-networks-controller/e2e/client" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/e2e/client" ) type NetworkStatusPredicate func(networkStatus nettypes.NetworkStatus) bool diff --git a/go.mod b/go.mod index 7103d1c6..3aed06d4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/maiqueb/multus-dynamic-networks-controller +module github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller go 1.18 diff --git a/hack/e2e-kind-cluster-setup.sh b/hack/e2e-kind-cluster-setup.sh index cda51efe..1680329d 100755 --- a/hack/e2e-kind-cluster-setup.sh +++ b/hack/e2e-kind-cluster-setup.sh @@ -3,7 +3,7 @@ set -xe CNI_VERSION=${CNI_VERSION:-0.4.0} OCI_BIN=${OCI_BIN:-docker} -IMG_REGISTRY=${IMAGE_REGISTRY:-localhost:5000/maiqueb} +IMG_REGISTRY=${IMAGE_REGISTRY:-localhost:5000/k8snetworkplumbingwg} IMG_TAG="latest" setup_cluster() { diff --git a/manifests/crio-dynamic-networks-controller.yaml b/manifests/crio-dynamic-networks-controller.yaml index 72c238f6..81a759c5 100644 --- a/manifests/crio-dynamic-networks-controller.yaml +++ b/manifests/crio-dynamic-networks-controller.yaml @@ -101,7 +101,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: ghcr.io/maiqueb/multus-dynamic-networks-controller:latest-amd64 + image: ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller:latest-amd64 command: [ "/dynamic-networks-controller" ] args: - "-config=/etc/dynamic-networks-controller/dynamic-networks-config.json" diff --git a/manifests/dynamic-networks-controller.yaml b/manifests/dynamic-networks-controller.yaml index 3c70bc61..c0a1f5cc 100644 --- a/manifests/dynamic-networks-controller.yaml +++ b/manifests/dynamic-networks-controller.yaml @@ -100,7 +100,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: ghcr.io/maiqueb/multus-dynamic-networks-controller:latest-amd64 + image: ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller:latest-amd64 command: [ "/dynamic-networks-controller" ] args: - "-config=/etc/dynamic-networks-controller/dynamic-networks-config.json" diff --git a/pkg/config/types.go b/pkg/config/types.go index fcfdd28d..036ffe00 100644 --- a/pkg/config/types.go +++ b/pkg/config/types.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/cri" ) const ( diff --git a/pkg/config/types_test.go b/pkg/config/types_test.go index 72b02a20..54300524 100644 --- a/pkg/config/types_test.go +++ b/pkg/config/types_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/cri" ) func TestConfig(t *testing.T) { diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go index f92e2da8..85a8368d 100644 --- a/pkg/controller/pod.go +++ b/pkg/controller/pod.go @@ -27,10 +27,10 @@ import ( nadutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils" multusapi "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/server/api" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/annotations" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/logging" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/multuscni" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/annotations" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/cri" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/logging" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/multuscni" ) const ( diff --git a/pkg/controller/pod_test.go b/pkg/controller/pod_test.go index 5955b3b3..4cfad15b 100644 --- a/pkg/controller/pod_test.go +++ b/pkg/controller/pod_test.go @@ -29,11 +29,11 @@ import ( nadinformers "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/informers/externalversions" multusapi "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/server/api" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/annotations" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri" - fakecri "github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri/fake" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/multuscni" - fakemultusclient "github.com/maiqueb/multus-dynamic-networks-controller/pkg/multuscni/fake" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/annotations" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/cri" + fakecri "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/cri/fake" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/multuscni" + fakemultusclient "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/multuscni/fake" ) func TestController(t *testing.T) { diff --git a/pkg/cri/containerd/runtime_test.go b/pkg/cri/containerd/runtime_test.go index 7b80fde7..a52eb6f8 100644 --- a/pkg/cri/containerd/runtime_test.go +++ b/pkg/cri/containerd/runtime_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri/containerd/fake" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/cri/containerd/fake" ) func TestController(t *testing.T) { diff --git a/pkg/cri/crio/fake/runtime.go b/pkg/cri/crio/fake/runtime.go index 273db9d5..8f84e592 100644 --- a/pkg/cri/crio/fake/runtime.go +++ b/pkg/cri/crio/fake/runtime.go @@ -9,7 +9,7 @@ import ( crioruntime "k8s.io/cri-api/pkg/apis/runtime/v1" - criotypes "github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri/crio/types" + criotypes "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/cri/crio/types" ) type CrioClient struct { diff --git a/pkg/cri/crio/runtime.go b/pkg/cri/crio/runtime.go index 0d5b9247..34f02d19 100644 --- a/pkg/cri/crio/runtime.go +++ b/pkg/cri/crio/runtime.go @@ -11,7 +11,7 @@ import ( crioruntime "k8s.io/cri-api/pkg/apis/runtime/v1" - criotypes "github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri/crio/types" + criotypes "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/cri/crio/types" ) // Runtime represents a connection to the CRI-O runtime diff --git a/pkg/cri/crio/runtime_test.go b/pkg/cri/crio/runtime_test.go index 3767731f..3d0a8413 100644 --- a/pkg/cri/crio/runtime_test.go +++ b/pkg/cri/crio/runtime_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri/crio/fake" + "github.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/pkg/cri/crio/fake" ) func TestController(t *testing.T) {