Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: change the module from github.com/api7/ingress-controller to github.com/apache/apisix-ingress-controller #220

Merged
merged 1 commit into from
Feb 2, 2021
Merged

chore: change the module from github.com/api7/ingress-controller to github.com/apache/apisix-ingress-controller #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ ifeq ($(OSARCH), x86_64)
OSARCH = amd64
endif

VERSYM="github.com/api7/ingress-controller/pkg/version._buildVersion"
GITSHASYM="github.com/api7/ingress-controller/pkg/version._buildGitRevision"
BUILDOSSYM="github.com/api7/ingress-controller/pkg/version._buildOS"
VERSYM="github.com/apache/apisix-ingress-controller/pkg/version._buildVersion"
GITSHASYM="github.com/apache/apisix-ingress-controller/pkg/version._buildGitRevision"
BUILDOSSYM="github.com/apache/apisix-ingress-controller/pkg/version._buildOS"
GO_LDFLAGS ?= "-X=$(VERSYM)=$(VERSION) -X=$(GITSHASYM)=$(GITSHA) -X=$(BUILDOSSYM)=$(OSNAME)/$(OSARCH)"
E2E_CONCURRENCY ?= 1
E2E_SKIP_BUILD ?= 0
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ This project is currently considered experimental.

- Can be packaged as a stand-alone binary, keep in sync with the ingress definition.

- [CRD design](https://github.com/api7/ingress-controller/issues/3)
- [CRD design](https://github.com/apache/apisix-ingress-controller/issues/3)

### 2. `APISIX types` Submodule

Expand Down
4 changes: 2 additions & 2 deletions cmd/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (

"github.com/spf13/cobra"

"github.com/api7/ingress-controller/cmd/ingress"
"github.com/api7/ingress-controller/pkg/version"
"github.com/apache/apisix-ingress-controller/cmd/ingress"
"github.com/apache/apisix-ingress-controller/pkg/version"
)

func newVersionCommand() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions cmd/ingress/ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (

"github.com/spf13/cobra"

"github.com/api7/ingress-controller/pkg/config"
"github.com/api7/ingress-controller/pkg/ingress/controller"
"github.com/api7/ingress-controller/pkg/log"
"github.com/apache/apisix-ingress-controller/pkg/config"
"github.com/apache/apisix-ingress-controller/pkg/ingress/controller"
"github.com/apache/apisix-ingress-controller/pkg/log"
)

func dief(template string, args ...interface{}) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/ingress/ingress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (

"github.com/stretchr/testify/assert"

"github.com/api7/ingress-controller/pkg/config"
"github.com/api7/ingress-controller/pkg/log"
"github.com/api7/ingress-controller/pkg/types"
"github.com/apache/apisix-ingress-controller/pkg/config"
"github.com/apache/apisix-ingress-controller/pkg/log"
"github.com/apache/apisix-ingress-controller/pkg/types"
)

type fakeWriteSyncer struct {
Expand Down
2 changes: 1 addition & 1 deletion docs/design.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Apache APISIX ingress for Kubernetes.

- can be packaged as a stand-alone binary, keep in sync with the ingress definition;

- [CRD design](https://github.com/api7/ingress-controller/issues/3)
- [CRD design](https://github.com/apache/apisix-ingress-controller/issues/3)

### 2.Types

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/api7/ingress-controller
module github.com/apache/apisix-ingress-controller

go 1.13

Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"
"os"

"github.com/api7/ingress-controller/cmd"
"github.com/apache/apisix-ingress-controller/cmd"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (

"github.com/gin-gonic/gin"

apirouter "github.com/api7/ingress-controller/pkg/api/router"
"github.com/api7/ingress-controller/pkg/config"
"github.com/api7/ingress-controller/pkg/log"
"github.com/api7/ingress-controller/pkg/types"
apirouter "github.com/apache/apisix-ingress-controller/pkg/api/router"
"github.com/apache/apisix-ingress-controller/pkg/config"
"github.com/apache/apisix-ingress-controller/pkg/log"
"github.com/apache/apisix-ingress-controller/pkg/types"
)

// Server represents the API Server in ingress-apisix-controller.
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/api7/ingress-controller/pkg/config"
"github.com/apache/apisix-ingress-controller/pkg/config"
)

func TestServer(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apisix/apisix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package apisix
import (
"context"

v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

// APISIX is the unified client tool to communicate with APISIX.
Expand Down
2 changes: 1 addition & 1 deletion pkg/apisix/cache/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

package cache

import v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
import v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"

// Cache defines the necessary behaviors that the cache object should have.
// Note this interface is for APISIX, not for generic purpose, it supports
Expand Down
2 changes: 1 addition & 1 deletion pkg/apisix/cache/memdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/hashicorp/go-memdb"

v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/apisix/cache/memdb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/stretchr/testify/assert"

v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

func TestMemDBCacheRoute(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apisix/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"go.uber.org/zap"
"k8s.io/apimachinery/pkg/util/wait"

"github.com/api7/ingress-controller/pkg/apisix/cache"
"github.com/api7/ingress-controller/pkg/log"
"github.com/apache/apisix-ingress-controller/pkg/apisix/cache"
"github.com/apache/apisix-ingress-controller/pkg/log"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/apisix/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"context"
"testing"

v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/apisix/nonexistentclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package apisix
import (
"context"

"github.com/api7/ingress-controller/pkg/apisix/cache"
v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
"github.com/apache/apisix-ingress-controller/pkg/apisix/cache"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

type nonExistentCluster struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apisix/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"strings"

"github.com/api7/ingress-controller/pkg/log"
v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
"github.com/apache/apisix-ingress-controller/pkg/log"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

type getResponse struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/apisix/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (

"go.uber.org/zap"

"github.com/api7/ingress-controller/pkg/apisix/cache"
"github.com/api7/ingress-controller/pkg/id"
"github.com/api7/ingress-controller/pkg/log"
v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
"github.com/apache/apisix-ingress-controller/pkg/apisix/cache"
"github.com/apache/apisix-ingress-controller/pkg/id"
"github.com/apache/apisix-ingress-controller/pkg/log"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

type routeReqBody struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apisix/route_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (

"github.com/stretchr/testify/assert"

v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

type fakeAPISIXRouteSrv struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/apisix/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (

"go.uber.org/zap"

"github.com/api7/ingress-controller/pkg/apisix/cache"
"github.com/api7/ingress-controller/pkg/id"
"github.com/api7/ingress-controller/pkg/log"
v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
"github.com/apache/apisix-ingress-controller/pkg/apisix/cache"
"github.com/apache/apisix-ingress-controller/pkg/id"
"github.com/apache/apisix-ingress-controller/pkg/log"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

type serviceClient struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apisix/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

"golang.org/x/net/nettest"

v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
"github.com/stretchr/testify/assert"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/apisix/ssl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (

"go.uber.org/zap"

"github.com/api7/ingress-controller/pkg/apisix/cache"
"github.com/api7/ingress-controller/pkg/id"
"github.com/api7/ingress-controller/pkg/log"
v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
"github.com/apache/apisix-ingress-controller/pkg/apisix/cache"
"github.com/apache/apisix-ingress-controller/pkg/id"
"github.com/apache/apisix-ingress-controller/pkg/log"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

type sslClient struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apisix/ssl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"strings"
"testing"

v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
"github.com/stretchr/testify/assert"
"golang.org/x/net/nettest"
)
Expand Down
8 changes: 4 additions & 4 deletions pkg/apisix/upstream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (

"go.uber.org/zap"

"github.com/api7/ingress-controller/pkg/apisix/cache"
"github.com/api7/ingress-controller/pkg/id"
"github.com/api7/ingress-controller/pkg/log"
v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
"github.com/apache/apisix-ingress-controller/pkg/apisix/cache"
"github.com/apache/apisix-ingress-controller/pkg/id"
"github.com/apache/apisix-ingress-controller/pkg/log"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

type upstreamClient struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apisix/upstream_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"
"testing"

v1 "github.com/api7/ingress-controller/pkg/types/apisix/v1"
v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"

"github.com/stretchr/testify/assert"

Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"gopkg.in/yaml.v2"
v1 "k8s.io/api/core/v1"

"github.com/api7/ingress-controller/pkg/types"
"github.com/apache/apisix-ingress-controller/pkg/types"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/api7/ingress-controller/pkg/types"
"github.com/apache/apisix-ingress-controller/pkg/types"
)

func TestNewConfigFromFile(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/ingress/apisix/annotation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package apisix
import (
"strconv"

seven "github.com/api7/ingress-controller/pkg/seven/apisix"
apisix "github.com/api7/ingress-controller/pkg/types/apisix/v1"
seven "github.com/apache/apisix-ingress-controller/pkg/seven/apisix"
apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

// BuildAnnotation return plugins and group
Expand Down
2 changes: 1 addition & 1 deletion pkg/ingress/apisix/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package apisix
import (
"strconv"

"github.com/api7/ingress-controller/pkg/seven/apisix"
"github.com/apache/apisix-ingress-controller/pkg/seven/apisix"
)

type CorsYaml struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/ingress/apisix/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package apisix
import (
"strconv"

"github.com/api7/ingress-controller/pkg/ingress/endpoint"
configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1"
"github.com/api7/ingress-controller/pkg/seven/conf"
apisix "github.com/api7/ingress-controller/pkg/types/apisix/v1"
"github.com/apache/apisix-ingress-controller/pkg/ingress/endpoint"
configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1"
"github.com/apache/apisix-ingress-controller/pkg/seven/conf"
apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions pkg/ingress/apisix/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package apisix
import (
"strconv"

"github.com/api7/ingress-controller/pkg/ingress/endpoint"
configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1"
"github.com/api7/ingress-controller/pkg/seven/conf"
apisix "github.com/api7/ingress-controller/pkg/types/apisix/v1"
"github.com/apache/apisix-ingress-controller/pkg/ingress/endpoint"
configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1"
"github.com/apache/apisix-ingress-controller/pkg/seven/conf"
apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions pkg/ingress/apisix/tls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

ingressConf "github.com/api7/ingress-controller/pkg/kube"
configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1"
"github.com/api7/ingress-controller/pkg/seven/conf"
apisix "github.com/api7/ingress-controller/pkg/types/apisix/v1"
ingressConf "github.com/apache/apisix-ingress-controller/pkg/kube"
configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1"
"github.com/apache/apisix-ingress-controller/pkg/seven/conf"
apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

type ApisixTLSCRD configv1.ApisixTLS
Expand Down
8 changes: 4 additions & 4 deletions pkg/ingress/apisix/tls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"gopkg.in/yaml.v2"
v1 "k8s.io/api/core/v1"

apisixhttp "github.com/api7/ingress-controller/pkg/apisix"
"github.com/api7/ingress-controller/pkg/seven/conf"
"github.com/api7/ingress-controller/pkg/seven/utils"
apisix "github.com/api7/ingress-controller/pkg/types/apisix/v1"
apisixhttp "github.com/apache/apisix-ingress-controller/pkg/apisix"
"github.com/apache/apisix-ingress-controller/pkg/seven/conf"
"github.com/apache/apisix-ingress-controller/pkg/seven/utils"
apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

func TestConvert(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions pkg/ingress/apisix/upstream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package apisix
import (
"strconv"

"github.com/api7/ingress-controller/pkg/ingress/endpoint"
configv1 "github.com/api7/ingress-controller/pkg/kube/apisix/apis/config/v1"
"github.com/api7/ingress-controller/pkg/seven/conf"
apisix "github.com/api7/ingress-controller/pkg/types/apisix/v1"
"github.com/apache/apisix-ingress-controller/pkg/ingress/endpoint"
configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1"
"github.com/apache/apisix-ingress-controller/pkg/seven/conf"
apisix "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

const (
Expand Down