From 6f0bbd64b207f00a91ed401baa53145a42cacedc Mon Sep 17 00:00:00 2001 From: lin Date: Mon, 1 Feb 2021 13:53:21 +0800 Subject: [PATCH] chore: change the module from `github.com/api7/ingress-controller` to `github.com/apache/apisix-ingress-controller` close #67 --- Makefile | 6 +++--- README.md | 2 +- cmd/cmd.go | 4 ++-- cmd/ingress/ingress.go | 6 +++--- cmd/ingress/ingress_test.go | 6 +++--- docs/design.md | 2 +- go.mod | 2 +- main.go | 2 +- pkg/api/server.go | 8 ++++---- pkg/api/server_test.go | 2 +- pkg/apisix/apisix.go | 2 +- pkg/apisix/cache/cache.go | 2 +- pkg/apisix/cache/memdb.go | 2 +- pkg/apisix/cache/memdb_test.go | 2 +- pkg/apisix/cluster.go | 4 ++-- pkg/apisix/cluster_test.go | 2 +- pkg/apisix/nonexistentclient.go | 4 ++-- pkg/apisix/resource.go | 4 ++-- pkg/apisix/route.go | 8 ++++---- pkg/apisix/route_test.go | 2 +- pkg/apisix/service.go | 8 ++++---- pkg/apisix/service_test.go | 2 +- pkg/apisix/ssl.go | 8 ++++---- pkg/apisix/ssl_test.go | 2 +- pkg/apisix/upstream.go | 8 ++++---- pkg/apisix/upstream_test.go | 2 +- pkg/config/config.go | 2 +- pkg/config/config_test.go | 2 +- pkg/ingress/apisix/annotation.go | 4 ++-- pkg/ingress/apisix/plugin.go | 2 +- pkg/ingress/apisix/route.go | 8 ++++---- pkg/ingress/apisix/service.go | 8 ++++---- pkg/ingress/apisix/tls.go | 8 ++++---- pkg/ingress/apisix/tls_test.go | 8 ++++---- pkg/ingress/apisix/upstream.go | 8 ++++---- pkg/ingress/apisix/upstream_test.go | 4 ++-- pkg/ingress/controller/apisix_route.go | 16 +++++++-------- pkg/ingress/controller/apisix_service.go | 16 +++++++-------- pkg/ingress/controller/apisix_tls.go | 16 +++++++-------- pkg/ingress/controller/apisix_upstream.go | 18 ++++++++--------- pkg/ingress/controller/controller.go | 20 +++++++++---------- pkg/ingress/controller/endpoint.go | 12 +++++------ pkg/ingress/endpoint/ep.go | 4 ++-- .../client/clientset/versioned/clientset.go | 2 +- .../versioned/fake/clientset_generated.go | 6 +++--- .../clientset/versioned/fake/register.go | 2 +- .../clientset/versioned/scheme/register.go | 2 +- .../versioned/typed/config/v1/apisixroute.go | 4 ++-- .../typed/config/v1/apisixservice.go | 4 ++-- .../versioned/typed/config/v1/apisixtls.go | 4 ++-- .../typed/config/v1/apisixupstream.go | 4 ++-- .../typed/config/v1/config_client.go | 4 ++-- .../typed/config/v1/fake/fake_apisixroute.go | 2 +- .../config/v1/fake/fake_apisixservice.go | 2 +- .../typed/config/v1/fake/fake_apisixtls.go | 2 +- .../config/v1/fake/fake_apisixupstream.go | 2 +- .../config/v1/fake/fake_config_client.go | 2 +- .../externalversions/config/interface.go | 4 ++-- .../externalversions/config/v1/apisixroute.go | 8 ++++---- .../config/v1/apisixservice.go | 8 ++++---- .../externalversions/config/v1/apisixtls.go | 8 ++++---- .../config/v1/apisixupstream.go | 8 ++++---- .../externalversions/config/v1/interface.go | 2 +- .../informers/externalversions/factory.go | 6 +++--- .../informers/externalversions/generic.go | 2 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../client/listers/config/v1/apisixroute.go | 2 +- .../client/listers/config/v1/apisixservice.go | 2 +- .../client/listers/config/v1/apisixtls.go | 2 +- .../listers/config/v1/apisixupstream.go | 2 +- pkg/kube/init.go | 4 ++-- pkg/seven/conf/conf.go | 4 ++-- pkg/seven/state/builder.go | 12 +++++------ pkg/seven/state/builder_test.go | 2 +- pkg/seven/state/event.go | 2 +- pkg/seven/state/route_worker.go | 2 +- pkg/seven/state/service_worker.go | 8 ++++---- pkg/seven/state/solver.go | 8 ++++---- test/e2e/e2e.go | 4 ++-- test/e2e/endpoints/endpoints.go | 2 +- test/e2e/go.mod | 6 +++--- test/e2e/ingress/namespace.go | 2 +- test/e2e/ingress/resourcepushing.go | 2 +- test/e2e/ingress/sanity.go | 2 +- test/e2e/scaffold/crd.go | 4 ++-- 85 files changed, 210 insertions(+), 210 deletions(-) diff --git a/Makefile b/Makefile index 05c3fcb34b..17edd138f7 100644 --- a/Makefile +++ b/Makefile @@ -29,9 +29,9 @@ ifeq ($(OSARCH), x86_64) OSARCH = amd64 endif -VERSYM="github.com/api7/ingress-controller/pkg/version._buildVersion" -GITSHASYM="github.com/api7/ingress-controller/pkg/version._buildGitRevision" -BUILDOSSYM="github.com/api7/ingress-controller/pkg/version._buildOS" +VERSYM="github.com/apache/apisix-ingress-controller/pkg/version._buildVersion" +GITSHASYM="github.com/apache/apisix-ingress-controller/pkg/version._buildGitRevision" +BUILDOSSYM="github.com/apache/apisix-ingress-controller/pkg/version._buildOS" GO_LDFLAGS ?= "-X=$(VERSYM)=$(VERSION) -X=$(GITSHASYM)=$(GITSHA) -X=$(BUILDOSSYM)=$(OSNAME)/$(OSARCH)" E2E_CONCURRENCY ?= 1 E2E_SKIP_BUILD ?= 0 diff --git a/README.md b/README.md index bc35bd2f3f..ef522713e5 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ This project is currently considered experimental. - Can be packaged as a stand-alone binary, keep in sync with the ingress definition. -- [CRD design](https://github.com/api7/ingress-controller/issues/3) +- [CRD design](https://github.com/apache/apisix-ingress-controller/issues/3) ### 2. `APISIX types` Submodule diff --git a/cmd/cmd.go b/cmd/cmd.go index ee4a59a0ed..289c0ea158 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/cobra" - "github.com/api7/ingress-controller/cmd/ingress" - "github.com/api7/ingress-controller/pkg/version" + "github.com/apache/apisix-ingress-controller/cmd/ingress" + "github.com/apache/apisix-ingress-controller/pkg/version" ) func newVersionCommand() *cobra.Command { diff --git a/cmd/ingress/ingress.go b/cmd/ingress/ingress.go index d1dab25c03..21ca78b0c2 100644 --- a/cmd/ingress/ingress.go +++ b/cmd/ingress/ingress.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/cobra" - "github.com/api7/ingress-controller/pkg/config" - "github.com/api7/ingress-controller/pkg/ingress/controller" - "github.com/api7/ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/config" + "github.com/apache/apisix-ingress-controller/pkg/ingress/controller" + "github.com/apache/apisix-ingress-controller/pkg/log" ) func dief(template string, args ...interface{}) { diff --git a/cmd/ingress/ingress_test.go b/cmd/ingress/ingress_test.go index bd46d2c90c..a6b307dd0b 100644 --- a/cmd/ingress/ingress_test.go +++ b/cmd/ingress/ingress_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/api7/ingress-controller/pkg/config" - "github.com/api7/ingress-controller/pkg/log" - "github.com/api7/ingress-controller/pkg/types" + "github.com/apache/apisix-ingress-controller/pkg/config" + "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/types" ) type fakeWriteSyncer struct { diff --git a/docs/design.md b/docs/design.md index 79ba619b81..2439ae88c5 100644 --- a/docs/design.md +++ b/docs/design.md @@ -33,7 +33,7 @@ Apache APISIX ingress for Kubernetes. - can be packaged as a stand-alone binary, keep in sync with the ingress definition; -- [CRD design](https://github.com/api7/ingress-controller/issues/3) +- [CRD design](https://github.com/apache/apisix-ingress-controller/issues/3) ### 2.Types diff --git a/go.mod b/go.mod index 24d9b60e04..e0bc1cae93 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/api7/ingress-controller +module github.com/apache/apisix-ingress-controller go 1.13 diff --git a/main.go b/main.go index 2831a5b80a..6195101c0e 100644 --- a/main.go +++ b/main.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "github.com/api7/ingress-controller/cmd" + "github.com/apache/apisix-ingress-controller/cmd" ) func main() { diff --git a/pkg/api/server.go b/pkg/api/server.go index 59c747b161..8953884606 100644 --- a/pkg/api/server.go +++ b/pkg/api/server.go @@ -21,10 +21,10 @@ import ( "github.com/gin-gonic/gin" - apirouter "github.com/api7/ingress-controller/pkg/api/router" - "github.com/api7/ingress-controller/pkg/config" - "github.com/api7/ingress-controller/pkg/log" - "github.com/api7/ingress-controller/pkg/types" + apirouter "github.com/apache/apisix-ingress-controller/pkg/api/router" + "github.com/apache/apisix-ingress-controller/pkg/config" + "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/types" ) // Server represents the API Server in ingress-apisix-controller. diff --git a/pkg/api/server_test.go b/pkg/api/server_test.go index 09ecf91a10..9b559d1de8 100644 --- a/pkg/api/server_test.go +++ b/pkg/api/server_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/api7/ingress-controller/pkg/config" + "github.com/apache/apisix-ingress-controller/pkg/config" ) func TestServer(t *testing.T) { diff --git a/pkg/apisix/apisix.go b/pkg/apisix/apisix.go index 143750546c..d16641b1ca 100644 --- a/pkg/apisix/apisix.go +++ b/pkg/apisix/apisix.go @@ -17,7 +17,7 @@ package apisix import ( "context" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) // APISIX is the unified client tool to communicate with APISIX. diff --git a/pkg/apisix/cache/cache.go b/pkg/apisix/cache/cache.go index 6e17e2634a..6df8335280 100644 --- a/pkg/apisix/cache/cache.go +++ b/pkg/apisix/cache/cache.go @@ -15,7 +15,7 @@ package cache -import v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" +import v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" // Cache defines the necessary behaviors that the cache object should have. // Note this interface is for APISIX, not for generic purpose, it supports diff --git a/pkg/apisix/cache/memdb.go b/pkg/apisix/cache/memdb.go index a82d087e57..f03d2e2f90 100644 --- a/pkg/apisix/cache/memdb.go +++ b/pkg/apisix/cache/memdb.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/go-memdb" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) var ( diff --git a/pkg/apisix/cache/memdb_test.go b/pkg/apisix/cache/memdb_test.go index dcf24898ee..e132962b05 100644 --- a/pkg/apisix/cache/memdb_test.go +++ b/pkg/apisix/cache/memdb_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) func TestMemDBCacheRoute(t *testing.T) { diff --git a/pkg/apisix/cluster.go b/pkg/apisix/cluster.go index b2bfa5de39..017011e3b6 100644 --- a/pkg/apisix/cluster.go +++ b/pkg/apisix/cluster.go @@ -29,8 +29,8 @@ import ( "go.uber.org/zap" "k8s.io/apimachinery/pkg/util/wait" - "github.com/api7/ingress-controller/pkg/apisix/cache" - "github.com/api7/ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" + "github.com/apache/apisix-ingress-controller/pkg/log" ) const ( diff --git a/pkg/apisix/cluster_test.go b/pkg/apisix/cluster_test.go index 0f7e569f20..9f31cb7381 100644 --- a/pkg/apisix/cluster_test.go +++ b/pkg/apisix/cluster_test.go @@ -19,7 +19,7 @@ import ( "context" "testing" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" "github.com/stretchr/testify/assert" ) diff --git a/pkg/apisix/nonexistentclient.go b/pkg/apisix/nonexistentclient.go index ccd3abf24f..ad5db991f4 100644 --- a/pkg/apisix/nonexistentclient.go +++ b/pkg/apisix/nonexistentclient.go @@ -18,8 +18,8 @@ package apisix import ( "context" - "github.com/api7/ingress-controller/pkg/apisix/cache" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) type nonExistentCluster struct { diff --git a/pkg/apisix/resource.go b/pkg/apisix/resource.go index 1fe51a7ea2..100a59eeff 100644 --- a/pkg/apisix/resource.go +++ b/pkg/apisix/resource.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/api7/ingress-controller/pkg/log" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/log" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) type getResponse struct { diff --git a/pkg/apisix/route.go b/pkg/apisix/route.go index 8cd704b82a..08a2fdbedf 100644 --- a/pkg/apisix/route.go +++ b/pkg/apisix/route.go @@ -22,10 +22,10 @@ import ( "go.uber.org/zap" - "github.com/api7/ingress-controller/pkg/apisix/cache" - "github.com/api7/ingress-controller/pkg/id" - "github.com/api7/ingress-controller/pkg/log" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" + "github.com/apache/apisix-ingress-controller/pkg/id" + "github.com/apache/apisix-ingress-controller/pkg/log" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) type routeReqBody struct { diff --git a/pkg/apisix/route_test.go b/pkg/apisix/route_test.go index d767c6d2ff..6205363429 100644 --- a/pkg/apisix/route_test.go +++ b/pkg/apisix/route_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) type fakeAPISIXRouteSrv struct { diff --git a/pkg/apisix/service.go b/pkg/apisix/service.go index 6e51a5fd77..3a283c9a92 100644 --- a/pkg/apisix/service.go +++ b/pkg/apisix/service.go @@ -22,10 +22,10 @@ import ( "go.uber.org/zap" - "github.com/api7/ingress-controller/pkg/apisix/cache" - "github.com/api7/ingress-controller/pkg/id" - "github.com/api7/ingress-controller/pkg/log" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" + "github.com/apache/apisix-ingress-controller/pkg/id" + "github.com/apache/apisix-ingress-controller/pkg/log" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) type serviceClient struct { diff --git a/pkg/apisix/service_test.go b/pkg/apisix/service_test.go index 9e3efa747b..fd7b02749e 100644 --- a/pkg/apisix/service_test.go +++ b/pkg/apisix/service_test.go @@ -28,7 +28,7 @@ import ( "golang.org/x/net/nettest" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" "github.com/stretchr/testify/assert" ) diff --git a/pkg/apisix/ssl.go b/pkg/apisix/ssl.go index 90a55c6e7c..434fc8c66e 100644 --- a/pkg/apisix/ssl.go +++ b/pkg/apisix/ssl.go @@ -22,10 +22,10 @@ import ( "go.uber.org/zap" - "github.com/api7/ingress-controller/pkg/apisix/cache" - "github.com/api7/ingress-controller/pkg/id" - "github.com/api7/ingress-controller/pkg/log" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" + "github.com/apache/apisix-ingress-controller/pkg/id" + "github.com/apache/apisix-ingress-controller/pkg/log" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) type sslClient struct { diff --git a/pkg/apisix/ssl_test.go b/pkg/apisix/ssl_test.go index 649c0ee81f..4717143482 100644 --- a/pkg/apisix/ssl_test.go +++ b/pkg/apisix/ssl_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" "github.com/stretchr/testify/assert" "golang.org/x/net/nettest" ) diff --git a/pkg/apisix/upstream.go b/pkg/apisix/upstream.go index 1e635ed614..5e10c60a6c 100644 --- a/pkg/apisix/upstream.go +++ b/pkg/apisix/upstream.go @@ -22,10 +22,10 @@ import ( "go.uber.org/zap" - "github.com/api7/ingress-controller/pkg/apisix/cache" - "github.com/api7/ingress-controller/pkg/id" - "github.com/api7/ingress-controller/pkg/log" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" + "github.com/apache/apisix-ingress-controller/pkg/id" + "github.com/apache/apisix-ingress-controller/pkg/log" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) type upstreamClient struct { diff --git a/pkg/apisix/upstream_test.go b/pkg/apisix/upstream_test.go index 476e9cda69..b929cbeb60 100644 --- a/pkg/apisix/upstream_test.go +++ b/pkg/apisix/upstream_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" "github.com/stretchr/testify/assert" diff --git a/pkg/config/config.go b/pkg/config/config.go index 76279894b9..9602e3213d 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -24,7 +24,7 @@ import ( "gopkg.in/yaml.v2" v1 "k8s.io/api/core/v1" - "github.com/api7/ingress-controller/pkg/types" + "github.com/apache/apisix-ingress-controller/pkg/types" ) const ( diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index 808ed8889e..9f6ad106a9 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/api7/ingress-controller/pkg/types" + "github.com/apache/apisix-ingress-controller/pkg/types" ) func TestNewConfigFromFile(t *testing.T) { diff --git a/pkg/ingress/apisix/annotation.go b/pkg/ingress/apisix/annotation.go index e7b62e26e7..4a239e85b5 100644 --- a/pkg/ingress/apisix/annotation.go +++ b/pkg/ingress/apisix/annotation.go @@ -17,8 +17,8 @@ package apisix import ( "strconv" - seven "github.com/api7/ingress-controller/pkg/seven/apisix" - apisix "github.com/api7/ingress-controller/pkg/types/apisix/v1" + seven "github.com/apache/apisix-ingress-controller/pkg/seven/apisix" + apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) // BuildAnnotation return plugins and group diff --git a/pkg/ingress/apisix/plugin.go b/pkg/ingress/apisix/plugin.go index 4518324a97..20fe0811f3 100644 --- a/pkg/ingress/apisix/plugin.go +++ b/pkg/ingress/apisix/plugin.go @@ -17,7 +17,7 @@ package apisix import ( "strconv" - "github.com/api7/ingress-controller/pkg/seven/apisix" + "github.com/apache/apisix-ingress-controller/pkg/seven/apisix" ) type CorsYaml struct { diff --git a/pkg/ingress/apisix/route.go b/pkg/ingress/apisix/route.go index c8d0c14331..e43d3a84fd 100644 --- a/pkg/ingress/apisix/route.go +++ b/pkg/ingress/apisix/route.go @@ -17,10 +17,10 @@ package apisix import ( "strconv" - "github.com/api7/ingress-controller/pkg/ingress/endpoint" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - "github.com/api7/ingress-controller/pkg/seven/conf" - apisix "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/ingress/endpoint" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + "github.com/apache/apisix-ingress-controller/pkg/seven/conf" + apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) const ( diff --git a/pkg/ingress/apisix/service.go b/pkg/ingress/apisix/service.go index b8d9d1aef3..18d97d83bd 100644 --- a/pkg/ingress/apisix/service.go +++ b/pkg/ingress/apisix/service.go @@ -17,10 +17,10 @@ package apisix import ( "strconv" - "github.com/api7/ingress-controller/pkg/ingress/endpoint" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - "github.com/api7/ingress-controller/pkg/seven/conf" - apisix "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/ingress/endpoint" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + "github.com/apache/apisix-ingress-controller/pkg/seven/conf" + apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) const ( diff --git a/pkg/ingress/apisix/tls.go b/pkg/ingress/apisix/tls.go index 5419beb40b..479625997f 100644 --- a/pkg/ingress/apisix/tls.go +++ b/pkg/ingress/apisix/tls.go @@ -20,10 +20,10 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - ingressConf "github.com/api7/ingress-controller/pkg/kube" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - "github.com/api7/ingress-controller/pkg/seven/conf" - apisix "github.com/api7/ingress-controller/pkg/types/apisix/v1" + ingressConf "github.com/apache/apisix-ingress-controller/pkg/kube" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + "github.com/apache/apisix-ingress-controller/pkg/seven/conf" + apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) type ApisixTLSCRD configv1.ApisixTLS diff --git a/pkg/ingress/apisix/tls_test.go b/pkg/ingress/apisix/tls_test.go index 0df3569fc9..9f67d27952 100644 --- a/pkg/ingress/apisix/tls_test.go +++ b/pkg/ingress/apisix/tls_test.go @@ -22,10 +22,10 @@ import ( "gopkg.in/yaml.v2" v1 "k8s.io/api/core/v1" - apisixhttp "github.com/api7/ingress-controller/pkg/apisix" - "github.com/api7/ingress-controller/pkg/seven/conf" - "github.com/api7/ingress-controller/pkg/seven/utils" - apisix "github.com/api7/ingress-controller/pkg/types/apisix/v1" + apisixhttp "github.com/apache/apisix-ingress-controller/pkg/apisix" + "github.com/apache/apisix-ingress-controller/pkg/seven/conf" + "github.com/apache/apisix-ingress-controller/pkg/seven/utils" + apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) func TestConvert(t *testing.T) { diff --git a/pkg/ingress/apisix/upstream.go b/pkg/ingress/apisix/upstream.go index 7b0ab3f4b8..960e48a4c8 100644 --- a/pkg/ingress/apisix/upstream.go +++ b/pkg/ingress/apisix/upstream.go @@ -17,10 +17,10 @@ package apisix import ( "strconv" - "github.com/api7/ingress-controller/pkg/ingress/endpoint" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - "github.com/api7/ingress-controller/pkg/seven/conf" - apisix "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/ingress/endpoint" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + "github.com/apache/apisix-ingress-controller/pkg/seven/conf" + apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) const ( diff --git a/pkg/ingress/apisix/upstream_test.go b/pkg/ingress/apisix/upstream_test.go index c2e27f4e12..c3cf8e90ef 100644 --- a/pkg/ingress/apisix/upstream_test.go +++ b/pkg/ingress/apisix/upstream_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v2" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) func TestApisixUpstreamCRD_Convert(t *testing.T) { diff --git a/pkg/ingress/controller/apisix_route.go b/pkg/ingress/controller/apisix_route.go index 7380770634..fca49f7da7 100644 --- a/pkg/ingress/controller/apisix_route.go +++ b/pkg/ingress/controller/apisix_route.go @@ -26,14 +26,14 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/api7/ingress-controller/pkg/ingress/apisix" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - clientset "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" - apisixscheme "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" - apisixinformers "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v1" - listersv1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/listers/config/v1" - "github.com/api7/ingress-controller/pkg/log" - "github.com/api7/ingress-controller/pkg/seven/state" + "github.com/apache/apisix-ingress-controller/pkg/ingress/apisix" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + clientset "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + apisixscheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + apisixinformers "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v1" + listersv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v1" + "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/seven/state" ) type ApisixRouteController struct { diff --git a/pkg/ingress/controller/apisix_service.go b/pkg/ingress/controller/apisix_service.go index ede5d86ec4..162c7c3fed 100644 --- a/pkg/ingress/controller/apisix_service.go +++ b/pkg/ingress/controller/apisix_service.go @@ -26,14 +26,14 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/api7/ingress-controller/pkg/ingress/apisix" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - clientset "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" - apisixscheme "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" - informersv1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v1" - listersv1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/listers/config/v1" - "github.com/api7/ingress-controller/pkg/log" - "github.com/api7/ingress-controller/pkg/seven/state" + "github.com/apache/apisix-ingress-controller/pkg/ingress/apisix" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + clientset "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + apisixscheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + informersv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v1" + listersv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v1" + "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/seven/state" ) type ApisixServiceController struct { diff --git a/pkg/ingress/controller/apisix_tls.go b/pkg/ingress/controller/apisix_tls.go index 36a37d5df8..4720c92a2a 100644 --- a/pkg/ingress/controller/apisix_tls.go +++ b/pkg/ingress/controller/apisix_tls.go @@ -26,14 +26,14 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/api7/ingress-controller/pkg/ingress/apisix" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - clientset "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" - apisixscheme "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" - informersv1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v1" - listersv1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/listers/config/v1" - "github.com/api7/ingress-controller/pkg/log" - "github.com/api7/ingress-controller/pkg/seven/state" + "github.com/apache/apisix-ingress-controller/pkg/ingress/apisix" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + clientset "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + apisixscheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + informersv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v1" + listersv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v1" + "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/seven/state" ) type ApisixTLSController struct { diff --git a/pkg/ingress/controller/apisix_upstream.go b/pkg/ingress/controller/apisix_upstream.go index 09397390c4..498919e1c2 100644 --- a/pkg/ingress/controller/apisix_upstream.go +++ b/pkg/ingress/controller/apisix_upstream.go @@ -26,15 +26,15 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/api7/ingress-controller/pkg/ingress/apisix" - "github.com/api7/ingress-controller/pkg/ingress/endpoint" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - clientset "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" - apisixscheme "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" - informersv1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v1" - listersv1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/listers/config/v1" - "github.com/api7/ingress-controller/pkg/log" - "github.com/api7/ingress-controller/pkg/seven/state" + "github.com/apache/apisix-ingress-controller/pkg/ingress/apisix" + "github.com/apache/apisix-ingress-controller/pkg/ingress/endpoint" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + clientset "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + apisixscheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + informersv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v1" + listersv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v1" + "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/seven/state" ) type ApisixUpstreamController struct { diff --git a/pkg/ingress/controller/controller.go b/pkg/ingress/controller/controller.go index fa2d8c0beb..946e8321f6 100644 --- a/pkg/ingress/controller/controller.go +++ b/pkg/ingress/controller/controller.go @@ -31,16 +31,16 @@ import ( "k8s.io/client-go/tools/leaderelection" "k8s.io/client-go/tools/leaderelection/resourcelock" - "github.com/api7/ingress-controller/pkg/api" - "github.com/api7/ingress-controller/pkg/apisix" - "github.com/api7/ingress-controller/pkg/config" - "github.com/api7/ingress-controller/pkg/kube" - clientset "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" - crdclientset "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" - "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions" - "github.com/api7/ingress-controller/pkg/log" - "github.com/api7/ingress-controller/pkg/metrics" - "github.com/api7/ingress-controller/pkg/seven/conf" + "github.com/apache/apisix-ingress-controller/pkg/api" + "github.com/apache/apisix-ingress-controller/pkg/apisix" + "github.com/apache/apisix-ingress-controller/pkg/config" + "github.com/apache/apisix-ingress-controller/pkg/kube" + clientset "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + crdclientset "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions" + "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/metrics" + "github.com/apache/apisix-ingress-controller/pkg/seven/conf" ) // recover any exception diff --git a/pkg/ingress/controller/endpoint.go b/pkg/ingress/controller/endpoint.go index 6b55294ff5..a0f4f129f2 100644 --- a/pkg/ingress/controller/endpoint.go +++ b/pkg/ingress/controller/endpoint.go @@ -24,12 +24,12 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/api7/ingress-controller/pkg/apisix" - apisixcache "github.com/api7/ingress-controller/pkg/apisix/cache" - "github.com/api7/ingress-controller/pkg/log" - "github.com/api7/ingress-controller/pkg/seven/state" - "github.com/api7/ingress-controller/pkg/types" - apisixv1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/apisix" + apisixcache "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" + "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/seven/state" + "github.com/apache/apisix-ingress-controller/pkg/types" + apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) const ( diff --git a/pkg/ingress/endpoint/ep.go b/pkg/ingress/endpoint/ep.go index 14bf4418db..0ebcebc9c8 100644 --- a/pkg/ingress/endpoint/ep.go +++ b/pkg/ingress/endpoint/ep.go @@ -17,8 +17,8 @@ package endpoint import ( "github.com/golang/glog" - "github.com/api7/ingress-controller/pkg/kube" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/kube" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) type Endpoint interface { diff --git a/pkg/kube/apisix/client/clientset/versioned/clientset.go b/pkg/kube/apisix/client/clientset/versioned/clientset.go index 836cad1670..f85e3fd509 100644 --- a/pkg/kube/apisix/client/clientset/versioned/clientset.go +++ b/pkg/kube/apisix/client/clientset/versioned/clientset.go @@ -21,7 +21,7 @@ package versioned import ( "fmt" - apisixv1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v1" + apisixv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/kube/apisix/client/clientset/versioned/fake/clientset_generated.go b/pkg/kube/apisix/client/clientset/versioned/fake/clientset_generated.go index a901a8fcd8..7e2781473c 100644 --- a/pkg/kube/apisix/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/kube/apisix/client/clientset/versioned/fake/clientset_generated.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - clientset "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" - apisixv1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v1" - fakeapisixv1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake" + clientset "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + apisixv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v1" + fakeapisixv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/kube/apisix/client/clientset/versioned/fake/register.go b/pkg/kube/apisix/client/clientset/versioned/fake/register.go index 1a34bba9fe..153181ff8e 100644 --- a/pkg/kube/apisix/client/clientset/versioned/fake/register.go +++ b/pkg/kube/apisix/client/clientset/versioned/fake/register.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - apisixv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" + apisixv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kube/apisix/client/clientset/versioned/scheme/register.go b/pkg/kube/apisix/client/clientset/versioned/scheme/register.go index a031756d34..f91acfa1a8 100644 --- a/pkg/kube/apisix/client/clientset/versioned/scheme/register.go +++ b/pkg/kube/apisix/client/clientset/versioned/scheme/register.go @@ -19,7 +19,7 @@ limitations under the License. package scheme import ( - apisixv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" + apisixv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixroute.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixroute.go index b43d1d5ccf..ae40e5e4db 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixroute.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixroute.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - scheme "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + scheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixservice.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixservice.go index 6bf3c09f6a..258c1fc0a2 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixservice.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixservice.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - scheme "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + scheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixtls.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixtls.go index db7befe6e5..cc56194528 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixtls.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixtls.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - scheme "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + scheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixupstream.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixupstream.go index 768320967e..af40e7bdfa 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixupstream.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/apisixupstream.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - scheme "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + scheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/config_client.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/config_client.go index 93d78e5f18..99ba58f359 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/config_client.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/config_client.go @@ -19,8 +19,8 @@ limitations under the License. package v1 import ( - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixroute.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixroute.go index 74d084428c..7a5961f6d0 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixroute.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixroute.go @@ -21,7 +21,7 @@ package fake import ( "context" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixservice.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixservice.go index 95beac514f..9a06684f2a 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixservice.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixservice.go @@ -21,7 +21,7 @@ package fake import ( "context" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixtls.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixtls.go index e743f1660f..67242478ec 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixtls.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixtls.go @@ -21,7 +21,7 @@ package fake import ( "context" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixupstream.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixupstream.go index e52b3cd68c..1a8cc6e30f 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixupstream.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_apisixupstream.go @@ -21,7 +21,7 @@ package fake import ( "context" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_config_client.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_config_client.go index a2d9955681..6ae9a528c3 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_config_client.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v1/fake/fake_config_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/kube/apisix/client/informers/externalversions/config/interface.go b/pkg/kube/apisix/client/informers/externalversions/config/interface.go index 66a3a60d56..8dc3dca82a 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/interface.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/interface.go @@ -19,8 +19,8 @@ limitations under the License. package config import ( - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v1" - internalinterfaces "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v1" + internalinterfaces "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixroute.go b/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixroute.go index a93985cac0..504602d81f 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixroute.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixroute.go @@ -22,10 +22,10 @@ import ( "context" time "time" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - versioned "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" - internalinterfaces "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/listers/config/v1" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + versioned "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + internalinterfaces "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixservice.go b/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixservice.go index 43fe205558..5822285689 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixservice.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixservice.go @@ -22,10 +22,10 @@ import ( "context" time "time" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - versioned "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" - internalinterfaces "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/listers/config/v1" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + versioned "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + internalinterfaces "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixtls.go b/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixtls.go index ba26ae6c14..0973864e5f 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixtls.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixtls.go @@ -22,10 +22,10 @@ import ( "context" time "time" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - versioned "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" - internalinterfaces "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/listers/config/v1" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + versioned "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + internalinterfaces "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixupstream.go b/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixupstream.go index 886e3b3009..7048869f43 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixupstream.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v1/apisixupstream.go @@ -22,10 +22,10 @@ import ( "context" time "time" - configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" - versioned "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" - internalinterfaces "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/client/listers/config/v1" + configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" + versioned "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + internalinterfaces "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/kube/apisix/client/informers/externalversions/config/v1/interface.go b/pkg/kube/apisix/client/informers/externalversions/config/v1/interface.go index 0b8045c94f..01a2eac894 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v1/interface.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - internalinterfaces "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/kube/apisix/client/informers/externalversions/factory.go b/pkg/kube/apisix/client/informers/externalversions/factory.go index b85881ef2c..6c8df88d7b 100644 --- a/pkg/kube/apisix/client/informers/externalversions/factory.go +++ b/pkg/kube/apisix/client/informers/externalversions/factory.go @@ -23,9 +23,9 @@ import ( sync "sync" time "time" - versioned "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" - config "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/config" - internalinterfaces "github.com/api7/ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + versioned "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + config "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/config" + internalinterfaces "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kube/apisix/client/informers/externalversions/generic.go b/pkg/kube/apisix/client/informers/externalversions/generic.go index 6f613a2c7f..341c5bebc6 100644 --- a/pkg/kube/apisix/client/informers/externalversions/generic.go +++ b/pkg/kube/apisix/client/informers/externalversions/generic.go @@ -21,7 +21,7 @@ package externalversions import ( "fmt" - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/kube/apisix/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/kube/apisix/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 3d174b7e20..f824b7957d 100644 --- a/pkg/kube/apisix/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/kube/apisix/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" + versioned "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/kube/apisix/client/listers/config/v1/apisixroute.go b/pkg/kube/apisix/client/listers/config/v1/apisixroute.go index e6bdc01032..4cd9c597d7 100644 --- a/pkg/kube/apisix/client/listers/config/v1/apisixroute.go +++ b/pkg/kube/apisix/client/listers/config/v1/apisixroute.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/kube/apisix/client/listers/config/v1/apisixservice.go b/pkg/kube/apisix/client/listers/config/v1/apisixservice.go index 6c00cff374..1dc4dc1fd5 100644 --- a/pkg/kube/apisix/client/listers/config/v1/apisixservice.go +++ b/pkg/kube/apisix/client/listers/config/v1/apisixservice.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/kube/apisix/client/listers/config/v1/apisixtls.go b/pkg/kube/apisix/client/listers/config/v1/apisixtls.go index 0279402ab8..1033901d4f 100644 --- a/pkg/kube/apisix/client/listers/config/v1/apisixtls.go +++ b/pkg/kube/apisix/client/listers/config/v1/apisixtls.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/kube/apisix/client/listers/config/v1/apisixupstream.go b/pkg/kube/apisix/client/listers/config/v1/apisixupstream.go index 34b58a4062..079737b5a2 100644 --- a/pkg/kube/apisix/client/listers/config/v1/apisixupstream.go +++ b/pkg/kube/apisix/client/listers/config/v1/apisixupstream.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/kube/init.go b/pkg/kube/init.go index facc85302e..0e3692292b 100644 --- a/pkg/kube/init.go +++ b/pkg/kube/init.go @@ -19,8 +19,8 @@ import ( coreinformers "k8s.io/client-go/informers/core/v1" "k8s.io/client-go/kubernetes" - "github.com/api7/ingress-controller/pkg/config" - clientset "github.com/api7/ingress-controller/pkg/kube/apisix/client/clientset/versioned" + "github.com/apache/apisix-ingress-controller/pkg/config" + clientset "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" ) var ( diff --git a/pkg/seven/conf/conf.go b/pkg/seven/conf/conf.go index 7b6d3d946a..6be1b8a58b 100644 --- a/pkg/seven/conf/conf.go +++ b/pkg/seven/conf/conf.go @@ -15,8 +15,8 @@ package conf import ( - "github.com/api7/ingress-controller/pkg/apisix" - "github.com/api7/ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/apisix" + "github.com/apache/apisix-ingress-controller/pkg/log" ) var ( diff --git a/pkg/seven/state/builder.go b/pkg/seven/state/builder.go index 683cf0d591..82e005fc1b 100644 --- a/pkg/seven/state/builder.go +++ b/pkg/seven/state/builder.go @@ -19,12 +19,12 @@ import ( "errors" "sync" - "github.com/api7/ingress-controller/pkg/apisix/cache" - "github.com/api7/ingress-controller/pkg/id" - "github.com/api7/ingress-controller/pkg/log" - "github.com/api7/ingress-controller/pkg/seven/conf" - "github.com/api7/ingress-controller/pkg/seven/utils" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" + "github.com/apache/apisix-ingress-controller/pkg/id" + "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/seven/conf" + "github.com/apache/apisix-ingress-controller/pkg/seven/utils" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) const ( diff --git a/pkg/seven/state/builder_test.go b/pkg/seven/state/builder_test.go index 7550236d07..a895fcf6b1 100644 --- a/pkg/seven/state/builder_test.go +++ b/pkg/seven/state/builder_test.go @@ -17,7 +17,7 @@ package state import ( "testing" - "github.com/api7/ingress-controller/pkg/seven/utils" + "github.com/apache/apisix-ingress-controller/pkg/seven/utils" ) type school struct { diff --git a/pkg/seven/state/event.go b/pkg/seven/state/event.go index 16bd611f41..3a750f91d0 100644 --- a/pkg/seven/state/event.go +++ b/pkg/seven/state/event.go @@ -15,7 +15,7 @@ package state import ( - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) type ApisixCombination struct { diff --git a/pkg/seven/state/route_worker.go b/pkg/seven/state/route_worker.go index 99f5acfc18..30054fc17a 100644 --- a/pkg/seven/state/route_worker.go +++ b/pkg/seven/state/route_worker.go @@ -18,7 +18,7 @@ import ( "context" "sync" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) type routeWorker struct { diff --git a/pkg/seven/state/service_worker.go b/pkg/seven/state/service_worker.go index d74f351c96..54e5f76914 100644 --- a/pkg/seven/state/service_worker.go +++ b/pkg/seven/state/service_worker.go @@ -18,10 +18,10 @@ import ( "context" "sync" - "github.com/api7/ingress-controller/pkg/log" - "github.com/api7/ingress-controller/pkg/seven/conf" - "github.com/api7/ingress-controller/pkg/seven/utils" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/seven/conf" + "github.com/apache/apisix-ingress-controller/pkg/seven/utils" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) const ApisixService = "ApisixService" diff --git a/pkg/seven/state/solver.go b/pkg/seven/state/solver.go index 9d1e504f3c..48a7a9251f 100644 --- a/pkg/seven/state/solver.go +++ b/pkg/seven/state/solver.go @@ -22,10 +22,10 @@ import ( "go.uber.org/multierr" - "github.com/api7/ingress-controller/pkg/apisix/cache" - "github.com/api7/ingress-controller/pkg/log" - "github.com/api7/ingress-controller/pkg/seven/conf" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" + "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/apache/apisix-ingress-controller/pkg/seven/conf" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" ) var UpstreamQueue chan UpstreamQueueObj diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index c4e944dc2e..9640ef88b8 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -15,8 +15,8 @@ package e2e import ( - _ "github.com/api7/ingress-controller/test/e2e/endpoints" - _ "github.com/api7/ingress-controller/test/e2e/ingress" + _ "github.com/apache/apisix-ingress-controller/test/e2e/endpoints" + _ "github.com/apache/apisix-ingress-controller/test/e2e/ingress" ) func runE2E() {} diff --git a/test/e2e/endpoints/endpoints.go b/test/e2e/endpoints/endpoints.go index 8ada31873e..c2548bda09 100644 --- a/test/e2e/endpoints/endpoints.go +++ b/test/e2e/endpoints/endpoints.go @@ -19,7 +19,7 @@ import ( "net/http" "time" - "github.com/api7/ingress-controller/test/e2e/scaffold" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" "github.com/onsi/ginkgo" "github.com/stretchr/testify/assert" ) diff --git a/test/e2e/go.mod b/test/e2e/go.mod index cf499cdfa7..410a084e22 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -1,9 +1,9 @@ -module github.com/api7/ingress-controller/test/e2e +module github.com/apache/apisix-ingress-controller/test/e2e go 1.14 require ( - github.com/api7/ingress-controller v0.0.0-20210105024109-72e53386de5a + github.com/apache/apisix-ingress-controller v0.0.0-20210105024109-72e53386de5a github.com/gavv/httpexpect/v2 v2.1.0 github.com/gruntwork-io/terratest v0.31.2 github.com/onsi/ginkgo v1.14.2 @@ -12,4 +12,4 @@ require ( k8s.io/apimachinery v0.20.2 ) -replace github.com/api7/ingress-controller => ../../ +replace github.com/apache/apisix-ingress-controller => ../../ diff --git a/test/e2e/ingress/namespace.go b/test/e2e/ingress/namespace.go index 8cc654b0af..b2868febfd 100644 --- a/test/e2e/ingress/namespace.go +++ b/test/e2e/ingress/namespace.go @@ -21,7 +21,7 @@ import ( "net/http" "time" - "github.com/api7/ingress-controller/test/e2e/scaffold" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" "github.com/onsi/ginkgo" "github.com/stretchr/testify/assert" ) diff --git a/test/e2e/ingress/resourcepushing.go b/test/e2e/ingress/resourcepushing.go index 70490ff042..bd1b0e69de 100644 --- a/test/e2e/ingress/resourcepushing.go +++ b/test/e2e/ingress/resourcepushing.go @@ -21,7 +21,7 @@ import ( "github.com/onsi/ginkgo" "github.com/stretchr/testify/assert" - "github.com/api7/ingress-controller/test/e2e/scaffold" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("ApisixRoute Testing", func() { diff --git a/test/e2e/ingress/sanity.go b/test/e2e/ingress/sanity.go index fc43fc6950..d31884d28b 100644 --- a/test/e2e/ingress/sanity.go +++ b/test/e2e/ingress/sanity.go @@ -19,7 +19,7 @@ import ( "net/http" "time" - "github.com/api7/ingress-controller/test/e2e/scaffold" + "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" "github.com/onsi/ginkgo" "github.com/stretchr/testify/assert" ) diff --git a/test/e2e/scaffold/crd.go b/test/e2e/scaffold/crd.go index 88022a59cd..cb0ece038a 100644 --- a/test/e2e/scaffold/crd.go +++ b/test/e2e/scaffold/crd.go @@ -22,8 +22,8 @@ import ( "strconv" "time" - "github.com/api7/ingress-controller/pkg/apisix" - v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1" + "github.com/apache/apisix-ingress-controller/pkg/apisix" + v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" "github.com/gruntwork-io/terratest/modules/k8s" "github.com/onsi/ginkgo" "github.com/stretchr/testify/assert"