diff --git a/.golangci.yml b/.golangci.yml index a99243c5e..8d999270e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -24,7 +24,7 @@ linters-settings: disable: - unsafeptr goimports: - local-prefixes: github.com/apache/apisix-ingress-controller + local-prefixes: github.com/api7/api7-ingress-controller linters: disable: diff --git a/CHANGELOG.md b/CHANGELOG.md index dbd25fb5b..c4ea45789 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2034,7 +2034,7 @@ This release mainly improves the program robustness and adds some features. - Support Leader election to let only the leader process resources [#173](https://github.com/apache/apisix-ingress-controller/pull/173); - Let Controller itself generates resource ids instead of relying on APISIX [#199](https://github.com/apache/apisix-ingress-controller/pull/199); -- Change go module name from `github.com/api7/ingress-controller` to `github.com/apache/apisix-ingress-controller` [#220](https://github.com/apache/apisix-ingress-controller/pull/220); +- Change go module name from `github.com/api7/ingress-controller` to `github.com/api7/api7-ingress-controller` [#220](https://github.com/apache/apisix-ingress-controller/pull/220); - Re draw the design diagram [#214](https://github.com/apache/apisix-ingress-controller/pull/214); - Support gRPC scheme in ApisixUpstream [#225](https://github.com/apache/apisix-ingress-controller/pull/225); - SSL resource cache optimization [#203](https://github.com/apache/apisix-ingress-controller/pull/203); diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 797106eb1..000000000 --- a/LICENSE +++ /dev/null @@ -1,218 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -======================================================================= -Apache APISIX Ingress Controller Subcomponents: - -The Apache Ingress Controller project contains subcomponents with separate copyright -notices and license terms. Your use of the source code for the these -subcomponents is subject to the terms and conditions of the following -licenses. - -======================================================================== -Apache 2.0 licenses -======================================================================== - -The following components are provided under the Apache License. See project link for details. -The text of each license is the standard Apache 2.0 license. - - files from kubernetes/code-generator: https://github.com/kubernetes/code-generator/ Apache 2.0 diff --git a/Makefile b/Makefile index 6229e4c21..f44820df4 100644 --- a/Makefile +++ b/Makefile @@ -46,9 +46,9 @@ ifeq ($(OSARCH), x86_64) OSARCH = amd64 endif -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" +VERSYM="github.com/api7/api7-ingress-controller/pkg/version._buildVersion" +GITSHASYM="github.com/api7/api7-ingress-controller/pkg/version._buildGitRevision" +BUILDOSSYM="github.com/api7/api7-ingress-controller/pkg/version._buildOS" GO_LDFLAGS ?= "-X=$(VERSYM)=$(VERSION) -X=$(GITSHASYM)=$(GITSHA) -X=$(BUILDOSSYM)=$(OSNAME)/$(OSARCH)" E2E_NODES ?= 4 E2E_FLAKE_ATTEMPTS ?= 0 diff --git a/NOTICE b/NOTICE deleted file mode 100644 index abdbd3d3f..000000000 --- a/NOTICE +++ /dev/null @@ -1,5 +0,0 @@ -Apache APISIX -Copyright 2019-2024 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). diff --git a/README.md b/README.md index 53585a21b..3e312994f 100644 --- a/README.md +++ b/README.md @@ -17,12 +17,7 @@ # --> -# Apache APISIX for Kubernetes - -[![Go Report Card](https://goreportcard.com/badge/github.com/apache/apisix-ingress-controller)](https://goreportcard.com/report/github.com/apache/apisix-ingress-controller) -[![Slack](https://badgen.net/badge/Slack/Join%20Apache%20APISIX?icon=slack)](https://apisix.apache.org/slack) - -Use [Apache APISIX](https://github.com/apache/apisix#apache-apisix) for Kubernetes [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/). +# API7 Ingress Controller All configurations in `apisix-ingress-controller` are defined with Kubernetes CRDs (Custom Resource Definitions). Support configuring [plugins](https://github.com/apache/apisix/blob/master/docs/en/latest/plugins), service registration discovery mechanism for upstreams, load balancing and more in Apache APISIX. @@ -83,72 +78,5 @@ Currently, APISIX Ingress Controller automatically manipulates some APISIX resou * [Rich plugins and ecology.](https://github.com/apache/apisix/tree/master/docs/en/latest/plugins) * Supports APISIX custom resources and Kubernetes native Ingress resources. -## Contributing - -We welcome all kinds of contributions from the open-source community, individuals and partners. - -* [Contributing Guide](./docs/en/latest/contribute.md) - -### How to contribute - -Most of the contributions that we receive are code contributions, but you can -also contribute to the documentation or simply report solid bugs -for us to fix. - - For new contributors, please take a look at issues with a tag called [Good first issue](https://github.com/apache/apisix-ingress-controller/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) or [Help wanted](https://github.com/apache/apisix-ingress-controller/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22). - -### How to report a bug - -* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/apache/apisix-ingress-controller/issues). - -* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/apache/apisix-ingress-controller/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring. - -### Contributor over time - -[![Contributor over time](https://contributor-overtime-api.git-contributor.com/contributors-svg?chart=contributorOverTime&repo=apache/apisix-ingress-controller)](https://git-contributor.com/?chart=contributorOverTime&repo=apache/apisix-ingress-controller) - -## Community - -* Mailing List: Mail to , follow the reply to subscribe the mailing list. -* QQ Group - 578997126 -* ![Twitter Follow](https://img.shields.io/twitter/follow/ApacheAPISIX?style=social) - follow and interact with us using hashtag `#ApacheAPISIX` -* [Bilibili video](https://space.bilibili.com/551921247) - -## Todos - -* More todos will display in [issues](https://github.com/apache/apisix-ingress-controller/issues?q=is%3Aopen+is%3Aissue+label%3Atriage%2Faccepted) - -## User stories - -- [How Does Zoom Use APISIX Ingress in Its Continuous Delivery Pipeline? - API7.ai](https://api7.ai/blog/zoom-uses-apisix-ingress) -- [Copernicus Reference System Software](https://github.com/COPRS/infrastructure/wiki/Networking-trade-off) -- [From Traefik to APISIX, Horizon Robotics's Exploration in Ingress Controller - API7.ai](https://api7.ai/blog/why-horizon-robotics-migrated-from-traefik-to-apche-apisix) -- [Why Jiakaobaodian Chooses APISIX Ingress Controller - API7.ai](https://api7.ai/blog/why-jiakaobaodian-chooses-apisix-ingress-controller) -- [Why AISpeech Chooses Apache APISIX Instead of NGINX as k8s Ingress Controller - API7.ai](https://api7.ai/blog/why-aispeech-chooses-apache-apisix-instead-of-nginx-as-k8s-ingress-controller) -- [Tencent Cloud: Why choose Apache APISIX to implement the k8s ingress controller?(Chinese)](https://cloud.tencent.com/developer/article/1592281) -- [aispeech: Why we create a new k8s ingress controller?(Chinese)](https://mp.weixin.qq.com/s/bmm2ibk2V7-XYneLo9XAPQ) - -If you are willing to share with us some scenarios and use cases when you use APISIX Ingress, -please reply to the [issue](https://github.com/apache/apisix-ingress-controller/issues/501), -or submit PR to update [Powered-BY](./powered-by.md) file - -## Who Uses APISIX Ingress? - -A wide variety of companies and organizations use APISIX Ingress for research, production and commercial product, below are some of them: - -- AISpeech -- European Copernicus Reference System -- Jiakaobaodian(驾考宝典) -- Horizon Robotics(地平线) -- Tencent Cloud -- UPYUN -- Zoom - -## Milestone - -* [Milestone](https://github.com/apache/apisix-ingress-controller/milestones) - -## Terminology - * APISIX Ingress: the whole service that contains the proxy ([Apache APISIX](https://apisix.apache.org)) and ingress controller (apisix-ingress-controller). * apisix-ingress-controller: the ingress controller component. diff --git a/cmd/cmd.go b/cmd/cmd.go index 64c79372b..811f8c1cc 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/cobra" - "github.com/apache/apisix-ingress-controller/cmd/ingress" - "github.com/apache/apisix-ingress-controller/pkg/version" + "github.com/api7/api7-ingress-controller/cmd/ingress" + "github.com/api7/api7-ingress-controller/pkg/version" ) func newVersionCommand() *cobra.Command { diff --git a/cmd/ingress/ingress.go b/cmd/ingress/ingress.go index 34bb05e7b..331feb78c 100644 --- a/cmd/ingress/ingress.go +++ b/cmd/ingress/ingress.go @@ -28,10 +28,10 @@ import ( "go.uber.org/zap/zapcore" "gopkg.in/natefinch/lumberjack.v2" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/log" - controller "github.com/apache/apisix-ingress-controller/pkg/providers" - "github.com/apache/apisix-ingress-controller/pkg/version" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/log" + controller "github.com/api7/api7-ingress-controller/pkg/providers" + "github.com/api7/api7-ingress-controller/pkg/version" ) func dief(template string, args ...interface{}) { diff --git a/cmd/ingress/ingress_test.go b/cmd/ingress/ingress_test.go index 5729ae99d..26029fd13 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/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/types" ) type fakeWriteSyncer struct { diff --git a/docs/en/latest/contribute.md b/docs/en/latest/contribute.md deleted file mode 100644 index 512d00518..000000000 --- a/docs/en/latest/contribute.md +++ /dev/null @@ -1,143 +0,0 @@ ---- -title: Development -keywords: - - APISIX ingress - - Apache APISIX - - Kubernetes ingress - - Development - - Contribute -description: Setting up development environment for APISIX Ingress controller. ---- - - -This document walks through how you can set up your development environment to contribute to APISIX Ingress controller. - -## Prerequisites - -Before you get started make sure you have: - -1. Installed [Go 1.20](https://golang.org/dl/) or later -2. A Kubernetes cluster available. We recommend using [kind](https://kind.sigs.k8s.io/). -3. Installed APISIX in Kubernetes using [Helm](https://github.com/apache/apisix-helm-chart). - -## Fork and clone - -1. Fork the repository [apache/apisix-ingress-controller](https://github.com/apache/apisix-ingress-controller) to your GitHub account -2. Clone the fork to your workstation. -3. Run `go mod download` to download the required modules. - -:::tip - -If you are in China, you can speed up the downloads by setting `GOPROXY` to `https://goproxy.cn`. - -::: - -## Build from source - -To build APISIX Ingress controller, run the command below on the root of the project: - -```shell -make build -``` - -Now you can run it by: - -```shell -./apisix-ingress-controller version -``` - -## Making changes - -Prior to opening a pull request with changes or new features, please [open an issue](https://github.com/apache/apisix-ingress-controller/issues). - -Make sure that the license, code style, and document format are consistent with the project specification. You can do this by running: - -```shell -make update-all -``` - -Your pull requests will more likely to be accepted if: - -1. All tests are passing and tests are included for new functionalities -2. README and documentation is updated with the chages -3. PR is linked to the issue with semantic keywords ("fixes #145") -4. Has detailed PR descriptions and good [commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) - -## Running tests - -To run unit tests: - -```shell -make unit-test -``` - -To run end-to-end tests, you need to install [kind](https://kind.sigs.k8s.io/). - -Currently, we use Kind version `0.11.1` and Kubernetes version `1.21.1` for running the tests. - -```shell -make e2e-test-local -``` - -:::note - -End-to-end tests are comprehensive and takes time to run. - -See [focused specs](https://onsi.github.io/ginkgo/#focused-specs) to learn how you can run partial tests. - -::: - -To run e2e tests on any changes, you can build a Docker image and push it to a registry that the Kubernetes cluster can access: - -```shell -make build-image IMAGE_TAG=a.b.c -make push-images IMAGE_TAG=a.b.c -``` - -## Running locally - -Make sure to expose both the APISIX proxy and the Admin API to outside the Kubernetes cluster. You can use [NodePort service](https://kubernetes.io/docs/concepts/services-networking/service/#nodeport) or use `port-forward` as shown below: - -Also, we can also use `port-forward` to expose the Admin API port of Apache APISIX Pod. The default port of Apache APISIX Admin API is 9180, next I'll expose the local port `127.0.0.1:9180`: - -```shell -kubectl port-forward -n ${namespace of Apache APISIX} ${Pod name of Apache APISIX} 9180:9180 -``` - -This will expose the default `9180` port of the Admin API to outside the cluster. - -You can now run APISIX Ingress controller by: - -```shell -cd /path/to/apisix-ingress-controller -./apisix-ingress-controller ingress \ - --kubeconfig /path/to/kubeconfig \ - --http-listen :8080 \ - --log-output stderr \ - --default-apisix-cluster-base-url http://127.0.0.1:9180/apisix/admin \ - --default-apisix-cluster-admin-key edd1c9f034335f136f87ad84b625c8f1 -``` - -:::note - -1. If you are using minikube, the path to kubeconfig should be `~/.kube/config`. -2. If you have changed the default Admin API key, you have to pass it in the `--default-apisix-cluster-admin-key` flag. You can remove the flag if you have disabled authentication. - -::: diff --git a/docs/en/latest/references/v2.mdx b/docs/en/latest/references/v2.mdx index 59c9b30c3..eb336bde7 100644 --- a/docs/en/latest/references/v2.mdx +++ b/docs/en/latest/references/v2.mdx @@ -477,7 +477,7 @@ string clientTimeout
-github.com/apache/apisix-ingress-controller/pkg/types.TimeDuration +github.com/api7/api7-ingress-controller/pkg/types.TimeDuration diff --git a/go.mod b/go.mod index b92e2e449..227672278 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/apache/apisix-ingress-controller +module github.com/api7/api7-ingress-controller go 1.20 diff --git a/install.md b/install.md index 6545db87c..510f8762a 100644 --- a/install.md +++ b/install.md @@ -37,12 +37,12 @@ As an alternative way, you can also choose to install apisix-ingress-controller ```shell kubectl create namespace ingress-apisix -kubectl kustomize "github.com/apache/apisix-ingress-controller/samples/deploy?ref=master" | kubectl apply -f - +kubectl kustomize "github.com/api7/api7-ingress-controller/samples/deploy?ref=master" | kubectl apply -f - ``` Parameters are hardcoded so if the default values are not good for you, just tweak them manually. -To tweak parameters, first you need to modify config files in _samples/deploy_ directory. There are many ways to acheive this. For example, you may insert a `sed` command after `kubectl kustomize`, that is, `kubectl kustomize "github.com/apache/apisix-ingress-controller/samples/deploy?ref=master" | sed "s@to-be-modified@after-modified@g" | kubectl apply -f -`. Another way is to use a local copy of _samples/deploy_ directory or a copy from your repo. +To tweak parameters, first you need to modify config files in _samples/deploy_ directory. There are many ways to acheive this. For example, you may insert a `sed` command after `kubectl kustomize`, that is, `kubectl kustomize "github.com/api7/api7-ingress-controller/samples/deploy?ref=master" | sed "s@to-be-modified@after-modified@g" | kubectl apply -f -`. Another way is to use a local copy of _samples/deploy_ directory or a copy from your repo. Then you need to know which parameter need to be tweaked. If APISIX access token or the address of APISIX Admin API is changed, you need to modify `apisix.admin_key` or `apisix.base_url` respectively in field `.data.config.yaml` in file _samples/deploy/configmap/apisix-ingress-cm.yaml_. Another example is to install apisix-ingress-controller with different version, in which case you need to configure `.spec.template.spec.containers.[image]` to a desired version in file _samples/deploy/deployment/ingress-controller.yaml_. diff --git a/main.go b/main.go index 550ce83e0..2c03dafbe 100644 --- a/main.go +++ b/main.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "github.com/apache/apisix-ingress-controller/cmd" + "github.com/api7/api7-ingress-controller/cmd" ) func main() { diff --git a/pkg/api/router/router_test.go b/pkg/api/router/router_test.go index 9dff6ab0f..41a4dfc71 100644 --- a/pkg/api/router/router_test.go +++ b/pkg/api/router/router_test.go @@ -23,7 +23,7 @@ import ( "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/apisix" ) func TestHealthz(t *testing.T) { diff --git a/pkg/api/router/webhook.go b/pkg/api/router/webhook.go index cf41fad4d..2a61f4175 100644 --- a/pkg/api/router/webhook.go +++ b/pkg/api/router/webhook.go @@ -18,8 +18,8 @@ package router import ( "github.com/gin-gonic/gin" - "github.com/apache/apisix-ingress-controller/pkg/api/validation" - "github.com/apache/apisix-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/api/validation" + "github.com/api7/api7-ingress-controller/pkg/apisix" ) // MountWebhooks mounts webhook related routes. diff --git a/pkg/api/server.go b/pkg/api/server.go index 95dc2118f..581578464 100644 --- a/pkg/api/server.go +++ b/pkg/api/server.go @@ -26,12 +26,12 @@ import ( "github.com/gin-gonic/gin" "go.uber.org/zap" - apirouter "github.com/apache/apisix-ingress-controller/pkg/api/router" - "github.com/apache/apisix-ingress-controller/pkg/apisix" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - "github.com/apache/apisix-ingress-controller/pkg/types" + apirouter "github.com/api7/api7-ingress-controller/pkg/api/router" + "github.com/api7/api7-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/metrics" + "github.com/api7/api7-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 243fe2270..8dbc2b89b 100644 --- a/pkg/api/server_test.go +++ b/pkg/api/server_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/config" ) const ( diff --git a/pkg/api/validation/apisix_plugin_config.go b/pkg/api/validation/apisix_plugin_config.go index d92eddc06..6a8e93a23 100644 --- a/pkg/api/validation/apisix_plugin_config.go +++ b/pkg/api/validation/apisix_plugin_config.go @@ -18,8 +18,8 @@ package validation import ( "go.uber.org/zap" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" ) func ValidateApisixPluginConfigV2(apc *v2.ApisixPluginConfig) (valid bool, resultErr error) { diff --git a/pkg/api/validation/apisix_route.go b/pkg/api/validation/apisix_route.go index 93a015884..543a27b4e 100644 --- a/pkg/api/validation/apisix_route.go +++ b/pkg/api/validation/apisix_route.go @@ -18,7 +18,7 @@ package validation import ( "github.com/hashicorp/go-multierror" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" ) // ApisixRouteValidator validates ApisixRoute and its plugins. diff --git a/pkg/api/validation/apisix_route_test.go b/pkg/api/validation/apisix_route_test.go index c0e1bb9bf..a2c13724e 100644 --- a/pkg/api/validation/apisix_route_test.go +++ b/pkg/api/validation/apisix_route_test.go @@ -20,9 +20,9 @@ import ( "fmt" "testing" - "github.com/apache/apisix-ingress-controller/pkg/apisix" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - api "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/apisix" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + api "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type fakeSchemaClient struct { diff --git a/pkg/api/validation/utils.go b/pkg/api/validation/utils.go index 2815e355a..4f0038bcf 100644 --- a/pkg/api/validation/utils.go +++ b/pkg/api/validation/utils.go @@ -26,8 +26,8 @@ import ( kwhvalidating "github.com/slok/kubewebhook/v2/pkg/webhook/validating" "github.com/xeipuuv/gojsonschema" - "github.com/apache/apisix-ingress-controller/pkg/apisix" - "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/log" ) var ( diff --git a/pkg/api/validation/utils_test.go b/pkg/api/validation/utils_test.go index 12373390a..d403551fd 100644 --- a/pkg/api/validation/utils_test.go +++ b/pkg/api/validation/utils_test.go @@ -20,7 +20,7 @@ import ( "github.com/xeipuuv/gojsonschema" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" ) func Test_validateSchema(t *testing.T) { diff --git a/pkg/api/validation/validator.go b/pkg/api/validation/validator.go index 48780821e..a68538813 100644 --- a/pkg/api/validation/validator.go +++ b/pkg/api/validation/validator.go @@ -27,9 +27,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" - "github.com/apache/apisix-ingress-controller/pkg/apisix" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/apisix" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" ) var ( diff --git a/pkg/apisix/apisix.go b/pkg/apisix/apisix.go index f2af3cfb6..7f64a0870 100644 --- a/pkg/apisix/apisix.go +++ b/pkg/apisix/apisix.go @@ -19,7 +19,7 @@ import ( "context" "sync" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + v1 "github.com/api7/api7-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 91e68b221..53563326a 100644 --- a/pkg/apisix/cache/cache.go +++ b/pkg/apisix/cache/cache.go @@ -15,7 +15,7 @@ package cache -import v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" +import v1 "github.com/api7/api7-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 3dc039351..b617ed19e 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/apache/apisix-ingress-controller/pkg/types/apisix/v1" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) var ( diff --git a/pkg/apisix/cache/memdb_test.go b/pkg/apisix/cache/memdb_test.go index 8181f7583..92a63d1ff 100644 --- a/pkg/apisix/cache/memdb_test.go +++ b/pkg/apisix/cache/memdb_test.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/go-memdb" "github.com/stretchr/testify/assert" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestMemDBCacheRoute(t *testing.T) { diff --git a/pkg/apisix/cache/noop_db.go b/pkg/apisix/cache/noop_db.go index d3e7b770d..1b7beea77 100644 --- a/pkg/apisix/cache/noop_db.go +++ b/pkg/apisix/cache/noop_db.go @@ -18,7 +18,7 @@ package cache import ( - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type noopCache struct { diff --git a/pkg/apisix/cluster.go b/pkg/apisix/cluster.go index 840a4e748..a7e2d7a35 100644 --- a/pkg/apisix/cluster.go +++ b/pkg/apisix/cluster.go @@ -35,11 +35,11 @@ import ( "go.uber.org/zap" "k8s.io/apimachinery/pkg/util/wait" - "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - "github.com/apache/apisix-ingress-controller/pkg/types" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/metrics" + "github.com/api7/api7-ingress-controller/pkg/types" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) const ( diff --git a/pkg/apisix/cluster_test.go b/pkg/apisix/cluster_test.go index 243d9245a..1ace9762b 100644 --- a/pkg/apisix/cluster_test.go +++ b/pkg/apisix/cluster_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/metrics" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestAddCluster(t *testing.T) { diff --git a/pkg/apisix/consumer.go b/pkg/apisix/consumer.go index 62b17660a..b7c7facc4 100644 --- a/pkg/apisix/consumer.go +++ b/pkg/apisix/consumer.go @@ -20,10 +20,10 @@ import ( "go.uber.org/zap" - "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" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/log" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type consumerClient struct { diff --git a/pkg/apisix/consumer_test.go b/pkg/apisix/consumer_test.go index d9bcb578f..10d3c4297 100644 --- a/pkg/apisix/consumer_test.go +++ b/pkg/apisix/consumer_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/nettest" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/metrics" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type fakeAPISIXConsumerSrv struct { diff --git a/pkg/apisix/global_rule.go b/pkg/apisix/global_rule.go index 62386c9d2..92383e55b 100644 --- a/pkg/apisix/global_rule.go +++ b/pkg/apisix/global_rule.go @@ -20,10 +20,10 @@ import ( "go.uber.org/zap" - "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" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/log" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type globalRuleClient struct { diff --git a/pkg/apisix/global_rule_test.go b/pkg/apisix/global_rule_test.go index b13ee79ed..8df69a88c 100644 --- a/pkg/apisix/global_rule_test.go +++ b/pkg/apisix/global_rule_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/nettest" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/metrics" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type fakeAPISIXGlobalRuleSrv struct { diff --git a/pkg/apisix/nonexistentclient.go b/pkg/apisix/nonexistentclient.go index 237cbbc05..e3979dbe7 100644 --- a/pkg/apisix/nonexistentclient.go +++ b/pkg/apisix/nonexistentclient.go @@ -18,8 +18,8 @@ package apisix import ( "context" - "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type nonExistentCluster struct { diff --git a/pkg/apisix/noop.go b/pkg/apisix/noop.go index 22094e076..539c4d6ee 100644 --- a/pkg/apisix/noop.go +++ b/pkg/apisix/noop.go @@ -19,7 +19,7 @@ package apisix import ( "context" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) var ( diff --git a/pkg/apisix/plugin.go b/pkg/apisix/plugin.go index e5f4eb99b..3c83f6851 100644 --- a/pkg/apisix/plugin.go +++ b/pkg/apisix/plugin.go @@ -20,7 +20,7 @@ import ( "go.uber.org/zap" - "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/log" ) type pluginClient struct { diff --git a/pkg/apisix/plugin_metadata.go b/pkg/apisix/plugin_metadata.go index 64db9f9d6..4e10a2a22 100644 --- a/pkg/apisix/plugin_metadata.go +++ b/pkg/apisix/plugin_metadata.go @@ -20,8 +20,8 @@ import ( "go.uber.org/zap" - "github.com/apache/apisix-ingress-controller/pkg/log" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/log" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type pluginMetadataClient struct { diff --git a/pkg/apisix/plugin_test.go b/pkg/apisix/plugin_test.go index dabae6325..510d22cfa 100644 --- a/pkg/apisix/plugin_test.go +++ b/pkg/apisix/plugin_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/nettest" - "github.com/apache/apisix-ingress-controller/pkg/metrics" + "github.com/api7/api7-ingress-controller/pkg/metrics" ) type fakeAPISIXPluginSrv struct { diff --git a/pkg/apisix/pluginconfig.go b/pkg/apisix/pluginconfig.go index 6a2d4f0f4..fc383be63 100644 --- a/pkg/apisix/pluginconfig.go +++ b/pkg/apisix/pluginconfig.go @@ -22,10 +22,10 @@ import ( "go.uber.org/zap" - "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" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/log" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type pluginConfigClient struct { diff --git a/pkg/apisix/pluginconfig_test.go b/pkg/apisix/pluginconfig_test.go index 0bc852aec..fcc926c77 100644 --- a/pkg/apisix/pluginconfig_test.go +++ b/pkg/apisix/pluginconfig_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/nettest" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/metrics" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type fakeAPISIXPluginConfigSrv struct { diff --git a/pkg/apisix/resource.go b/pkg/apisix/resource.go index a6e14a4b5..3d2790d37 100644 --- a/pkg/apisix/resource.go +++ b/pkg/apisix/resource.go @@ -21,8 +21,8 @@ import ( "strconv" "strings" - "github.com/apache/apisix-ingress-controller/pkg/log" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/log" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type getResponse struct { diff --git a/pkg/apisix/resource_test.go b/pkg/apisix/resource_test.go index 5493df4f2..1411acf20 100644 --- a/pkg/apisix/resource_test.go +++ b/pkg/apisix/resource_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestItemUnmarshalJSON(t *testing.T) { diff --git a/pkg/apisix/route.go b/pkg/apisix/route.go index de27555e2..108eeebbb 100644 --- a/pkg/apisix/route.go +++ b/pkg/apisix/route.go @@ -21,10 +21,10 @@ import ( "go.uber.org/zap" - "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" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/log" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type routeClient struct { diff --git a/pkg/apisix/route_test.go b/pkg/apisix/route_test.go index 3a48d88c1..9e8d37113 100644 --- a/pkg/apisix/route_test.go +++ b/pkg/apisix/route_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/nettest" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/metrics" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type fakeAPISIXRouteSrv struct { diff --git a/pkg/apisix/schema.go b/pkg/apisix/schema.go index 28a7eb297..5a5bcb7c5 100644 --- a/pkg/apisix/schema.go +++ b/pkg/apisix/schema.go @@ -20,10 +20,10 @@ import ( "go.uber.org/zap" - "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" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/log" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type schemaClient struct { diff --git a/pkg/apisix/schema_test.go b/pkg/apisix/schema_test.go index 5601d09ea..09743a18c 100644 --- a/pkg/apisix/schema_test.go +++ b/pkg/apisix/schema_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/nettest" - "github.com/apache/apisix-ingress-controller/pkg/metrics" + "github.com/api7/api7-ingress-controller/pkg/metrics" ) type fakeAPISIXSchemaSrv struct { diff --git a/pkg/apisix/ssl.go b/pkg/apisix/ssl.go index fc7c6e622..8ba6add2e 100644 --- a/pkg/apisix/ssl.go +++ b/pkg/apisix/ssl.go @@ -21,10 +21,10 @@ import ( "go.uber.org/zap" - "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" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/log" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type sslClient struct { diff --git a/pkg/apisix/ssl_test.go b/pkg/apisix/ssl_test.go index 7ae1a7d45..dfe2e13e5 100644 --- a/pkg/apisix/ssl_test.go +++ b/pkg/apisix/ssl_test.go @@ -30,8 +30,8 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/nettest" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/metrics" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type fakeAPISIXSSLSrv struct { diff --git a/pkg/apisix/stream_route.go b/pkg/apisix/stream_route.go index 97139c868..b1d24629f 100644 --- a/pkg/apisix/stream_route.go +++ b/pkg/apisix/stream_route.go @@ -20,10 +20,10 @@ import ( "go.uber.org/zap" - "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" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/log" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type streamRouteClient struct { diff --git a/pkg/apisix/stream_route_test.go b/pkg/apisix/stream_route_test.go index 3b67dfa2e..deff35e96 100644 --- a/pkg/apisix/stream_route_test.go +++ b/pkg/apisix/stream_route_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/nettest" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/metrics" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type fakeAPISIXStreamRouteSrv struct { diff --git a/pkg/apisix/upstream.go b/pkg/apisix/upstream.go index 6b53b396e..01953ecf0 100644 --- a/pkg/apisix/upstream.go +++ b/pkg/apisix/upstream.go @@ -21,10 +21,10 @@ import ( "go.uber.org/zap" - "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" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/log" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type upstreamClient struct { diff --git a/pkg/apisix/upstream_test.go b/pkg/apisix/upstream_test.go index a07d3d226..35261a133 100644 --- a/pkg/apisix/upstream_test.go +++ b/pkg/apisix/upstream_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/nettest" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/metrics" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type fakeAPISIXUpstreamSrv struct { diff --git a/pkg/apisix/upstreamservicerelation.go b/pkg/apisix/upstreamservicerelation.go index ced66faad..d223d5120 100644 --- a/pkg/apisix/upstreamservicerelation.go +++ b/pkg/apisix/upstreamservicerelation.go @@ -22,9 +22,9 @@ import ( "go.uber.org/zap" - "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" - "github.com/apache/apisix-ingress-controller/pkg/log" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/log" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) // to do: Delete one of the upstreams. Currently, only service is deleted. There will be some diff --git a/pkg/apisix/upstreamservicerelation_test.go b/pkg/apisix/upstreamservicerelation_test.go index 49dbe499b..4e14cd8f9 100644 --- a/pkg/apisix/upstreamservicerelation_test.go +++ b/pkg/apisix/upstreamservicerelation_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/metrics" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestUpstreamServiceRelation(t *testing.T) { diff --git a/pkg/apisix/utils.go b/pkg/apisix/utils.go index 4bc45151f..1345d5e1a 100644 --- a/pkg/apisix/utils.go +++ b/pkg/apisix/utils.go @@ -29,9 +29,9 @@ import ( "go.uber.org/zap" - "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" - "github.com/apache/apisix-ingress-controller/pkg/log" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/log" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) var ( diff --git a/pkg/apisix/validator.go b/pkg/apisix/validator.go index 56f867883..987c9c4ab 100644 --- a/pkg/apisix/validator.go +++ b/pkg/apisix/validator.go @@ -25,7 +25,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/xeipuuv/gojsonschema" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type APISIXSchema struct { diff --git a/pkg/apisix/validator_test.go b/pkg/apisix/validator_test.go index a78abe3ac..0486231d9 100644 --- a/pkg/apisix/validator_test.go +++ b/pkg/apisix/validator_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestValidateHTTPPluginSchema(t *testing.T) { diff --git a/pkg/config/config.go b/pkg/config/config.go index b7e250c17..47e1ed5ca 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -27,7 +27,7 @@ import ( "gopkg.in/yaml.v2" "k8s.io/apimachinery/pkg/util/validation" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/types" ) const ( diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index 6e14d4a4d..964af34aa 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/types" ) func TestNewConfigFromFile(t *testing.T) { diff --git a/pkg/id/idgen.go b/pkg/id/idgen.go index c08efe256..3af1ad27e 100644 --- a/pkg/id/idgen.go +++ b/pkg/id/idgen.go @@ -19,7 +19,7 @@ import ( "fmt" "hash/crc32" - "github.com/apache/apisix-ingress-controller/pkg/utils" + "github.com/api7/api7-ingress-controller/pkg/utils" ) // GenID generates an ID according to the raw material. diff --git a/pkg/kube/apisix/apis/config/v2/types.go b/pkg/kube/apisix/apis/config/v2/types.go index dfec5928d..235b46166 100644 --- a/pkg/kube/apisix/apis/config/v2/types.go +++ b/pkg/kube/apisix/apis/config/v2/types.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/types" ) // +genclient diff --git a/pkg/kube/apisix/client/clientset/versioned/clientset.go b/pkg/kube/apisix/client/clientset/versioned/clientset.go index 0a732edf4..58b9fc95d 100644 --- a/pkg/kube/apisix/client/clientset/versioned/clientset.go +++ b/pkg/kube/apisix/client/clientset/versioned/clientset.go @@ -21,7 +21,7 @@ import ( "fmt" "net/http" - apisixv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v2" + apisixv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v2" 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 a1fb83f92..80fcf1770 100644 --- a/pkg/kube/apisix/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/kube/apisix/client/clientset/versioned/fake/clientset_generated.go @@ -18,9 +18,9 @@ package fake import ( - clientset "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" - apisixv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v2" - fakeapisixv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake" + clientset "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + apisixv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v2" + fakeapisixv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/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 77bb3b155..185d43516 100644 --- a/pkg/kube/apisix/client/clientset/versioned/fake/register.go +++ b/pkg/kube/apisix/client/clientset/versioned/fake/register.go @@ -18,7 +18,7 @@ package fake import ( - apisixv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + apisixv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" 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 277c3c871..b9714e413 100644 --- a/pkg/kube/apisix/client/clientset/versioned/scheme/register.go +++ b/pkg/kube/apisix/client/clientset/versioned/scheme/register.go @@ -18,7 +18,7 @@ package scheme import ( - apisixv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + apisixv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" 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/v2/apisixclusterconfig.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixclusterconfig.go index 6f0da579a..623ead2f0 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixclusterconfig.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixclusterconfig.go @@ -21,8 +21,8 @@ import ( "context" "time" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - scheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + scheme "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" v1 "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/v2/apisixconsumer.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixconsumer.go index 4ed2708af..dcf14b1c1 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixconsumer.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixconsumer.go @@ -21,8 +21,8 @@ import ( "context" "time" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - scheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + scheme "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" v1 "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/v2/apisixglobalrule.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixglobalrule.go index 30664e496..1c497efe5 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixglobalrule.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixglobalrule.go @@ -21,8 +21,8 @@ import ( "context" "time" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - scheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + scheme "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" v1 "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/v2/apisixpluginconfig.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixpluginconfig.go index dbb7a5148..e3eae77e7 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixpluginconfig.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixpluginconfig.go @@ -21,8 +21,8 @@ import ( "context" "time" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - scheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + scheme "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" v1 "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/v2/apisixroute.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixroute.go index 941c4cc04..dabe86916 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixroute.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixroute.go @@ -21,8 +21,8 @@ import ( "context" "time" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - scheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + scheme "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" v1 "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/v2/apisixtls.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixtls.go index 922918d9f..82e4036a1 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixtls.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixtls.go @@ -21,8 +21,8 @@ import ( "context" "time" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - scheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + scheme "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" v1 "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/v2/apisixupstream.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixupstream.go index b9963533f..b8df1b79c 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixupstream.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/apisixupstream.go @@ -21,8 +21,8 @@ import ( "context" "time" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - scheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + scheme "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" v1 "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/v2/config_client.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/config_client.go index e8eaaa536..70caaed0c 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/config_client.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/config_client.go @@ -20,8 +20,8 @@ package v2 import ( "net/http" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-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/v2/fake/fake_apisixclusterconfig.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixclusterconfig.go index 03cb7f123..67f4110f7 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixclusterconfig.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixclusterconfig.go @@ -20,7 +20,7 @@ package fake import ( "context" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixconsumer.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixconsumer.go index 07859d277..b2472f4e2 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixconsumer.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixconsumer.go @@ -20,7 +20,7 @@ package fake import ( "context" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixglobalrule.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixglobalrule.go index 4ddd3dbf4..91cdc381c 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixglobalrule.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixglobalrule.go @@ -20,7 +20,7 @@ package fake import ( "context" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixpluginconfig.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixpluginconfig.go index e73ccd16b..01b577243 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixpluginconfig.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixpluginconfig.go @@ -20,7 +20,7 @@ package fake import ( "context" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixroute.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixroute.go index 7e659cf62..6480050a1 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixroute.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixroute.go @@ -20,7 +20,7 @@ package fake import ( "context" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixtls.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixtls.go index 8553ab485..9714f94ef 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixtls.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixtls.go @@ -20,7 +20,7 @@ package fake import ( "context" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixupstream.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixupstream.go index 08b00bab4..d08bbbe8f 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixupstream.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_apisixupstream.go @@ -20,7 +20,7 @@ package fake import ( "context" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_config_client.go b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_config_client.go index b54d7605f..9360e3555 100644 --- a/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_config_client.go +++ b/pkg/kube/apisix/client/clientset/versioned/typed/config/v2/fake/fake_config_client.go @@ -18,7 +18,7 @@ package fake import ( - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/typed/config/v2" 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 dee618b94..aab7f8f75 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/interface.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/interface.go @@ -18,8 +18,8 @@ package config import ( - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v2" - internalinterfaces "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v2" + internalinterfaces "github.com/api7/api7-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/v2/apisixclusterconfig.go b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixclusterconfig.go index 2b7056d83..ae6276284 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixclusterconfig.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixclusterconfig.go @@ -21,10 +21,10 @@ import ( "context" time "time" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - 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" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + versioned "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + internalinterfaces "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" v1 "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/v2/apisixconsumer.go b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixconsumer.go index 4c5c969fc..886b51cff 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixconsumer.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixconsumer.go @@ -21,10 +21,10 @@ import ( "context" time "time" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - 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" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + versioned "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + internalinterfaces "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" v1 "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/v2/apisixglobalrule.go b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixglobalrule.go index 6d6847d17..21fbac073 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixglobalrule.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixglobalrule.go @@ -21,10 +21,10 @@ import ( "context" time "time" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - 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" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + versioned "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + internalinterfaces "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" v1 "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/v2/apisixpluginconfig.go b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixpluginconfig.go index 1bd1ce1df..64ffd849e 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixpluginconfig.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixpluginconfig.go @@ -21,10 +21,10 @@ import ( "context" time "time" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - 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" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + versioned "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + internalinterfaces "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" v1 "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/v2/apisixroute.go b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixroute.go index fedda8e7d..1ff2cd6f1 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixroute.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixroute.go @@ -21,10 +21,10 @@ import ( "context" time "time" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - 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" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + versioned "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + internalinterfaces "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" v1 "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/v2/apisixtls.go b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixtls.go index ac621adf9..9abc99d04 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixtls.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixtls.go @@ -21,10 +21,10 @@ import ( "context" time "time" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - 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" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + versioned "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + internalinterfaces "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" v1 "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/v2/apisixupstream.go b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixupstream.go index fd605b2b6..393c47114 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixupstream.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v2/apisixupstream.go @@ -21,10 +21,10 @@ import ( "context" time "time" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - 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" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + versioned "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + internalinterfaces "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" v1 "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/v2/interface.go b/pkg/kube/apisix/client/informers/externalversions/config/v2/interface.go index b40a12b85..3bdb6c7c3 100644 --- a/pkg/kube/apisix/client/informers/externalversions/config/v2/interface.go +++ b/pkg/kube/apisix/client/informers/externalversions/config/v2/interface.go @@ -18,7 +18,7 @@ package v2 import ( - internalinterfaces "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/api7/api7-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 38a6816d7..c1b021694 100644 --- a/pkg/kube/apisix/client/informers/externalversions/factory.go +++ b/pkg/kube/apisix/client/informers/externalversions/factory.go @@ -22,9 +22,9 @@ import ( sync "sync" time "time" - 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" + versioned "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + config "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions/config" + internalinterfaces "github.com/api7/api7-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 34f0e9f62..8087e6a8d 100644 --- a/pkg/kube/apisix/client/informers/externalversions/generic.go +++ b/pkg/kube/apisix/client/informers/externalversions/generic.go @@ -20,7 +20,7 @@ package externalversions import ( "fmt" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" 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 3a9a8a28a..0755e729f 100644 --- a/pkg/kube/apisix/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/kube/apisix/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -20,7 +20,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + versioned "github.com/api7/api7-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/v2/apisixclusterconfig.go b/pkg/kube/apisix/client/listers/config/v2/apisixclusterconfig.go index ef3720f50..a23204026 100644 --- a/pkg/kube/apisix/client/listers/config/v2/apisixclusterconfig.go +++ b/pkg/kube/apisix/client/listers/config/v2/apisixclusterconfig.go @@ -18,7 +18,7 @@ package v2 import ( - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" "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/v2/apisixconsumer.go b/pkg/kube/apisix/client/listers/config/v2/apisixconsumer.go index 264a737fd..fa8d19dec 100644 --- a/pkg/kube/apisix/client/listers/config/v2/apisixconsumer.go +++ b/pkg/kube/apisix/client/listers/config/v2/apisixconsumer.go @@ -18,7 +18,7 @@ package v2 import ( - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" "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/v2/apisixglobalrule.go b/pkg/kube/apisix/client/listers/config/v2/apisixglobalrule.go index c37e6b072..dd9ba862e 100644 --- a/pkg/kube/apisix/client/listers/config/v2/apisixglobalrule.go +++ b/pkg/kube/apisix/client/listers/config/v2/apisixglobalrule.go @@ -18,7 +18,7 @@ package v2 import ( - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" "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/v2/apisixpluginconfig.go b/pkg/kube/apisix/client/listers/config/v2/apisixpluginconfig.go index 1d5115186..fd37f9f27 100644 --- a/pkg/kube/apisix/client/listers/config/v2/apisixpluginconfig.go +++ b/pkg/kube/apisix/client/listers/config/v2/apisixpluginconfig.go @@ -18,7 +18,7 @@ package v2 import ( - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" "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/v2/apisixroute.go b/pkg/kube/apisix/client/listers/config/v2/apisixroute.go index 744310271..e50adbb32 100644 --- a/pkg/kube/apisix/client/listers/config/v2/apisixroute.go +++ b/pkg/kube/apisix/client/listers/config/v2/apisixroute.go @@ -18,7 +18,7 @@ package v2 import ( - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" "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/v2/apisixtls.go b/pkg/kube/apisix/client/listers/config/v2/apisixtls.go index ad4f4a5fc..bf91c9ac6 100644 --- a/pkg/kube/apisix/client/listers/config/v2/apisixtls.go +++ b/pkg/kube/apisix/client/listers/config/v2/apisixtls.go @@ -18,7 +18,7 @@ package v2 import ( - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" "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/v2/apisixupstream.go b/pkg/kube/apisix/client/listers/config/v2/apisixupstream.go index 63faa5a7a..970065758 100644 --- a/pkg/kube/apisix/client/listers/config/v2/apisixupstream.go +++ b/pkg/kube/apisix/client/listers/config/v2/apisixupstream.go @@ -18,7 +18,7 @@ package v2 import ( - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/kube/apisix_cluster_config.go b/pkg/kube/apisix_cluster_config.go index 6ce6c717b..1ff8cd5f8 100644 --- a/pkg/kube/apisix_cluster_config.go +++ b/pkg/kube/apisix_cluster_config.go @@ -17,9 +17,9 @@ package kube import ( "fmt" - "github.com/apache/apisix-ingress-controller/pkg/config" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - listersv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + "github.com/api7/api7-ingress-controller/pkg/config" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + listersv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" ) // ApisixClusterConfigLister is an encapsulation for the lister of ApisixClusterConfig, diff --git a/pkg/kube/apisix_consumer.go b/pkg/kube/apisix_consumer.go index dc6e4d3c2..498dd1f1c 100644 --- a/pkg/kube/apisix_consumer.go +++ b/pkg/kube/apisix_consumer.go @@ -19,9 +19,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/apache/apisix-ingress-controller/pkg/config" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - listersv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + "github.com/api7/api7-ingress-controller/pkg/config" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + listersv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" ) // ApisixConsumerLister is an encapsulation for the lister of ApisixConsumer, diff --git a/pkg/kube/apisix_global_rule.go b/pkg/kube/apisix_global_rule.go index e25670efe..c0d513de1 100644 --- a/pkg/kube/apisix_global_rule.go +++ b/pkg/kube/apisix_global_rule.go @@ -19,9 +19,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/apache/apisix-ingress-controller/pkg/config" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - listersv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + "github.com/api7/api7-ingress-controller/pkg/config" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + listersv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" ) // ApisixGlobalRuleLister is an encapsulation for the lister of ApisixGlobalRule, diff --git a/pkg/kube/apisix_plugin_config.go b/pkg/kube/apisix_plugin_config.go index dd21e8366..1283c1f10 100644 --- a/pkg/kube/apisix_plugin_config.go +++ b/pkg/kube/apisix_plugin_config.go @@ -19,9 +19,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/apache/apisix-ingress-controller/pkg/config" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - listersv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + "github.com/api7/api7-ingress-controller/pkg/config" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + listersv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" ) // ApisixPluginConfigLister is an encapsulation for the lister of ApisixPluginConfig, diff --git a/pkg/kube/apisix_route.go b/pkg/kube/apisix_route.go index 4daeda2a2..a4e2da749 100644 --- a/pkg/kube/apisix_route.go +++ b/pkg/kube/apisix_route.go @@ -19,9 +19,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/apache/apisix-ingress-controller/pkg/config" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - listersv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + "github.com/api7/api7-ingress-controller/pkg/config" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + listersv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" ) // ApisixRouteLister is an encapsulation for the lister of ApisixRoute, diff --git a/pkg/kube/apisix_tls.go b/pkg/kube/apisix_tls.go index cc845c2a2..24b8fc492 100644 --- a/pkg/kube/apisix_tls.go +++ b/pkg/kube/apisix_tls.go @@ -19,9 +19,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/apache/apisix-ingress-controller/pkg/config" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - listersv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + "github.com/api7/api7-ingress-controller/pkg/config" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + listersv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" ) // ApisixTlsLister is an encapsulation for the lister of ApisixTls, diff --git a/pkg/kube/apisix_upstream.go b/pkg/kube/apisix_upstream.go index bb2af4ef2..c936e7768 100644 --- a/pkg/kube/apisix_upstream.go +++ b/pkg/kube/apisix_upstream.go @@ -20,9 +20,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "github.com/apache/apisix-ingress-controller/pkg/config" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - listersv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + "github.com/api7/api7-ingress-controller/pkg/config" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + listersv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" ) // ApisixUpstreamLister is an encapsulation for the lister of ApisixUpstream, diff --git a/pkg/kube/endpoint.go b/pkg/kube/endpoint.go index 5a49c304c..e53c8680d 100644 --- a/pkg/kube/endpoint.go +++ b/pkg/kube/endpoint.go @@ -26,7 +26,7 @@ import ( listersdiscoveryv1 "k8s.io/client-go/listers/discovery/v1" "k8s.io/client-go/tools/cache" - "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/log" ) type HostPort struct { diff --git a/pkg/kube/init.go b/pkg/kube/init.go index be6349c8c..198ea1817 100644 --- a/pkg/kube/init.go +++ b/pkg/kube/init.go @@ -20,9 +20,9 @@ import ( gatewayclientset "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" gatewayexternalversions "sigs.k8s.io/gateway-api/pkg/client/informers/externalversions" - "github.com/apache/apisix-ingress-controller/pkg/config" - clientset "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/api7/api7-ingress-controller/pkg/config" + clientset "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned" + "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions" ) // KubeClient contains some objects used to communicate with Kubernetes API Server. diff --git a/pkg/providers/apisix/apisix_cluster_config.go b/pkg/providers/apisix/apisix_cluster_config.go index 8b0da5e2d..a2dc1221a 100644 --- a/pkg/providers/apisix/apisix_cluster_config.go +++ b/pkg/providers/apisix/apisix_cluster_config.go @@ -29,13 +29,13 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/apache/apisix-ingress-controller/pkg/apisix" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) type apisixClusterConfigController struct { diff --git a/pkg/providers/apisix/apisix_consumer.go b/pkg/providers/apisix/apisix_consumer.go index 6c358df27..561cedc44 100644 --- a/pkg/providers/apisix/apisix_consumer.go +++ b/pkg/providers/apisix/apisix_consumer.go @@ -31,12 +31,12 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) type apisixConsumerController struct { diff --git a/pkg/providers/apisix/apisix_global_rule.go b/pkg/providers/apisix/apisix_global_rule.go index 69b3d11fd..70c24ce43 100644 --- a/pkg/providers/apisix/apisix_global_rule.go +++ b/pkg/providers/apisix/apisix_global_rule.go @@ -29,12 +29,12 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) type apisixGlobalRuleController struct { diff --git a/pkg/providers/apisix/apisix_plugin_config.go b/pkg/providers/apisix/apisix_plugin_config.go index c806c49e9..9827f40b3 100644 --- a/pkg/providers/apisix/apisix_plugin_config.go +++ b/pkg/providers/apisix/apisix_plugin_config.go @@ -31,13 +31,13 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) type apisixPluginConfigController struct { diff --git a/pkg/providers/apisix/apisix_route.go b/pkg/providers/apisix/apisix_route.go index c06a8a0f5..77154c562 100644 --- a/pkg/providers/apisix/apisix_route.go +++ b/pkg/providers/apisix/apisix_route.go @@ -32,15 +32,15 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - apisixcache "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + apisixcache "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type apisixRouteController struct { diff --git a/pkg/providers/apisix/apisix_tls.go b/pkg/providers/apisix/apisix_tls.go index c4281e369..73677aa1d 100644 --- a/pkg/providers/apisix/apisix_tls.go +++ b/pkg/providers/apisix/apisix_tls.go @@ -32,12 +32,12 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) type apisixTlsController struct { diff --git a/pkg/providers/apisix/apisix_upstream.go b/pkg/providers/apisix/apisix_upstream.go index 72ee53697..ff863d64a 100644 --- a/pkg/providers/apisix/apisix_upstream.go +++ b/pkg/providers/apisix/apisix_upstream.go @@ -32,14 +32,14 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/apache/apisix-ingress-controller/pkg/apisix" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type apisixUpstreamController struct { diff --git a/pkg/providers/apisix/provider.go b/pkg/providers/apisix/provider.go index a1ee2a301..be90cc2d1 100644 --- a/pkg/providers/apisix/provider.go +++ b/pkg/providers/apisix/provider.go @@ -22,13 +22,13 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/apache/apisix-ingress-controller/pkg/config" - apisixtranslation "github.com/apache/apisix-ingress-controller/pkg/providers/apisix/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/namespace" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/config" + apisixtranslation "github.com/api7/api7-ingress-controller/pkg/providers/apisix/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/namespace" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) const ( diff --git a/pkg/providers/apisix/provider_init.go b/pkg/providers/apisix/provider_init.go index ccec7a811..d24456bef 100644 --- a/pkg/providers/apisix/provider_init.go +++ b/pkg/providers/apisix/provider_init.go @@ -21,8 +21,8 @@ import ( "go.uber.org/zap" "k8s.io/apimachinery/pkg/labels" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/log" ) // Init used to compare the object IDs in resources and APISIX diff --git a/pkg/providers/apisix/translation/apisix_cluster_config.go b/pkg/providers/apisix/translation/apisix_cluster_config.go index 350322110..f18a2f903 100644 --- a/pkg/providers/apisix/translation/apisix_cluster_config.go +++ b/pkg/providers/apisix/translation/apisix_cluster_config.go @@ -15,9 +15,9 @@ package translation import ( - "github.com/apache/apisix-ingress-controller/pkg/id" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/id" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type prometheusPluginConfig struct { diff --git a/pkg/providers/apisix/translation/apisix_cluster_config_test.go b/pkg/providers/apisix/translation/apisix_cluster_config_test.go index 95371506f..97d285639 100644 --- a/pkg/providers/apisix/translation/apisix_cluster_config_test.go +++ b/pkg/providers/apisix/translation/apisix_cluster_config_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/apache/apisix-ingress-controller/pkg/id" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/id" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" ) func TestTranslateClusterConfigV2(t *testing.T) { diff --git a/pkg/providers/apisix/translation/apisix_consumer.go b/pkg/providers/apisix/translation/apisix_consumer.go index 6559c2166..ef6915807 100644 --- a/pkg/providers/apisix/translation/apisix_consumer.go +++ b/pkg/providers/apisix/translation/apisix_consumer.go @@ -17,8 +17,8 @@ package translation import ( "fmt" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func (t *translator) TranslateApisixConsumerV2(ac *configv2.ApisixConsumer) (*apisixv1.Consumer, error) { diff --git a/pkg/providers/apisix/translation/apisix_consumer_test.go b/pkg/providers/apisix/translation/apisix_consumer_test.go index c78c1a883..9e509e87f 100644 --- a/pkg/providers/apisix/translation/apisix_consumer_test.go +++ b/pkg/providers/apisix/translation/apisix_consumer_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestTranslateApisixConsumerV2(t *testing.T) { diff --git a/pkg/providers/apisix/translation/apisix_global_rule.go b/pkg/providers/apisix/translation/apisix_global_rule.go index 3afa76dae..9f6dc0c46 100644 --- a/pkg/providers/apisix/translation/apisix_global_rule.go +++ b/pkg/providers/apisix/translation/apisix_global_rule.go @@ -19,13 +19,13 @@ import ( "go.uber.org/zap" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/id" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func (t *translator) TranslateGlobalRule(agr kube.ApisixGlobalRule) (*translation.TranslateContext, error) { diff --git a/pkg/providers/apisix/translation/apisix_plugin.go b/pkg/providers/apisix/translation/apisix_plugin.go index 9cb004c8e..a1d996485 100644 --- a/pkg/providers/apisix/translation/apisix_plugin.go +++ b/pkg/providers/apisix/translation/apisix_plugin.go @@ -18,9 +18,9 @@ import ( "errors" "strconv" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) var ( diff --git a/pkg/providers/apisix/translation/apisix_plugin_test.go b/pkg/providers/apisix/translation/apisix_plugin_test.go index 268cc90aa..13ad0315e 100644 --- a/pkg/providers/apisix/translation/apisix_plugin_test.go +++ b/pkg/providers/apisix/translation/apisix_plugin_test.go @@ -26,13 +26,13 @@ import ( "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/cache" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/id" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - apisixfake "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/fake" - apisixinformers "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + apisixfake "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/fake" + apisixinformers "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" ) func TestTranslateTrafficSplitPlugin(t *testing.T) { diff --git a/pkg/providers/apisix/translation/apisix_pluginconfig.go b/pkg/providers/apisix/translation/apisix_pluginconfig.go index 5ee0e2a4c..870f63bc3 100644 --- a/pkg/providers/apisix/translation/apisix_pluginconfig.go +++ b/pkg/providers/apisix/translation/apisix_pluginconfig.go @@ -17,12 +17,12 @@ package translation import ( "go.uber.org/zap" - "github.com/apache/apisix-ingress-controller/pkg/id" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/id" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func (t *translator) TranslatePluginConfigV2(config *configv2.ApisixPluginConfig) (*translation.TranslateContext, error) { diff --git a/pkg/providers/apisix/translation/apisix_pluginconfig_test.go b/pkg/providers/apisix/translation/apisix_pluginconfig_test.go index dbc9f9499..944e65222 100644 --- a/pkg/providers/apisix/translation/apisix_pluginconfig_test.go +++ b/pkg/providers/apisix/translation/apisix_pluginconfig_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" ) func TestTranslatePluginConfigV2(t *testing.T) { diff --git a/pkg/providers/apisix/translation/apisix_route.go b/pkg/providers/apisix/translation/apisix_route.go index 9fa8b2b21..fd701d72a 100644 --- a/pkg/providers/apisix/translation/apisix_route.go +++ b/pkg/providers/apisix/translation/apisix_route.go @@ -24,15 +24,15 @@ import ( "go.uber.org/zap" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/id" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - _const "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/const" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + _const "github.com/api7/api7-ingress-controller/pkg/kube/apisix/const" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func (t *translator) TranslateRouteV2(ar *configv2.ApisixRoute) (*translation.TranslateContext, error) { diff --git a/pkg/providers/apisix/translation/apisix_route_test.go b/pkg/providers/apisix/translation/apisix_route_test.go index 64fa166fd..c2041336b 100644 --- a/pkg/providers/apisix/translation/apisix_route_test.go +++ b/pkg/providers/apisix/translation/apisix_route_test.go @@ -27,15 +27,15 @@ import ( "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/cache" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/id" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - fakeapisix "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/fake" - apisixinformers "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions" - _const "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/const" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + fakeapisix "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/fake" + apisixinformers "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions" + _const "github.com/api7/api7-ingress-controller/pkg/kube/apisix/const" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestRouteMatchExpr(t *testing.T) { diff --git a/pkg/providers/apisix/translation/apisix_ssl.go b/pkg/providers/apisix/translation/apisix_ssl.go index 1a958a158..288be1eb9 100644 --- a/pkg/providers/apisix/translation/apisix_ssl.go +++ b/pkg/providers/apisix/translation/apisix_ssl.go @@ -15,10 +15,10 @@ package translation import ( - "github.com/apache/apisix-ingress-controller/pkg/id" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/id" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func (t *translator) TranslateSSLV2(tls *configv2.ApisixTls) (*apisixv1.Ssl, error) { diff --git a/pkg/providers/apisix/translation/apisix_upstream.go b/pkg/providers/apisix/translation/apisix_upstream.go index 9578694b1..bac72e5d4 100644 --- a/pkg/providers/apisix/translation/apisix_upstream.go +++ b/pkg/providers/apisix/translation/apisix_upstream.go @@ -21,12 +21,12 @@ import ( corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" - "github.com/apache/apisix-ingress-controller/pkg/id" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/id" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) // generateUpstreamDeleteMark translates Upstream nodes with a loose way, only generate ID and Name for delete Event. diff --git a/pkg/providers/apisix/translation/apisix_upstream_test.go b/pkg/providers/apisix/translation/apisix_upstream_test.go index 183df5f10..c4505bd35 100644 --- a/pkg/providers/apisix/translation/apisix_upstream_test.go +++ b/pkg/providers/apisix/translation/apisix_upstream_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestTranslateApisixUpstreamExternalNodesDomainType(t *testing.T) { diff --git a/pkg/providers/apisix/translation/translator.go b/pkg/providers/apisix/translation/translator.go index 544bc5acc..a611c66c7 100644 --- a/pkg/providers/apisix/translation/translator.go +++ b/pkg/providers/apisix/translation/translator.go @@ -19,11 +19,11 @@ package translation import ( listerscorev1 "k8s.io/client-go/listers/core/v1" - "github.com/apache/apisix-ingress-controller/pkg/apisix" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type TranslatorOptions struct { diff --git a/pkg/providers/controller.go b/pkg/providers/controller.go index d8693221b..9059cd008 100644 --- a/pkg/providers/controller.go +++ b/pkg/providers/controller.go @@ -36,24 +36,24 @@ import ( "k8s.io/client-go/tools/leaderelection/resourcelock" "k8s.io/client-go/tools/record" - "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" - apisixscheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - apisixprovider "github.com/apache/apisix-ingress-controller/pkg/providers/apisix" - apisixtranslation "github.com/apache/apisix-ingress-controller/pkg/providers/apisix/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/gateway" - ingressprovider "github.com/apache/apisix-ingress-controller/pkg/providers/ingress" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/namespace" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/pod" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/api" + "github.com/api7/api7-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + apisixscheme "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/listers/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/metrics" + apisixprovider "github.com/api7/api7-ingress-controller/pkg/providers/apisix" + apisixtranslation "github.com/api7/api7-ingress-controller/pkg/providers/apisix/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/gateway" + ingressprovider "github.com/api7/api7-ingress-controller/pkg/providers/ingress" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/namespace" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/pod" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" ) const ( diff --git a/pkg/providers/gateway/gateway.go b/pkg/providers/gateway/gateway.go index 02ce968a6..415286c38 100644 --- a/pkg/providers/gateway/gateway.go +++ b/pkg/providers/gateway/gateway.go @@ -27,9 +27,9 @@ import ( "k8s.io/client-go/util/workqueue" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) type gatewayController struct { diff --git a/pkg/providers/gateway/gateway_class.go b/pkg/providers/gateway/gateway_class.go index d2cbe3d50..b1136f8e4 100644 --- a/pkg/providers/gateway/gateway_class.go +++ b/pkg/providers/gateway/gateway_class.go @@ -27,8 +27,8 @@ import ( "k8s.io/client-go/util/workqueue" "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/types" ) const ( diff --git a/pkg/providers/gateway/gateway_httproute.go b/pkg/providers/gateway/gateway_httproute.go index 22fd40cb9..efe8a75b4 100644 --- a/pkg/providers/gateway/gateway_httproute.go +++ b/pkg/providers/gateway/gateway_httproute.go @@ -24,10 +24,10 @@ import ( "k8s.io/client-go/util/workqueue" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) type gatewayHTTPRouteController struct { diff --git a/pkg/providers/gateway/gateway_tcproute.go b/pkg/providers/gateway/gateway_tcproute.go index 028b3f5b9..250d0d953 100644 --- a/pkg/providers/gateway/gateway_tcproute.go +++ b/pkg/providers/gateway/gateway_tcproute.go @@ -26,10 +26,10 @@ import ( "k8s.io/client-go/util/workqueue" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) type gatewayTCPRouteController struct { diff --git a/pkg/providers/gateway/gateway_tlsroute.go b/pkg/providers/gateway/gateway_tlsroute.go index 23d4c11b0..39a83adf9 100644 --- a/pkg/providers/gateway/gateway_tlsroute.go +++ b/pkg/providers/gateway/gateway_tlsroute.go @@ -41,10 +41,10 @@ import ( "k8s.io/client-go/util/workqueue" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) type gatewayTLSRouteController struct { diff --git a/pkg/providers/gateway/gateway_udproute.go b/pkg/providers/gateway/gateway_udproute.go index 14a91e096..61770aac4 100644 --- a/pkg/providers/gateway/gateway_udproute.go +++ b/pkg/providers/gateway/gateway_udproute.go @@ -24,10 +24,10 @@ import ( "k8s.io/client-go/util/workqueue" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) type gatewayUDPRouteController struct { diff --git a/pkg/providers/gateway/provider.go b/pkg/providers/gateway/provider.go index 084d89609..ec8a2dda2 100644 --- a/pkg/providers/gateway/provider.go +++ b/pkg/providers/gateway/provider.go @@ -32,16 +32,16 @@ import ( gatewaylistersv1alpha2 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha2" gatewaylistersv1beta1 "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1beta1" - "github.com/apache/apisix-ingress-controller/pkg/apisix" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - gatewaytranslation "github.com/apache/apisix-ingress-controller/pkg/providers/gateway/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/gateway/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/namespace" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + "github.com/api7/api7-ingress-controller/pkg/metrics" + gatewaytranslation "github.com/api7/api7-ingress-controller/pkg/providers/gateway/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/gateway/types" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/namespace" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" ) const ( diff --git a/pkg/providers/gateway/translation/gateway.go b/pkg/providers/gateway/translation/gateway.go index bcacad8af..7bc3f8483 100644 --- a/pkg/providers/gateway/translation/gateway.go +++ b/pkg/providers/gateway/translation/gateway.go @@ -22,8 +22,8 @@ import ( "go.uber.org/zap" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/gateway/types" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/gateway/types" ) func (t *translator) TranslateGatewayV1beta1(gateway *gatewayv1beta1.Gateway) (map[string]*types.ListenerConf, error) { diff --git a/pkg/providers/gateway/translation/gateway_httproute.go b/pkg/providers/gateway/translation/gateway_httproute.go index f697c55c6..c5c99e687 100644 --- a/pkg/providers/gateway/translation/gateway_httproute.go +++ b/pkg/providers/gateway/translation/gateway_httproute.go @@ -24,12 +24,12 @@ import ( "go.uber.org/zap" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/apache/apisix-ingress-controller/pkg/id" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func (t *translator) generatePluginsFromHTTPRouteFilter(namespace string, filters []gatewayv1beta1.HTTPRouteFilter) apisixv1.Plugins { diff --git a/pkg/providers/gateway/translation/gateway_httproute_test.go b/pkg/providers/gateway/translation/gateway_httproute_test.go index 62a88793c..fb0c43842 100644 --- a/pkg/providers/gateway/translation/gateway_httproute_test.go +++ b/pkg/providers/gateway/translation/gateway_httproute_test.go @@ -29,13 +29,13 @@ import ( "k8s.io/client-go/tools/cache" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - fakeapisix "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/fake" - apisixinformers "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + fakeapisix "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/fake" + apisixinformers "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func refKind(str gatewayv1beta1.Kind) *gatewayv1beta1.Kind { diff --git a/pkg/providers/gateway/translation/gateway_tcproute.go b/pkg/providers/gateway/translation/gateway_tcproute.go index 59d53aeb0..99b1d6561 100644 --- a/pkg/providers/gateway/translation/gateway_tcproute.go +++ b/pkg/providers/gateway/translation/gateway_tcproute.go @@ -21,9 +21,9 @@ import ( gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/apache/apisix-ingress-controller/pkg/id" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func (t *translator) TranslateGatewayTCPRouteV1Alpha2(tcpRoute *gatewayv1alpha2.TCPRoute) (*translation.TranslateContext, error) { diff --git a/pkg/providers/gateway/translation/gateway_tcproute_test.go b/pkg/providers/gateway/translation/gateway_tcproute_test.go index cee4f1b91..feada2cec 100644 --- a/pkg/providers/gateway/translation/gateway_tcproute_test.go +++ b/pkg/providers/gateway/translation/gateway_tcproute_test.go @@ -29,12 +29,12 @@ import ( "k8s.io/client-go/tools/cache" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - fakeapisix "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/fake" - apisixinformers "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + fakeapisix "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/clientset/versioned/fake" + apisixinformers "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" ) func mockTCPRouteTranslator(t *testing.T) (*translator, <-chan struct{}) { diff --git a/pkg/providers/gateway/translation/gateway_tlsroute.go b/pkg/providers/gateway/translation/gateway_tlsroute.go index 9ed706a18..76519c678 100644 --- a/pkg/providers/gateway/translation/gateway_tlsroute.go +++ b/pkg/providers/gateway/translation/gateway_tlsroute.go @@ -24,12 +24,12 @@ import ( "go.uber.org/zap" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/apache/apisix-ingress-controller/pkg/id" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func (t *translator) TranslateGatewayTLSRouteV1Alpha2(tlsRoute *gatewayv1alpha2.TLSRoute) (*translation.TranslateContext, error) { diff --git a/pkg/providers/gateway/translation/gateway_udproute.go b/pkg/providers/gateway/translation/gateway_udproute.go index d8b235d39..c1c3f4348 100644 --- a/pkg/providers/gateway/translation/gateway_udproute.go +++ b/pkg/providers/gateway/translation/gateway_udproute.go @@ -24,11 +24,11 @@ import ( "go.uber.org/zap" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/apache/apisix-ingress-controller/pkg/id" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/types" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/types" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func (t *translator) TranslateGatewayUDPRouteV1Alpha2(udpRoute *gatewayv1alpha2.UDPRoute) (*translation.TranslateContext, error) { diff --git a/pkg/providers/gateway/translation/translator.go b/pkg/providers/gateway/translation/translator.go index 3bc804b30..1d142ec4a 100644 --- a/pkg/providers/gateway/translation/translator.go +++ b/pkg/providers/gateway/translation/translator.go @@ -20,8 +20,8 @@ import ( gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/apache/apisix-ingress-controller/pkg/providers/gateway/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/gateway/types" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" ) type TranslatorOptions struct { diff --git a/pkg/providers/gateway/types/types.go b/pkg/providers/gateway/types/types.go index 5d0c139a9..f88c7bba7 100644 --- a/pkg/providers/gateway/types/types.go +++ b/pkg/providers/gateway/types/types.go @@ -19,7 +19,7 @@ package types import ( gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" ) const ( diff --git a/pkg/providers/gateway/validator.go b/pkg/providers/gateway/validator.go index de56d4b22..a8e2d5304 100644 --- a/pkg/providers/gateway/validator.go +++ b/pkg/providers/gateway/validator.go @@ -27,8 +27,8 @@ import ( gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/gateway/types" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/gateway/types" ) type Validator struct { diff --git a/pkg/providers/ingress/ingress.go b/pkg/providers/ingress/ingress.go index 9cb9f75af..7327a289d 100644 --- a/pkg/providers/ingress/ingress.go +++ b/pkg/providers/ingress/ingress.go @@ -34,12 +34,12 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) const ( diff --git a/pkg/providers/ingress/ingress_test.go b/pkg/providers/ingress/ingress_test.go index 06be9bda4..f8ca972b0 100644 --- a/pkg/providers/ingress/ingress_test.go +++ b/pkg/providers/ingress/ingress_test.go @@ -22,9 +22,9 @@ import ( networkingv1beta1 "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" ) func TestIsIngressEffective(t *testing.T) { diff --git a/pkg/providers/ingress/provider.go b/pkg/providers/ingress/provider.go index 4b8418e2f..0ead1e156 100644 --- a/pkg/providers/ingress/provider.go +++ b/pkg/providers/ingress/provider.go @@ -21,13 +21,13 @@ import ( corev1 "k8s.io/api/core/v1" - apisixtranslation "github.com/apache/apisix-ingress-controller/pkg/providers/apisix/translation" - ingresstranslation "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/namespace" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + apisixtranslation "github.com/api7/api7-ingress-controller/pkg/providers/apisix/translation" + ingresstranslation "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/namespace" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) const ( diff --git a/pkg/providers/ingress/translation/annotations.go b/pkg/providers/ingress/translation/annotations.go index 76a433343..8adee8735 100644 --- a/pkg/providers/ingress/translation/annotations.go +++ b/pkg/providers/ingress/translation/annotations.go @@ -18,15 +18,15 @@ import ( "github.com/imdario/mergo" "go.uber.org/zap" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations/pluginconfig" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations/plugins" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations/regex" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations/servicenamespace" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations/upstream" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations/websocket" - apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations/pluginconfig" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations/plugins" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations/regex" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations/servicenamespace" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations/upstream" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations/websocket" + apisix "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) // Structure extracted by Ingress Resource diff --git a/pkg/providers/ingress/translation/annotations/pluginconfig/pluginconfig.go b/pkg/providers/ingress/translation/annotations/pluginconfig/pluginconfig.go index a6fa02cff..6a6f71854 100644 --- a/pkg/providers/ingress/translation/annotations/pluginconfig/pluginconfig.go +++ b/pkg/providers/ingress/translation/annotations/pluginconfig/pluginconfig.go @@ -15,7 +15,7 @@ package pluginconfig import ( - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" ) type pluginconfig struct{} diff --git a/pkg/providers/ingress/translation/annotations/plugins/authorization.go b/pkg/providers/ingress/translation/annotations/plugins/authorization.go index 2d2d3a21d..82d22dab3 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/authorization.go +++ b/pkg/providers/ingress/translation/annotations/plugins/authorization.go @@ -15,8 +15,8 @@ package plugins import ( - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type basicAuth struct{} diff --git a/pkg/providers/ingress/translation/annotations/plugins/cors.go b/pkg/providers/ingress/translation/annotations/plugins/cors.go index 51ce1c2e4..0115fbba8 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/cors.go +++ b/pkg/providers/ingress/translation/annotations/plugins/cors.go @@ -15,8 +15,8 @@ package plugins import ( - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type cors struct{} diff --git a/pkg/providers/ingress/translation/annotations/plugins/cors_test.go b/pkg/providers/ingress/translation/annotations/plugins/cors_test.go index 9dc79bb85..5c3dd70e8 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/cors_test.go +++ b/pkg/providers/ingress/translation/annotations/plugins/cors_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestCorsHandler(t *testing.T) { diff --git a/pkg/providers/ingress/translation/annotations/plugins/csrf.go b/pkg/providers/ingress/translation/annotations/plugins/csrf.go index 717f9865e..e848f686d 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/csrf.go +++ b/pkg/providers/ingress/translation/annotations/plugins/csrf.go @@ -15,8 +15,8 @@ package plugins import ( - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type csrf struct{} diff --git a/pkg/providers/ingress/translation/annotations/plugins/forward_auth.go b/pkg/providers/ingress/translation/annotations/plugins/forward_auth.go index 295320523..ea1b3dd9b 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/forward_auth.go +++ b/pkg/providers/ingress/translation/annotations/plugins/forward_auth.go @@ -15,8 +15,8 @@ package plugins import ( - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type forwardAuth struct{} diff --git a/pkg/providers/ingress/translation/annotations/plugins/forward_auth_test.go b/pkg/providers/ingress/translation/annotations/plugins/forward_auth_test.go index 92dc83143..c8b833e5c 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/forward_auth_test.go +++ b/pkg/providers/ingress/translation/annotations/plugins/forward_auth_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestForwardAuthHandler(t *testing.T) { diff --git a/pkg/providers/ingress/translation/annotations/plugins/http_method.go b/pkg/providers/ingress/translation/annotations/plugins/http_method.go index 77aa0a43a..ad6a6d78b 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/http_method.go +++ b/pkg/providers/ingress/translation/annotations/plugins/http_method.go @@ -19,8 +19,8 @@ import ( "github.com/incubator4/go-resty-expr/expr" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type HttpMethod struct{} diff --git a/pkg/providers/ingress/translation/annotations/plugins/http_method_test.go b/pkg/providers/ingress/translation/annotations/plugins/http_method_test.go index 21adcdee3..53f3c99d9 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/http_method_test.go +++ b/pkg/providers/ingress/translation/annotations/plugins/http_method_test.go @@ -21,8 +21,8 @@ import ( "github.com/incubator4/go-resty-expr/expr" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) // annotations: diff --git a/pkg/providers/ingress/translation/annotations/plugins/iprestriction.go b/pkg/providers/ingress/translation/annotations/plugins/iprestriction.go index 3cfd6c4c7..5e209f1b4 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/iprestriction.go +++ b/pkg/providers/ingress/translation/annotations/plugins/iprestriction.go @@ -15,8 +15,8 @@ package plugins import ( - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type ipRestriction struct{} diff --git a/pkg/providers/ingress/translation/annotations/plugins/iprestriction_test.go b/pkg/providers/ingress/translation/annotations/plugins/iprestriction_test.go index 0b9d12587..3df848f3a 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/iprestriction_test.go +++ b/pkg/providers/ingress/translation/annotations/plugins/iprestriction_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestIPRestrictionHandler(t *testing.T) { diff --git a/pkg/providers/ingress/translation/annotations/plugins/plugins.go b/pkg/providers/ingress/translation/annotations/plugins/plugins.go index 0ba1639a1..1de63a8d4 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/plugins.go +++ b/pkg/providers/ingress/translation/annotations/plugins/plugins.go @@ -17,9 +17,9 @@ package plugins import ( "go.uber.org/zap" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisix "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) // Handler abstracts the behavior so that the apisix-ingress-controller knows diff --git a/pkg/providers/ingress/translation/annotations/plugins/redirect.go b/pkg/providers/ingress/translation/annotations/plugins/redirect.go index 9a81a0076..bfffb58bf 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/redirect.go +++ b/pkg/providers/ingress/translation/annotations/plugins/redirect.go @@ -18,8 +18,8 @@ import ( "net/http" "strconv" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type redirect struct{} diff --git a/pkg/providers/ingress/translation/annotations/plugins/response_rewrite.go b/pkg/providers/ingress/translation/annotations/plugins/response_rewrite.go index f03a1d949..6a99cd258 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/response_rewrite.go +++ b/pkg/providers/ingress/translation/annotations/plugins/response_rewrite.go @@ -17,8 +17,8 @@ package plugins import ( "strconv" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type responseRewrite struct{} diff --git a/pkg/providers/ingress/translation/annotations/plugins/response_rewrite_test.go b/pkg/providers/ingress/translation/annotations/plugins/response_rewrite_test.go index 302f7a21d..eed0c47a9 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/response_rewrite_test.go +++ b/pkg/providers/ingress/translation/annotations/plugins/response_rewrite_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestResponseRewriteHandler(t *testing.T) { diff --git a/pkg/providers/ingress/translation/annotations/plugins/rewrite.go b/pkg/providers/ingress/translation/annotations/plugins/rewrite.go index 406f87f05..f28cd7d79 100644 --- a/pkg/providers/ingress/translation/annotations/plugins/rewrite.go +++ b/pkg/providers/ingress/translation/annotations/plugins/rewrite.go @@ -17,8 +17,8 @@ package plugins import ( "regexp" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type rewrite struct{} diff --git a/pkg/providers/ingress/translation/annotations/regex/regex.go b/pkg/providers/ingress/translation/annotations/regex/regex.go index 2f696c421..1bd0327f9 100644 --- a/pkg/providers/ingress/translation/annotations/regex/regex.go +++ b/pkg/providers/ingress/translation/annotations/regex/regex.go @@ -15,7 +15,7 @@ package regex import ( - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" ) type regex struct{} diff --git a/pkg/providers/ingress/translation/annotations/servicenamespace/servicenamespace.go b/pkg/providers/ingress/translation/annotations/servicenamespace/servicenamespace.go index e77907052..5e10fff81 100644 --- a/pkg/providers/ingress/translation/annotations/servicenamespace/servicenamespace.go +++ b/pkg/providers/ingress/translation/annotations/servicenamespace/servicenamespace.go @@ -15,7 +15,7 @@ package servicenamespace import ( - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" ) type servicenamespace struct{} diff --git a/pkg/providers/ingress/translation/annotations/upstream/upstream.go b/pkg/providers/ingress/translation/annotations/upstream/upstream.go index 02692d9fc..80cfc96b2 100644 --- a/pkg/providers/ingress/translation/annotations/upstream/upstream.go +++ b/pkg/providers/ingress/translation/annotations/upstream/upstream.go @@ -19,8 +19,8 @@ import ( "strconv" "strings" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func NewParser() annotations.IngressAnnotationsParser { diff --git a/pkg/providers/ingress/translation/annotations/upstream/upstream_test.go b/pkg/providers/ingress/translation/annotations/upstream/upstream_test.go index 4c998762a..ec622394e 100644 --- a/pkg/providers/ingress/translation/annotations/upstream/upstream_test.go +++ b/pkg/providers/ingress/translation/annotations/upstream/upstream_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations/upstream" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations/upstream" ) func TestIPRestrictionHandler(t *testing.T) { diff --git a/pkg/providers/ingress/translation/annotations/websocket/websocket.go b/pkg/providers/ingress/translation/annotations/websocket/websocket.go index 6d6bff4c3..ad13a8a68 100644 --- a/pkg/providers/ingress/translation/annotations/websocket/websocket.go +++ b/pkg/providers/ingress/translation/annotations/websocket/websocket.go @@ -15,7 +15,7 @@ package websocket import ( - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" ) type websocket struct{} diff --git a/pkg/providers/ingress/translation/annotations_test.go b/pkg/providers/ingress/translation/annotations_test.go index a4b807418..c17904257 100644 --- a/pkg/providers/ingress/translation/annotations_test.go +++ b/pkg/providers/ingress/translation/annotations_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation/annotations" - apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation/annotations" + apisix "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestAnnotationsPlugins(t *testing.T) { diff --git a/pkg/providers/ingress/translation/translator.go b/pkg/providers/ingress/translation/translator.go index 30f30c3d3..80a4f42ff 100644 --- a/pkg/providers/ingress/translation/translator.go +++ b/pkg/providers/ingress/translation/translator.go @@ -33,16 +33,16 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" listerscorev1 "k8s.io/client-go/listers/core/v1" - "github.com/apache/apisix-ingress-controller/pkg/apisix" - "github.com/apache/apisix-ingress-controller/pkg/id" - "github.com/apache/apisix-ingress-controller/pkg/kube" - kubev2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - apisixconst "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/const" - "github.com/apache/apisix-ingress-controller/pkg/log" - apisixtranslation "github.com/apache/apisix-ingress-controller/pkg/providers/apisix/translation" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/types" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/kube" + kubev2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + apisixconst "github.com/api7/api7-ingress-controller/pkg/kube/apisix/const" + "github.com/api7/api7-ingress-controller/pkg/log" + apisixtranslation "github.com/api7/api7-ingress-controller/pkg/providers/apisix/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/types" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) const ( diff --git a/pkg/providers/ingress/translation/translator_test.go b/pkg/providers/ingress/translation/translator_test.go index dd6c79b4f..721ab8a79 100644 --- a/pkg/providers/ingress/translation/translator_test.go +++ b/pkg/providers/ingress/translation/translator_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/cache" - "github.com/apache/apisix-ingress-controller/pkg/providers/apisix/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/apisix/translation" ) const _ingressKey string = "kubernetes.io/ingress.class" diff --git a/pkg/providers/k8s/configmap/configmap.go b/pkg/providers/k8s/configmap/configmap.go index cd4845585..40722d438 100644 --- a/pkg/providers/k8s/configmap/configmap.go +++ b/pkg/providers/k8s/configmap/configmap.go @@ -24,11 +24,11 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/configmap/translation" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/configmap/translation" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) type subscripKey struct { diff --git a/pkg/providers/k8s/configmap/provider.go b/pkg/providers/k8s/configmap/provider.go index 0b226d5de..34ef3df55 100644 --- a/pkg/providers/k8s/configmap/provider.go +++ b/pkg/providers/k8s/configmap/provider.go @@ -19,9 +19,9 @@ package configmap import ( "context" - "github.com/apache/apisix-ingress-controller/pkg/config" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/config" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" ) var _ Provider = (*configmapProvider)(nil) diff --git a/pkg/providers/k8s/configmap/translation/parse.go b/pkg/providers/k8s/configmap/translation/parse.go index cbf33fe38..27e790d59 100644 --- a/pkg/providers/k8s/configmap/translation/parse.go +++ b/pkg/providers/k8s/configmap/translation/parse.go @@ -21,7 +21,7 @@ import ( "go.uber.org/zap" corev1 "k8s.io/api/core/v1" - "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/log" ) type ConfigMapData struct { diff --git a/pkg/providers/k8s/configmap/translation/translation.go b/pkg/providers/k8s/configmap/translation/translation.go index ed363e898..fa00ce8dc 100644 --- a/pkg/providers/k8s/configmap/translation/translation.go +++ b/pkg/providers/k8s/configmap/translation/translation.go @@ -19,7 +19,7 @@ package translation import ( corev1 "k8s.io/api/core/v1" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type ConfigMap struct { diff --git a/pkg/providers/k8s/endpoint/base.go b/pkg/providers/k8s/endpoint/base.go index 07dd0d9ef..db7ad6697 100644 --- a/pkg/providers/k8s/endpoint/base.go +++ b/pkg/providers/k8s/endpoint/base.go @@ -24,15 +24,15 @@ import ( k8serrors "k8s.io/apimachinery/pkg/api/errors" listerscorev1 "k8s.io/client-go/listers/core/v1" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type baseEndpointController struct { diff --git a/pkg/providers/k8s/endpoint/endpoint.go b/pkg/providers/k8s/endpoint/endpoint.go index 779af421b..bb347a80e 100644 --- a/pkg/providers/k8s/endpoint/endpoint.go +++ b/pkg/providers/k8s/endpoint/endpoint.go @@ -24,10 +24,10 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/apache/apisix-ingress-controller/pkg/kube" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/namespace" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/kube" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/namespace" + "github.com/api7/api7-ingress-controller/pkg/types" ) type endpointsController struct { diff --git a/pkg/providers/k8s/endpoint/endpointslice.go b/pkg/providers/k8s/endpoint/endpointslice.go index 75e9ea76e..22776d517 100644 --- a/pkg/providers/k8s/endpoint/endpointslice.go +++ b/pkg/providers/k8s/endpoint/endpointslice.go @@ -25,10 +25,10 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/apache/apisix-ingress-controller/pkg/kube" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/namespace" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/kube" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/namespace" + "github.com/api7/api7-ingress-controller/pkg/types" ) const ( diff --git a/pkg/providers/k8s/endpoint/provider.go b/pkg/providers/k8s/endpoint/provider.go index ff7fd71ea..dfa3be595 100644 --- a/pkg/providers/k8s/endpoint/provider.go +++ b/pkg/providers/k8s/endpoint/provider.go @@ -19,11 +19,11 @@ package endpoint import ( "context" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/namespace" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/namespace" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" ) var _ Provider = (*endpointProvider)(nil) diff --git a/pkg/providers/k8s/namespace/namespace.go b/pkg/providers/k8s/namespace/namespace.go index 3f02bd967..91acb3589 100644 --- a/pkg/providers/k8s/namespace/namespace.go +++ b/pkg/providers/k8s/namespace/namespace.go @@ -25,8 +25,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/types" ) // FIXME: Controller should be the Core Part, diff --git a/pkg/providers/k8s/namespace/namespace_provider.go b/pkg/providers/k8s/namespace/namespace_provider.go index 97a29eaf1..92bd7769d 100644 --- a/pkg/providers/k8s/namespace/namespace_provider.go +++ b/pkg/providers/k8s/namespace/namespace_provider.go @@ -27,12 +27,12 @@ import ( listerscorev1 "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - "github.com/apache/apisix-ingress-controller/pkg/log" - provider "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + "github.com/api7/api7-ingress-controller/pkg/log" + provider "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) type WatchingNamespaceProvider interface { diff --git a/pkg/providers/k8s/pod/pod.go b/pkg/providers/k8s/pod/pod.go index e3e5f86d4..4eccd64fb 100644 --- a/pkg/providers/k8s/pod/pod.go +++ b/pkg/providers/k8s/pod/pod.go @@ -21,10 +21,10 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/namespace" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/namespace" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/types" ) type podController struct { diff --git a/pkg/providers/k8s/pod/pod_test.go b/pkg/providers/k8s/pod/pod_test.go index 8df8c0cc6..c6f05cc83 100644 --- a/pkg/providers/k8s/pod/pod_test.go +++ b/pkg/providers/k8s/pod/pod_test.go @@ -22,10 +22,10 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/namespace" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/metrics" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/namespace" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/types" ) func mockController() *podController { diff --git a/pkg/providers/k8s/pod/provider.go b/pkg/providers/k8s/pod/provider.go index 8ed810da3..02fbac03f 100644 --- a/pkg/providers/k8s/pod/provider.go +++ b/pkg/providers/k8s/pod/provider.go @@ -21,11 +21,11 @@ import ( "k8s.io/client-go/tools/cache" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/namespace" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/namespace" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" ) var _ Provider = (*podProvider)(nil) diff --git a/pkg/providers/k8s/provider.go b/pkg/providers/k8s/provider.go index bc496ca77..ac96d875a 100644 --- a/pkg/providers/k8s/provider.go +++ b/pkg/providers/k8s/provider.go @@ -22,14 +22,14 @@ import ( "github.com/pkg/errors" "k8s.io/client-go/tools/cache" - apisixprovider "github.com/apache/apisix-ingress-controller/pkg/providers/apisix" - ingressprovider "github.com/apache/apisix-ingress-controller/pkg/providers/ingress" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/configmap" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/endpoint" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/namespace" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" + apisixprovider "github.com/api7/api7-ingress-controller/pkg/providers/apisix" + ingressprovider "github.com/api7/api7-ingress-controller/pkg/providers/ingress" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/configmap" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/endpoint" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/namespace" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" ) var _ Provider = (*k8sProvider)(nil) diff --git a/pkg/providers/k8s/secret.go b/pkg/providers/k8s/secret.go index 8bee2c4f2..740be36ab 100644 --- a/pkg/providers/k8s/secret.go +++ b/pkg/providers/k8s/secret.go @@ -26,12 +26,12 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/apache/apisix-ingress-controller/pkg/log" - apisixprovider "github.com/apache/apisix-ingress-controller/pkg/providers/apisix" - ingressprovider "github.com/apache/apisix-ingress-controller/pkg/providers/ingress" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/namespace" - providertypes "github.com/apache/apisix-ingress-controller/pkg/providers/types" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/log" + apisixprovider "github.com/api7/api7-ingress-controller/pkg/providers/apisix" + ingressprovider "github.com/api7/api7-ingress-controller/pkg/providers/ingress" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/namespace" + providertypes "github.com/api7/api7-ingress-controller/pkg/providers/types" + "github.com/api7/api7-ingress-controller/pkg/types" ) type secretController struct { diff --git a/pkg/providers/translation/apisix_upstream.go b/pkg/providers/translation/apisix_upstream.go index 44aca7ba9..841d077f9 100644 --- a/pkg/providers/translation/apisix_upstream.go +++ b/pkg/providers/translation/apisix_upstream.go @@ -17,8 +17,8 @@ package translation import ( "fmt" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type passHostConfig struct { diff --git a/pkg/providers/translation/apisix_upstream_test.go b/pkg/providers/translation/apisix_upstream_test.go index 6723535e5..063f1c135 100644 --- a/pkg/providers/translation/apisix_upstream_test.go +++ b/pkg/providers/translation/apisix_upstream_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestTranslateUpstreamHealthCheckV2(t *testing.T) { diff --git a/pkg/providers/translation/context.go b/pkg/providers/translation/context.go index 3a9744c6d..ac62fc1d2 100644 --- a/pkg/providers/translation/context.go +++ b/pkg/providers/translation/context.go @@ -14,7 +14,7 @@ // limitations under the License. package translation -import apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" +import apisix "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" // TranslateContext contains APISIX resources generated by the translator. type TranslateContext struct { diff --git a/pkg/providers/translation/context_test.go b/pkg/providers/translation/context_test.go index ed882d4b8..d82e7c17a 100644 --- a/pkg/providers/translation/context_test.go +++ b/pkg/providers/translation/context_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + apisix "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestTranslateContext(t *testing.T) { diff --git a/pkg/providers/translation/service.go b/pkg/providers/translation/service.go index 50f00a0a2..e1be6c089 100644 --- a/pkg/providers/translation/service.go +++ b/pkg/providers/translation/service.go @@ -23,13 +23,13 @@ import ( corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func (t *translator) TranslateService(namespace, name, subset string, port int32) (*apisixv1.Upstream, error) { diff --git a/pkg/providers/translation/translator.go b/pkg/providers/translation/translator.go index dc8841485..72f3a0417 100644 --- a/pkg/providers/translation/translator.go +++ b/pkg/providers/translation/translator.go @@ -19,11 +19,11 @@ import ( listerscorev1 "k8s.io/client-go/listers/core/v1" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/providers/k8s/pod" - "github.com/apache/apisix-ingress-controller/pkg/types" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/providers/k8s/pod" + "github.com/api7/api7-ingress-controller/pkg/types" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) const ( diff --git a/pkg/providers/translation/translator_test.go b/pkg/providers/translation/translator_test.go index f52157f00..e6f53dbaa 100644 --- a/pkg/providers/translation/translator_test.go +++ b/pkg/providers/translation/translator_test.go @@ -27,9 +27,9 @@ import ( "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/cache" - "github.com/apache/apisix-ingress-controller/pkg/kube" - configv2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/kube" + configv2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestTranslateUpstreamConfigV2(t *testing.T) { diff --git a/pkg/providers/types/types.go b/pkg/providers/types/types.go index ea30cc0b1..64222d294 100644 --- a/pkg/providers/types/types.go +++ b/pkg/providers/types/types.go @@ -28,15 +28,15 @@ import ( "k8s.io/client-go/tools/leaderelection" "k8s.io/client-go/tools/record" - "github.com/apache/apisix-ingress-controller/pkg/apisix" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/kube" - "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/providers/utils" - "github.com/apache/apisix-ingress-controller/pkg/types" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/kube" + "github.com/api7/api7-ingress-controller/pkg/kube/apisix/client/informers/externalversions" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/metrics" + "github.com/api7/api7-ingress-controller/pkg/providers/utils" + "github.com/api7/api7-ingress-controller/pkg/types" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) type Provider interface { diff --git a/pkg/providers/utils/ingress_class.go b/pkg/providers/utils/ingress_class.go index 5b1c4cf88..ce4f2d584 100644 --- a/pkg/providers/utils/ingress_class.go +++ b/pkg/providers/utils/ingress_class.go @@ -14,7 +14,7 @@ // limitations under the License. package utils -import "github.com/apache/apisix-ingress-controller/pkg/config" +import "github.com/api7/api7-ingress-controller/pkg/config" func MatchCRDsIngressClass(resourceIngressClassName string, configIngressClass string) bool { if configIngressClass == config.IngressClassApisixAndAll { diff --git a/pkg/providers/utils/ingress_status.go b/pkg/providers/utils/ingress_status.go index 324a7cb9f..a9ea84d91 100644 --- a/pkg/providers/utils/ingress_status.go +++ b/pkg/providers/utils/ingress_status.go @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/tools/cache" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/log" ) const ( diff --git a/pkg/providers/utils/manifest.go b/pkg/providers/utils/manifest.go index 7d3217542..c1baf9556 100644 --- a/pkg/providers/utils/manifest.go +++ b/pkg/providers/utils/manifest.go @@ -21,10 +21,10 @@ import ( "github.com/hashicorp/go-multierror" "go.uber.org/zap" - "github.com/apache/apisix-ingress-controller/pkg/apisix" - "github.com/apache/apisix-ingress-controller/pkg/apisix/cache" - "github.com/apache/apisix-ingress-controller/pkg/log" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/apisix/cache" + "github.com/api7/api7-ingress-controller/pkg/log" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func DiffSSL(olds, news []*apisixv1.Ssl) (added, updated, deleted []*apisixv1.Ssl) { diff --git a/pkg/providers/utils/manifest_test.go b/pkg/providers/utils/manifest_test.go index 5fdcb65cd..5e42c9749 100644 --- a/pkg/providers/utils/manifest_test.go +++ b/pkg/providers/utils/manifest_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) func TestDiffRoutes(t *testing.T) { diff --git a/pkg/providers/utils/scheme.go b/pkg/providers/utils/scheme.go index 123c1e9a7..fbbf2675a 100644 --- a/pkg/providers/utils/scheme.go +++ b/pkg/providers/utils/scheme.go @@ -18,7 +18,7 @@ package utils import ( - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" ) var schemeToPortMaps = map[string]int{ diff --git a/pkg/types/apisix/v1/types.go b/pkg/types/apisix/v1/types.go index a3695df66..74576912c 100644 --- a/pkg/types/apisix/v1/types.go +++ b/pkg/types/apisix/v1/types.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/apache/apisix-ingress-controller/pkg/types" + "github.com/api7/api7-ingress-controller/pkg/types" ) const ( diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index 0385cf15a..29456b987 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -17,21 +17,21 @@ package e2e import ( "os" - "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/log" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-annotations" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-chore" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-cluster" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-features" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-gateway" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-ingress/suite-ingress-features" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-ingress/suite-ingress-resource" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-plugins/suite-plugins-authentication" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-plugins/suite-plugins-general" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-plugins/suite-plugins-other" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-plugins/suite-plugins-security" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-plugins/suite-plugins-traffic" - _ "github.com/apache/apisix-ingress-controller/test/e2e/suite-plugins/suite-plugins-transformation" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-annotations" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-chore" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-cluster" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-features" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-gateway" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-ingress/suite-ingress-features" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-ingress/suite-ingress-resource" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-plugins/suite-plugins-authentication" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-plugins/suite-plugins-general" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-plugins/suite-plugins-other" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-plugins/suite-plugins-security" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-plugins/suite-plugins-traffic" + _ "github.com/api7/api7-ingress-controller/test/e2e/suite-plugins/suite-plugins-transformation" ) func runE2E() { diff --git a/test/e2e/go.mod b/test/e2e/go.mod index a8ce80357..6669af0cd 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/apisix-ingress-controller/test/e2e +module github.com/api7/api7-ingress-controller/test/e2e go 1.20 require ( - github.com/apache/apisix-ingress-controller v0.0.0-20210105024109-72e53386de5a - github.com/apache/apisix-ingress-controller/test/e2e/testbackend v0.0.0 + github.com/api7/api7-ingress-controller v0.0.0-20210105024109-72e53386de5a + github.com/api7/api7-ingress-controller/test/e2e/testbackend v0.0.0 github.com/eclipse/paho.mqtt.golang v1.4.3 github.com/gavv/httpexpect/v2 v2.16.0 github.com/gorilla/websocket v1.5.1 @@ -146,8 +146,8 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace github.com/apache/apisix-ingress-controller => ../../ +replace github.com/api7/api7-ingress-controller => ../../ -replace github.com/apache/apisix-ingress-controller/test/e2e/testbackend => ./testbackend +replace github.com/api7/api7-ingress-controller/test/e2e/testbackend => ./testbackend replace github.com/gruntwork-io/terratest => github.com/api7/terratest v1.0.0 diff --git a/test/e2e/scaffold/k8s.go b/test/e2e/scaffold/k8s.go index 6ce1aeb9c..9d9942bac 100644 --- a/test/e2e/scaffold/k8s.go +++ b/test/e2e/scaffold/k8s.go @@ -27,10 +27,10 @@ import ( "strings" "time" - "github.com/apache/apisix-ingress-controller/pkg/apisix" - "github.com/apache/apisix-ingress-controller/pkg/log" - "github.com/apache/apisix-ingress-controller/pkg/metrics" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/apisix" + "github.com/api7/api7-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/metrics" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" "github.com/gruntwork-io/terratest/modules/k8s" "github.com/gruntwork-io/terratest/modules/retry" "github.com/gruntwork-io/terratest/modules/testing" diff --git a/test/e2e/scaffold/scaffold.go b/test/e2e/scaffold/scaffold.go index 1485707c0..2242c975d 100644 --- a/test/e2e/scaffold/scaffold.go +++ b/test/e2e/scaffold/scaffold.go @@ -31,8 +31,8 @@ import ( "text/template" "time" - "github.com/apache/apisix-ingress-controller/pkg/config" - "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/log" mqtt "github.com/eclipse/paho.mqtt.golang" "github.com/gavv/httpexpect/v2" "github.com/gruntwork-io/terratest/modules/k8s" diff --git a/test/e2e/suite-annotations/authorization.go b/test/e2e/suite-annotations/authorization.go index f946c245e..95856ddcc 100644 --- a/test/e2e/suite-annotations/authorization.go +++ b/test/e2e/suite-annotations/authorization.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-annotations: authorization annotations", func() { diff --git a/test/e2e/suite-annotations/cors.go b/test/e2e/suite-annotations/cors.go index 8b408f7a9..dd3e143ad 100644 --- a/test/e2e/suite-annotations/cors.go +++ b/test/e2e/suite-annotations/cors.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-annotations: cors annotations", func() { diff --git a/test/e2e/suite-annotations/csrf.go b/test/e2e/suite-annotations/csrf.go index 383fe8bb3..39bbaff34 100644 --- a/test/e2e/suite-annotations/csrf.go +++ b/test/e2e/suite-annotations/csrf.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-annotations: csrf annotations", func() { diff --git a/test/e2e/suite-annotations/forward_auth.go b/test/e2e/suite-annotations/forward_auth.go index 0bb4c08da..9b5cece5f 100644 --- a/test/e2e/suite-annotations/forward_auth.go +++ b/test/e2e/suite-annotations/forward_auth.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-annotations: froward-auth annotations", func() { diff --git a/test/e2e/suite-annotations/http_method.go b/test/e2e/suite-annotations/http_method.go index 1655e189e..1244ed05d 100644 --- a/test/e2e/suite-annotations/http_method.go +++ b/test/e2e/suite-annotations/http_method.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-annotations: allow-http-methods annotations", func() { diff --git a/test/e2e/suite-annotations/iprestriction.go b/test/e2e/suite-annotations/iprestriction.go index d1bb18431..5b26f60f2 100644 --- a/test/e2e/suite-annotations/iprestriction.go +++ b/test/e2e/suite-annotations/iprestriction.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-annotations: allowlist-source-range annotations", func() { diff --git a/test/e2e/suite-annotations/plugin_conifg.go b/test/e2e/suite-annotations/plugin_conifg.go index ea9d726a9..02693ebd9 100644 --- a/test/e2e/suite-annotations/plugin_conifg.go +++ b/test/e2e/suite-annotations/plugin_conifg.go @@ -23,7 +23,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) func _createAPC(s *scaffold.Scaffold) { diff --git a/test/e2e/suite-annotations/redirect.go b/test/e2e/suite-annotations/redirect.go index b2f4c0198..6267f08e2 100644 --- a/test/e2e/suite-annotations/redirect.go +++ b/test/e2e/suite-annotations/redirect.go @@ -23,7 +23,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-annotations: redirect annotations", func() { diff --git a/test/e2e/suite-annotations/response_rewrite.go b/test/e2e/suite-annotations/response_rewrite.go index d8e309d1d..2d07350a2 100644 --- a/test/e2e/suite-annotations/response_rewrite.go +++ b/test/e2e/suite-annotations/response_rewrite.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) // suite-annotations: response-rewrite annotations diff --git a/test/e2e/suite-annotations/rewrite.go b/test/e2e/suite-annotations/rewrite.go index d3795600a..8f8e08131 100644 --- a/test/e2e/suite-annotations/rewrite.go +++ b/test/e2e/suite-annotations/rewrite.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-annotations: rewrite annotations", func() { diff --git a/test/e2e/suite-annotations/svc_namespace.go b/test/e2e/suite-annotations/svc_namespace.go index 6831a9ddb..2a99223d6 100644 --- a/test/e2e/suite-annotations/svc_namespace.go +++ b/test/e2e/suite-annotations/svc_namespace.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-annotations: svc-namespace annotations reference service in the same namespace", func() { diff --git a/test/e2e/suite-annotations/upstreamprotocol.go b/test/e2e/suite-annotations/upstreamprotocol.go index 05124ff5a..d39695690 100644 --- a/test/e2e/suite-annotations/upstreamprotocol.go +++ b/test/e2e/suite-annotations/upstreamprotocol.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-annotations: annotations.networking/v1 upstream scheme", func() { diff --git a/test/e2e/suite-annotations/upstreamretry.go b/test/e2e/suite-annotations/upstreamretry.go index 768e2d75f..939d6d58b 100644 --- a/test/e2e/suite-annotations/upstreamretry.go +++ b/test/e2e/suite-annotations/upstreamretry.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-annotations: annotations.networking/v1 upstream", func() { diff --git a/test/e2e/suite-annotations/websocket.go b/test/e2e/suite-annotations/websocket.go index 462de3326..0479fb4e2 100644 --- a/test/e2e/suite-annotations/websocket.go +++ b/test/e2e/suite-annotations/websocket.go @@ -24,7 +24,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-annotations: annotations.networking/v1 websocket", func() { diff --git a/test/e2e/suite-chore/admin_api.go b/test/e2e/suite-chore/admin_api.go index e3ce7159f..5f5481fb6 100644 --- a/test/e2e/suite-chore/admin_api.go +++ b/test/e2e/suite-chore/admin_api.go @@ -18,11 +18,11 @@ package chore import ( "context" - v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + v1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-chore: admin-api sdk", func() { diff --git a/test/e2e/suite-chore/chaos.go b/test/e2e/suite-chore/chaos.go index d3db1212a..b4466d941 100644 --- a/test/e2e/suite-chore/chaos.go +++ b/test/e2e/suite-chore/chaos.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-chore: Chaos Testing", func() { diff --git a/test/e2e/suite-chore/config.go b/test/e2e/suite-chore/config.go index d13d9ec4b..9ea424873 100644 --- a/test/e2e/suite-chore/config.go +++ b/test/e2e/suite-chore/config.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) const ( diff --git a/test/e2e/suite-chore/consistency.go b/test/e2e/suite-chore/consistency.go index 8a2edf6df..e7294119c 100644 --- a/test/e2e/suite-chore/consistency.go +++ b/test/e2e/suite-chore/consistency.go @@ -23,7 +23,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var ( diff --git a/test/e2e/suite-chore/endpoints.go b/test/e2e/suite-chore/endpoints.go index 715b03d8a..04326151c 100644 --- a/test/e2e/suite-chore/endpoints.go +++ b/test/e2e/suite-chore/endpoints.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-chore: endpoints", func() { diff --git a/test/e2e/suite-chore/resolvegranularity.go b/test/e2e/suite-chore/resolvegranularity.go index a5dd8b99d..50a3ffeeb 100644 --- a/test/e2e/suite-chore/resolvegranularity.go +++ b/test/e2e/suite-chore/resolvegranularity.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-chore: ApisixRoute resolvegranularity Testing", func() { diff --git a/test/e2e/suite-cluster/apisix_cluster_config.go b/test/e2e/suite-cluster/apisix_cluster_config.go index abbb7101a..360d51fba 100644 --- a/test/e2e/suite-cluster/apisix_cluster_config.go +++ b/test/e2e/suite-cluster/apisix_cluster_config.go @@ -19,11 +19,11 @@ import ( "net/http" "time" - "github.com/apache/apisix-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/id" ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-cluster: ApisixClusterConfig v2", func() { diff --git a/test/e2e/suite-cluster/status.go b/test/e2e/suite-cluster/status.go index 0aac5b743..235b1f9e2 100644 --- a/test/e2e/suite-cluster/status.go +++ b/test/e2e/suite-cluster/status.go @@ -20,7 +20,7 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-cluster: CRDs status subresource Testing", func() { diff --git a/test/e2e/suite-features/external-sd.go b/test/e2e/suite-features/external-sd.go index 61f73477f..5b17b5a04 100644 --- a/test/e2e/suite-features/external-sd.go +++ b/test/e2e/suite-features/external-sd.go @@ -23,11 +23,11 @@ import ( "os" "time" - "github.com/apache/apisix-ingress-controller/pkg/config" + "github.com/api7/api7-ingress-controller/pkg/config" "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: external service discovery", func() { diff --git a/test/e2e/suite-features/external-service.go b/test/e2e/suite-features/external-service.go index d25491bfa..619aa14c8 100644 --- a/test/e2e/suite-features/external-service.go +++ b/test/e2e/suite-features/external-service.go @@ -22,15 +22,15 @@ import ( "net/http" "time" - "github.com/apache/apisix-ingress-controller/pkg/id" - v2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" - "github.com/apache/apisix-ingress-controller/pkg/types" - apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1" + "github.com/api7/api7-ingress-controller/pkg/id" + v2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/types" + apisixv1 "github.com/api7/api7-ingress-controller/pkg/types/apisix/v1" "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: external services", func() { diff --git a/test/e2e/suite-features/global_rule.go b/test/e2e/suite-features/global_rule.go index 3f4902615..5402652d1 100644 --- a/test/e2e/suite-features/global_rule.go +++ b/test/e2e/suite-features/global_rule.go @@ -20,7 +20,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: ApisiGlobalRule", func() { diff --git a/test/e2e/suite-features/healthcheck.go b/test/e2e/suite-features/healthcheck.go index bb9e62880..cdf41b4dc 100644 --- a/test/e2e/suite-features/healthcheck.go +++ b/test/e2e/suite-features/healthcheck.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: health check", func() { diff --git a/test/e2e/suite-features/remote_addrs_match.go b/test/e2e/suite-features/remote_addrs_match.go index 8fc735d17..a13ccce83 100644 --- a/test/e2e/suite-features/remote_addrs_match.go +++ b/test/e2e/suite-features/remote_addrs_match.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: traffic split", func() { diff --git a/test/e2e/suite-features/retries.go b/test/e2e/suite-features/retries.go index 9d450549d..93814fa5b 100644 --- a/test/e2e/suite-features/retries.go +++ b/test/e2e/suite-features/retries.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: retries", func() { diff --git a/test/e2e/suite-features/route_filter_func.go b/test/e2e/suite-features/route_filter_func.go index 95c1d710b..8f9283bb3 100644 --- a/test/e2e/suite-features/route_filter_func.go +++ b/test/e2e/suite-features/route_filter_func.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: filter_func", func() { diff --git a/test/e2e/suite-features/route_match_exprs.go b/test/e2e/suite-features/route_match_exprs.go index 8d7237dda..b1d5e3269 100644 --- a/test/e2e/suite-features/route_match_exprs.go +++ b/test/e2e/suite-features/route_match_exprs.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: route match exprs", func() { diff --git a/test/e2e/suite-features/scheme.go b/test/e2e/suite-features/scheme.go index df60a737a..0786bc2c4 100644 --- a/test/e2e/suite-features/scheme.go +++ b/test/e2e/suite-features/scheme.go @@ -22,8 +22,8 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" - "github.com/apache/apisix-ingress-controller/test/e2e/testbackend/client" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/testbackend/client" ) var _ = ginkgo.Describe("suite-features: choose scheme", func() { diff --git a/test/e2e/suite-features/subset.go b/test/e2e/suite-features/subset.go index bc6ecee82..b6f74d201 100644 --- a/test/e2e/suite-features/subset.go +++ b/test/e2e/suite-features/subset.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: service subset", func() { diff --git a/test/e2e/suite-features/sync-comparison.go b/test/e2e/suite-features/sync-comparison.go index 6743d7a8f..95269efef 100644 --- a/test/e2e/suite-features/sync-comparison.go +++ b/test/e2e/suite-features/sync-comparison.go @@ -21,11 +21,11 @@ import ( "fmt" "time" - "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/log" ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: sync comparison", func() { diff --git a/test/e2e/suite-features/sync-delay.go b/test/e2e/suite-features/sync-delay.go index ba8df9dc4..9a1f990b7 100644 --- a/test/e2e/suite-features/sync-delay.go +++ b/test/e2e/suite-features/sync-delay.go @@ -24,11 +24,11 @@ import ( "strings" "time" - "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/log" ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) func getApisixResourceRequestsCount(s *scaffold.Scaffold, res string) int { diff --git a/test/e2e/suite-features/traffic_split.go b/test/e2e/suite-features/traffic_split.go index 66269db31..bb9a70350 100644 --- a/test/e2e/suite-features/traffic_split.go +++ b/test/e2e/suite-features/traffic_split.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: traffic split", func() { diff --git a/test/e2e/suite-features/upstream_pass_host.go b/test/e2e/suite-features/upstream_pass_host.go index 37fd12168..74b35fb9c 100644 --- a/test/e2e/suite-features/upstream_pass_host.go +++ b/test/e2e/suite-features/upstream_pass_host.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: upstream pass host", func() { diff --git a/test/e2e/suite-features/websocket.go b/test/e2e/suite-features/websocket.go index 7ba93a203..de001a944 100644 --- a/test/e2e/suite-features/websocket.go +++ b/test/e2e/suite-features/websocket.go @@ -23,7 +23,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-features: websocket", func() { diff --git a/test/e2e/suite-gateway/gateway_httproute.go b/test/e2e/suite-gateway/gateway_httproute.go index 78d189680..e2e1a47cf 100644 --- a/test/e2e/suite-gateway/gateway_httproute.go +++ b/test/e2e/suite-gateway/gateway_httproute.go @@ -24,7 +24,7 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-gateway: HTTPRoute", func() { diff --git a/test/e2e/suite-gateway/gateway_tcproute.go b/test/e2e/suite-gateway/gateway_tcproute.go index cd70c0882..21445a06e 100644 --- a/test/e2e/suite-gateway/gateway_tcproute.go +++ b/test/e2e/suite-gateway/gateway_tcproute.go @@ -24,7 +24,7 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-gateway: TCP Route", func() { diff --git a/test/e2e/suite-gateway/gateway_tlsroute.go b/test/e2e/suite-gateway/gateway_tlsroute.go index 6d1134a1b..befc4443c 100644 --- a/test/e2e/suite-gateway/gateway_tlsroute.go +++ b/test/e2e/suite-gateway/gateway_tlsroute.go @@ -24,7 +24,7 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) func createSSL(s *scaffold.Scaffold) { diff --git a/test/e2e/suite-gateway/gateway_udproute.go b/test/e2e/suite-gateway/gateway_udproute.go index e172e36a4..4f410a7d2 100644 --- a/test/e2e/suite-gateway/gateway_udproute.go +++ b/test/e2e/suite-gateway/gateway_udproute.go @@ -23,7 +23,7 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-gateway: UDP Route", func() { diff --git a/test/e2e/suite-gateway/route_attchment.go b/test/e2e/suite-gateway/route_attchment.go index 0375cc596..2e5c9f387 100644 --- a/test/e2e/suite-gateway/route_attchment.go +++ b/test/e2e/suite-gateway/route_attchment.go @@ -23,7 +23,7 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-gateway: Route Attachment", func() { diff --git a/test/e2e/suite-ingress/suite-ingress-features/compare.go b/test/e2e/suite-ingress/suite-ingress-features/compare.go index 85e543ae2..be099b77a 100644 --- a/test/e2e/suite-ingress/suite-ingress-features/compare.go +++ b/test/e2e/suite-ingress/suite-ingress-features/compare.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-ingress-features: Testing compare resources", func() { diff --git a/test/e2e/suite-ingress/suite-ingress-features/ingress-class.go b/test/e2e/suite-ingress/suite-ingress-features/ingress-class.go index 6fe07c478..7543bdd03 100644 --- a/test/e2e/suite-ingress/suite-ingress-features/ingress-class.go +++ b/test/e2e/suite-ingress/suite-ingress-features/ingress-class.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) const ( diff --git a/test/e2e/suite-ingress/suite-ingress-features/namespace.go b/test/e2e/suite-ingress/suite-ingress-features/namespace.go index 5e7489d07..95b50f913 100644 --- a/test/e2e/suite-ingress/suite-ingress-features/namespace.go +++ b/test/e2e/suite-ingress/suite-ingress-features/namespace.go @@ -28,7 +28,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) type headers struct { diff --git a/test/e2e/suite-ingress/suite-ingress-features/resourcesync.go b/test/e2e/suite-ingress/suite-ingress-features/resourcesync.go index 34041459b..f800c99a8 100644 --- a/test/e2e/suite-ingress/suite-ingress-features/resourcesync.go +++ b/test/e2e/suite-ingress/suite-ingress-features/resourcesync.go @@ -20,11 +20,11 @@ import ( "net/http" "time" - "github.com/apache/apisix-ingress-controller/pkg/id" + "github.com/api7/api7-ingress-controller/pkg/id" "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-ingress-features: apisix resource sync", func() { diff --git a/test/e2e/suite-ingress/suite-ingress-features/sanity.go b/test/e2e/suite-ingress/suite-ingress-features/sanity.go index b146600f1..ee62b7771 100644 --- a/test/e2e/suite-ingress/suite-ingress-features/sanity.go +++ b/test/e2e/suite-ingress/suite-ingress-features/sanity.go @@ -23,7 +23,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) type ip struct { diff --git a/test/e2e/suite-ingress/suite-ingress-features/secret.go b/test/e2e/suite-ingress/suite-ingress-features/secret.go index 5e9e1c22b..fb9a0389f 100644 --- a/test/e2e/suite-ingress/suite-ingress-features/secret.go +++ b/test/e2e/suite-ingress/suite-ingress-features/secret.go @@ -23,7 +23,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-ingress-features: secret controller", func() { diff --git a/test/e2e/suite-ingress/suite-ingress-features/status.go b/test/e2e/suite-ingress/suite-ingress-features/status.go index a51fa5abd..3d97daf09 100644 --- a/test/e2e/suite-ingress/suite-ingress-features/status.go +++ b/test/e2e/suite-ingress/suite-ingress-features/status.go @@ -24,7 +24,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-ingress-features: CRDs status subresource Testing", func() { diff --git a/test/e2e/suite-ingress/suite-ingress-features/webhook.go b/test/e2e/suite-ingress/suite-ingress-features/webhook.go index 02030964c..2abaaa0b8 100644 --- a/test/e2e/suite-ingress/suite-ingress-features/webhook.go +++ b/test/e2e/suite-ingress/suite-ingress-features/webhook.go @@ -21,7 +21,7 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-ingress-features: Enable webhooks", func() { diff --git a/test/e2e/suite-ingress/suite-ingress-resource/configmap.go b/test/e2e/suite-ingress/suite-ingress-resource/configmap.go index e182ad03f..3ccc81a1d 100644 --- a/test/e2e/suite-ingress/suite-ingress-resource/configmap.go +++ b/test/e2e/suite-ingress/suite-ingress-resource/configmap.go @@ -21,7 +21,7 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _configmapConfigYAML = ` diff --git a/test/e2e/suite-ingress/suite-ingress-resource/ingress.go b/test/e2e/suite-ingress/suite-ingress-resource/ingress.go index 95c5db348..918a6da66 100644 --- a/test/e2e/suite-ingress/suite-ingress-resource/ingress.go +++ b/test/e2e/suite-ingress/suite-ingress-resource/ingress.go @@ -24,15 +24,15 @@ import ( "net/http" "time" - "github.com/apache/apisix-ingress-controller/pkg/id" - kubev2 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2" - "github.com/apache/apisix-ingress-controller/pkg/providers/ingress/translation" + "github.com/api7/api7-ingress-controller/pkg/id" + kubev2 "github.com/api7/api7-ingress-controller/pkg/kube/apisix/apis/config/v2" + "github.com/api7/api7-ingress-controller/pkg/providers/ingress/translation" ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-ingress-resource: support ingress https", func() { diff --git a/test/e2e/suite-ingress/suite-ingress-resource/resourcepushing.go b/test/e2e/suite-ingress/suite-ingress-resource/resourcepushing.go index 0e5b9c95e..ab0e985bf 100644 --- a/test/e2e/suite-ingress/suite-ingress-resource/resourcepushing.go +++ b/test/e2e/suite-ingress/suite-ingress-resource/resourcepushing.go @@ -19,11 +19,11 @@ import ( "net/http" "time" - "github.com/apache/apisix-ingress-controller/pkg/log" + "github.com/api7/api7-ingress-controller/pkg/log" ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-ingress-resource: ApisixRoute Testing", func() { diff --git a/test/e2e/suite-ingress/suite-ingress-resource/ssl.go b/test/e2e/suite-ingress/suite-ingress-resource/ssl.go index a292bf6b2..99e493c3d 100644 --- a/test/e2e/suite-ingress/suite-ingress-resource/ssl.go +++ b/test/e2e/suite-ingress/suite-ingress-resource/ssl.go @@ -21,11 +21,11 @@ import ( "fmt" "net/http" - "github.com/apache/apisix-ingress-controller/pkg/providers/translation" + "github.com/api7/api7-ingress-controller/pkg/providers/translation" ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-ingress-resource: SSL Testing", func() { diff --git a/test/e2e/suite-ingress/suite-ingress-resource/stream.go b/test/e2e/suite-ingress/suite-ingress-resource/stream.go index 483362aa1..d4211569f 100644 --- a/test/e2e/suite-ingress/suite-ingress-resource/stream.go +++ b/test/e2e/suite-ingress/suite-ingress-resource/stream.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-ingress-resource: ApisixRoute stream Testing", func() { diff --git a/test/e2e/suite-ingress/suite-ingress-resource/upstream_tls.go b/test/e2e/suite-ingress/suite-ingress-resource/upstream_tls.go index c22e98b54..a250ef149 100644 --- a/test/e2e/suite-ingress/suite-ingress-resource/upstream_tls.go +++ b/test/e2e/suite-ingress/suite-ingress-resource/upstream_tls.go @@ -22,8 +22,8 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" - "github.com/apache/apisix-ingress-controller/test/e2e/testbackend/client" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/testbackend/client" ) var _ = ginkgo.Describe("suite-ingress-resource: ApisixUpstreams mTLS test", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-authentication/basic.go b/test/e2e/suite-plugins/suite-plugins-authentication/basic.go index eb399cc10..abd161af1 100644 --- a/test/e2e/suite-plugins/suite-plugins-authentication/basic.go +++ b/test/e2e/suite-plugins/suite-plugins-authentication/basic.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-authentication: ApisixConsumer with basicAuth", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-authentication/hmac.go b/test/e2e/suite-plugins/suite-plugins-authentication/hmac.go index 4a8d95118..bb49ffce3 100644 --- a/test/e2e/suite-plugins/suite-plugins-authentication/hmac.go +++ b/test/e2e/suite-plugins/suite-plugins-authentication/hmac.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-authentication: ApisixConsumer with hmacAuth", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-authentication/jwt.go b/test/e2e/suite-plugins/suite-plugins-authentication/jwt.go index f6eee819f..34fced0f4 100644 --- a/test/e2e/suite-plugins/suite-plugins-authentication/jwt.go +++ b/test/e2e/suite-plugins/suite-plugins-authentication/jwt.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-authentication: ApisixConsumer with jwtAuth", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-authentication/key.go b/test/e2e/suite-plugins/suite-plugins-authentication/key.go index 73a393e90..8c6ef4cda 100644 --- a/test/e2e/suite-plugins/suite-plugins-authentication/key.go +++ b/test/e2e/suite-plugins/suite-plugins-authentication/key.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-authentication: ApisixConsumer with keyAuth", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-authentication/ldap.go b/test/e2e/suite-plugins/suite-plugins-authentication/ldap.go index 107e42e9e..c57d5db11 100644 --- a/test/e2e/suite-plugins/suite-plugins-authentication/ldap.go +++ b/test/e2e/suite-plugins/suite-plugins-authentication/ldap.go @@ -23,7 +23,7 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-authentication: ApisixConsumer with ldap", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-authentication/wolfrbac.go b/test/e2e/suite-plugins/suite-plugins-authentication/wolfrbac.go index 2ecab924f..02ac7f999 100644 --- a/test/e2e/suite-plugins/suite-plugins-authentication/wolfrbac.go +++ b/test/e2e/suite-plugins/suite-plugins-authentication/wolfrbac.go @@ -25,7 +25,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-authentication: ApisixConsumer with wolfRBAC", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-general/echo.go b/test/e2e/suite-plugins/suite-plugins-general/echo.go index 1400d54f0..b45318b51 100644 --- a/test/e2e/suite-plugins/suite-plugins-general/echo.go +++ b/test/e2e/suite-plugins/suite-plugins-general/echo.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-general: echo plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-general/redirect.go b/test/e2e/suite-plugins/suite-plugins-general/redirect.go index 2a86b223d..ff03f8d77 100644 --- a/test/e2e/suite-plugins/suite-plugins-general/redirect.go +++ b/test/e2e/suite-plugins/suite-plugins-general/redirect.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-general: redirect plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-general/secret_ref.go b/test/e2e/suite-plugins/suite-plugins-general/secret_ref.go index 733d32387..221a89f87 100644 --- a/test/e2e/suite-plugins/suite-plugins-general/secret_ref.go +++ b/test/e2e/suite-plugins/suite-plugins-general/secret_ref.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-general: config plugin with secretRef", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-general/server-info.go b/test/e2e/suite-plugins/suite-plugins-general/server-info.go index 64c0cc938..561d95e76 100644 --- a/test/e2e/suite-plugins/suite-plugins-general/server-info.go +++ b/test/e2e/suite-plugins/suite-plugins-general/server-info.go @@ -18,7 +18,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-general: server-info plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-other/mqtt-proxy.go b/test/e2e/suite-plugins/suite-plugins-other/mqtt-proxy.go index e9e0844be..efc7a642d 100644 --- a/test/e2e/suite-plugins/suite-plugins-other/mqtt-proxy.go +++ b/test/e2e/suite-plugins/suite-plugins-other/mqtt-proxy.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-other: mqtt-proxy plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-other/plugin_config.go b/test/e2e/suite-plugins/suite-plugins-other/plugin_config.go index ea4cbe9cd..7cf8ac635 100644 --- a/test/e2e/suite-plugins/suite-plugins-other/plugin_config.go +++ b/test/e2e/suite-plugins/suite-plugins-other/plugin_config.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-other: ApisixPluginConfig", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-other/serverless.go b/test/e2e/suite-plugins/suite-plugins-other/serverless.go index 679987518..5ffe45297 100644 --- a/test/e2e/suite-plugins/suite-plugins-other/serverless.go +++ b/test/e2e/suite-plugins/suite-plugins-other/serverless.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-other: serverless plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-security/consumer-restriction.go b/test/e2e/suite-plugins/suite-plugins-security/consumer-restriction.go index 8db1d86ae..f54cd0c8a 100644 --- a/test/e2e/suite-plugins/suite-plugins-security/consumer-restriction.go +++ b/test/e2e/suite-plugins/suite-plugins-security/consumer-restriction.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-security: consumer-restriction plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-security/cors.go b/test/e2e/suite-plugins/suite-plugins-security/cors.go index a7f15c1ca..5ea8efe8f 100644 --- a/test/e2e/suite-plugins/suite-plugins-security/cors.go +++ b/test/e2e/suite-plugins/suite-plugins-security/cors.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-security: fault-injection plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-security/csrf.go b/test/e2e/suite-plugins/suite-plugins-security/csrf.go index 2364ffdd3..add22714e 100644 --- a/test/e2e/suite-plugins/suite-plugins-security/csrf.go +++ b/test/e2e/suite-plugins/suite-plugins-security/csrf.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-security: csrf plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-security/ip-restriction.go b/test/e2e/suite-plugins/suite-plugins-security/ip-restriction.go index 5b09258de..a05c16f41 100644 --- a/test/e2e/suite-plugins/suite-plugins-security/ip-restriction.go +++ b/test/e2e/suite-plugins/suite-plugins-security/ip-restriction.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-security: ip-restriction plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-security/referer-restriction.go b/test/e2e/suite-plugins/suite-plugins-security/referer-restriction.go index 4c92c1ed9..3bf3cf27d 100644 --- a/test/e2e/suite-plugins/suite-plugins-security/referer-restriction.go +++ b/test/e2e/suite-plugins/suite-plugins-security/referer-restriction.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-security: referer-restriction plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-security/uri_blocker.go b/test/e2e/suite-plugins/suite-plugins-security/uri_blocker.go index eb07995ef..3bd751ba7 100644 --- a/test/e2e/suite-plugins/suite-plugins-security/uri_blocker.go +++ b/test/e2e/suite-plugins/suite-plugins-security/uri_blocker.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-security: uri-blocker plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-traffic/api_breaker.go b/test/e2e/suite-plugins/suite-plugins-traffic/api_breaker.go index 23d74156d..ac5921115 100644 --- a/test/e2e/suite-plugins/suite-plugins-traffic/api_breaker.go +++ b/test/e2e/suite-plugins/suite-plugins-traffic/api_breaker.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-traffic: api-breaker plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-traffic/client-control.go b/test/e2e/suite-plugins/suite-plugins-traffic/client-control.go index b1cc3b804..044060dab 100644 --- a/test/e2e/suite-plugins/suite-plugins-traffic/client-control.go +++ b/test/e2e/suite-plugins/suite-plugins-traffic/client-control.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-traffic: client-control plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-traffic/limit_count.go b/test/e2e/suite-plugins/suite-plugins-traffic/limit_count.go index 244471b7a..de36cece1 100644 --- a/test/e2e/suite-plugins/suite-plugins-traffic/limit_count.go +++ b/test/e2e/suite-plugins/suite-plugins-traffic/limit_count.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-traffic: limit-count plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-traffic/request-validation.go b/test/e2e/suite-plugins/suite-plugins-traffic/request-validation.go index e7a4ef424..9f9d69856 100644 --- a/test/e2e/suite-plugins/suite-plugins-traffic/request-validation.go +++ b/test/e2e/suite-plugins/suite-plugins-traffic/request-validation.go @@ -20,7 +20,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-traffic: redirect plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-traffic/request_id.go b/test/e2e/suite-plugins/suite-plugins-traffic/request_id.go index 58b52b29f..3da70f219 100644 --- a/test/e2e/suite-plugins/suite-plugins-traffic/request_id.go +++ b/test/e2e/suite-plugins/suite-plugins-traffic/request_id.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-traffic: request-id plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-transformation/fault_injection.go b/test/e2e/suite-plugins/suite-plugins-transformation/fault_injection.go index 31bbd0ea8..bf4148758 100644 --- a/test/e2e/suite-plugins/suite-plugins-transformation/fault_injection.go +++ b/test/e2e/suite-plugins/suite-plugins-transformation/fault_injection.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-transformation: fault-injection plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-transformation/proxy_rewrite.go b/test/e2e/suite-plugins/suite-plugins-transformation/proxy_rewrite.go index a2bc6350b..502909555 100644 --- a/test/e2e/suite-plugins/suite-plugins-transformation/proxy_rewrite.go +++ b/test/e2e/suite-plugins/suite-plugins-transformation/proxy_rewrite.go @@ -21,7 +21,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-transformation: proxy-rewrite plugin", func() { diff --git a/test/e2e/suite-plugins/suite-plugins-transformation/response_rewrite.go b/test/e2e/suite-plugins/suite-plugins-transformation/response_rewrite.go index 6d1d344ba..94c3f662e 100644 --- a/test/e2e/suite-plugins/suite-plugins-transformation/response_rewrite.go +++ b/test/e2e/suite-plugins/suite-plugins-transformation/response_rewrite.go @@ -22,7 +22,7 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" "github.com/stretchr/testify/assert" - "github.com/apache/apisix-ingress-controller/test/e2e/scaffold" + "github.com/api7/api7-ingress-controller/test/e2e/scaffold" ) var _ = ginkgo.Describe("suite-plugins-transformation: response rewrite plugin", func() { diff --git a/test/e2e/testbackend/go.mod b/test/e2e/testbackend/go.mod index 5ce930517..13d4b3b13 100644 --- a/test/e2e/testbackend/go.mod +++ b/test/e2e/testbackend/go.mod @@ -1,4 +1,4 @@ -module github.com/apache/apisix-ingress-controller/test/e2e/testbackend +module github.com/api7/api7-ingress-controller/test/e2e/testbackend go 1.17 diff --git a/test/e2e/testtimeout/go.mod b/test/e2e/testtimeout/go.mod index 6840ad399..5b2487f7c 100644 --- a/test/e2e/testtimeout/go.mod +++ b/test/e2e/testtimeout/go.mod @@ -1,3 +1,3 @@ -module github.com/apache/apisix-ingress-controller/test/e2e/testtimeout +module github.com/api7/api7-ingress-controller/test/e2e/testtimeout go 1.17 diff --git a/utils/goimports-reviser.sh b/utils/goimports-reviser.sh index 6221f9316..0008dc502 100755 --- a/utils/goimports-reviser.sh +++ b/utils/goimports-reviser.sh @@ -21,13 +21,13 @@ set -e go install github.com/incu6us/goimports-reviser/v2@latest -PROJECT_NAME=github.com/apache/apisix-ingress-controller +PROJECT_NAME=github.com/api7/api7-ingress-controller while IFS= read -r -d '' file; do goimports-reviser -file-path "$file" -project-name $PROJECT_NAME done < <(find . -name '*.go' -not -path "./test/*" -not -path "./pkg/kube/apisix/*" -print0) -PROJECT_NAME=github.com/apache/apisix-ingress-controller/test/e2e +PROJECT_NAME=github.com/api7/api7-ingress-controller/test/e2e while IFS= read -r -d '' file; do goimports-reviser -file-path "$file" -project-name $PROJECT_NAME done < <(find . -name '*.go' -path "./test/*" -print0) diff --git a/utils/update-codegen.sh b/utils/update-codegen.sh index 327ec2181..2f45e6e8a 100755 --- a/utils/update-codegen.sh +++ b/utils/update-codegen.sh @@ -24,7 +24,7 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}") PROJECT_ROOT="$SCRIPT_ROOT/.." GENERATED_ROOT="$PROJECT_ROOT/.generated" -PKG_NAME="github.com/apache/apisix-ingress-controller" +PKG_NAME="github.com/api7/api7-ingress-controller" # Make sure no pollution rm -rf "$GENERATED_ROOT" diff --git a/utils/verify-codegen.sh b/utils/verify-codegen.sh index 83499bcb8..444ff60c0 100755 --- a/utils/verify-codegen.sh +++ b/utils/verify-codegen.sh @@ -24,7 +24,7 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}") PROJECT_ROOT="$SCRIPT_ROOT/.." GENERATED_ROOT="$PROJECT_ROOT/.generated" -PKG_NAME="github.com/apache/apisix-ingress-controller" +PKG_NAME="github.com/api7/api7-ingress-controller" # Make sure no pollution rm -rf "$GENERATED_ROOT"