Skip to content

Commit 1d7c332

Browse files
dspodspo
authored
chore: Update import paths to reflect new repository structure (#131)
1 parent b2025b4 commit 1d7c332

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+237
-179
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ CRD_DOCS_OUTPUT ?= docs/crd/api.md
2424
export KUBECONFIG = /tmp/$(KIND_NAME).kubeconfig
2525

2626
# go
27-
VERSYM="github.com/api7/api7-ingress-controller/internal/version._buildVersion"
28-
GITSHASYM="github.com/api7/api7-ingress-controller/internal/version._buildGitRevision"
29-
BUILDOSSYM="github.com/api7/api7-ingress-controller/internal/version._buildOS"
27+
VERSYM="github.com/apache/apisix-ingress-controller/internal/version._buildVersion"
28+
GITSHASYM="github.com/apache/apisix-ingress-controller/internal/version._buildGitRevision"
29+
BUILDOSSYM="github.com/apache/apisix-ingress-controller/internal/version._buildOS"
3030
GO_LDFLAGS ?= "-X=$(VERSYM)=$(VERSION) -X=$(GITSHASYM)=$(GITSHA) -X=$(BUILDOSSYM)=$(OSNAME)/$(OSARCH)"
3131

3232
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)

‎PROJECT

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ domain: github.com
66
layout:
77
- go.kubebuilder.io/v4
88
projectName: apisix-ingress-controller
9-
repo: github.com/api7/api7-ingress-controller
9+
repo: github.com/apache/apisix-ingress-controller
1010
resources:
1111
- api:
1212
crdVersion: v1
@@ -15,7 +15,7 @@ resources:
1515
domain: github.com
1616
group: apisix.apache.org
1717
kind: Guestbook
18-
path: github.com/api7/api7-ingress-controller/api/v1alpha1
18+
path: github.com/apache/apisix-ingress-controller/api/v1alpha1
1919
version: v1alpha1
2020
- api:
2121
crdVersion: v1
@@ -24,14 +24,14 @@ resources:
2424
domain: github.com
2525
group: apisix.apache.org
2626
kind: GatewayProxy
27-
path: github.com/api7/api7-ingress-controller/api/v1alpha1
27+
path: github.com/apache/apisix-ingress-controller/api/v1alpha1
2828
version: v1alpha1
2929
- api:
3030
crdVersion: v1
3131
namespaced: true
3232
domain: github.com
3333
group: apisix.apache.org
3434
kind: HTTPRoutePolicy
35-
path: github.com/api7/api7-ingress-controller/api/v1alpha1
35+
path: github.com/apache/apisix-ingress-controller/api/v1alpha1
3636
version: v1alpha1
3737
version: "3"

‎cmd/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ package main
1515
import (
1616
"github.com/spf13/cobra"
1717

18-
"github.com/api7/api7-ingress-controller/cmd/root"
18+
"github.com/apache/apisix-ingress-controller/cmd/root"
1919
)
2020

2121
func main() {

‎cmd/root/root.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import (
3030

3131
// +kubebuilder:scaffold:imports
3232

33-
"github.com/api7/api7-ingress-controller/internal/controller/config"
34-
"github.com/api7/api7-ingress-controller/internal/manager"
35-
"github.com/api7/api7-ingress-controller/internal/version"
33+
"github.com/apache/apisix-ingress-controller/internal/controller/config"
34+
"github.com/apache/apisix-ingress-controller/internal/manager"
35+
"github.com/apache/apisix-ingress-controller/internal/version"
3636
"github.com/api7/gopkg/pkg/log"
3737
)
3838

‎go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
module github.com/api7/api7-ingress-controller
1+
module github.com/apache/apisix-ingress-controller
22

33
go 1.22.0
44

55
toolchain go1.22.5
66

77
require (
88
github.com/Masterminds/sprig/v3 v3.2.3
9-
github.com/apache/apisix-ingress-controller v1.8.2
109
github.com/api7/gopkg v0.2.1-0.20230601092738-0f3730f9b57a
1110
github.com/gavv/httpexpect v2.0.0+incompatible
1211
github.com/gavv/httpexpect/v2 v2.16.0

‎go.sum

Lines changed: 59 additions & 0 deletions
Large diffs are not rendered by default.

‎internal/controller/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"gopkg.in/yaml.v2"
2525

26-
"github.com/api7/api7-ingress-controller/internal/types"
26+
"github.com/apache/apisix-ingress-controller/internal/types"
2727
)
2828

2929
var (

‎internal/controller/config/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
package config
1414

1515
import (
16-
"github.com/api7/api7-ingress-controller/internal/types"
16+
"github.com/apache/apisix-ingress-controller/internal/types"
1717
)
1818

1919
const (

‎internal/controller/consumer_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import (
3030
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3131
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
3232

33-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
34-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
35-
"github.com/api7/api7-ingress-controller/internal/provider"
33+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
34+
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
35+
"github.com/apache/apisix-ingress-controller/internal/provider"
3636
)
3737

3838
// ConsumerReconciler reconciles a Gateway object.

‎internal/controller/gateway_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ import (
3232
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3333
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
3434

35-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
36-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
37-
"github.com/api7/api7-ingress-controller/internal/provider"
35+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
36+
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
37+
"github.com/apache/apisix-ingress-controller/internal/provider"
3838
)
3939

4040
// GatewayReconciler reconciles a Gateway object.

‎internal/controller/gatewayclass_congroller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/predicate"
2929
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
3030

31-
"github.com/api7/api7-ingress-controller/internal/controller/config"
32-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
31+
"github.com/apache/apisix-ingress-controller/internal/controller/config"
32+
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
3333
)
3434

3535
const (

‎internal/controller/httproute_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import (
3737
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
3838
"sigs.k8s.io/gateway-api/apis/v1alpha2"
3939

40-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
41-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
42-
"github.com/api7/api7-ingress-controller/internal/provider"
40+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
41+
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
42+
"github.com/apache/apisix-ingress-controller/internal/provider"
4343
)
4444

4545
// HTTPRouteReconciler reconciles a GatewayClass object.

‎internal/controller/httproutepolicy.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
2626
"sigs.k8s.io/gateway-api/apis/v1alpha2"
2727

28-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
29-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
30-
"github.com/api7/api7-ingress-controller/internal/provider"
28+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
29+
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
30+
"github.com/apache/apisix-ingress-controller/internal/provider"
3131
)
3232

3333
func (r *HTTPRouteReconciler) processHTTPRoutePolicies(tctx *provider.TranslateContext, httpRoute *gatewayv1.HTTPRoute) error {

‎internal/controller/indexer/indexer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"sigs.k8s.io/controller-runtime/pkg/client"
2323
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
2424

25-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
25+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
2626
)
2727

2828
const (

‎internal/controller/ingress_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ import (
3838
"sigs.k8s.io/controller-runtime/pkg/source"
3939
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
4040

41-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
42-
"github.com/api7/api7-ingress-controller/internal/controller/config"
43-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
44-
"github.com/api7/api7-ingress-controller/internal/provider"
41+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
42+
"github.com/apache/apisix-ingress-controller/internal/controller/config"
43+
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
44+
"github.com/apache/apisix-ingress-controller/internal/provider"
4545
)
4646

4747
// IngressReconciler reconciles a Ingress object.

‎internal/controller/ingressclass_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929
"sigs.k8s.io/controller-runtime/pkg/predicate"
3030
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3131

32-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
33-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
34-
"github.com/api7/api7-ingress-controller/internal/provider"
32+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
33+
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
34+
"github.com/apache/apisix-ingress-controller/internal/provider"
3535
)
3636

3737
// IngressClassReconciler reconciles a IngressClass object.

‎internal/controller/label/label.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ package label
1515
import (
1616
"sigs.k8s.io/controller-runtime/pkg/client"
1717

18-
"github.com/api7/api7-ingress-controller/internal/controller/config"
18+
"github.com/apache/apisix-ingress-controller/internal/controller/config"
1919
)
2020

2121
type Label map[string]string

‎internal/controller/policies.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
2828
gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
2929

30-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
31-
"github.com/api7/api7-ingress-controller/internal/controller/config"
32-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
33-
"github.com/api7/api7-ingress-controller/internal/provider"
30+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
31+
"github.com/apache/apisix-ingress-controller/internal/controller/config"
32+
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
33+
"github.com/apache/apisix-ingress-controller/internal/provider"
3434
)
3535

3636
type PolicyTargetKey struct {

‎internal/controller/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"sigs.k8s.io/controller-runtime/pkg/client"
2020
gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
2121

22-
"github.com/api7/api7-ingress-controller/internal/provider"
22+
"github.com/apache/apisix-ingress-controller/internal/provider"
2323
)
2424

2525
const (

‎internal/controller/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
logf "sigs.k8s.io/controller-runtime/pkg/log"
2828
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2929

30-
gatewayapisixiov1alpha1 "github.com/api7/api7-ingress-controller/api/v1alpha1"
30+
gatewayapisixiov1alpha1 "github.com/apache/apisix-ingress-controller/api/v1alpha1"
3131
)
3232

3333
// These tests use Ginkgo (BDD-style Go testing framework). Refer to

‎internal/controller/utils.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import (
3131
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3232
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
3333

34-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
35-
"github.com/api7/api7-ingress-controller/internal/controller/config"
36-
"github.com/api7/api7-ingress-controller/internal/provider"
34+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
35+
"github.com/apache/apisix-ingress-controller/internal/controller/config"
36+
"github.com/apache/apisix-ingress-controller/internal/provider"
3737
)
3838

3939
const (

‎internal/manager/controllers.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
ctrl "sigs.k8s.io/controller-runtime"
1919
"sigs.k8s.io/controller-runtime/pkg/manager"
2020

21-
"github.com/api7/api7-ingress-controller/internal/controller"
22-
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
23-
"github.com/api7/api7-ingress-controller/internal/provider"
21+
"github.com/apache/apisix-ingress-controller/internal/controller"
22+
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
23+
"github.com/apache/apisix-ingress-controller/internal/provider"
2424
)
2525

2626
// K8s

‎internal/manager/run.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import (
3030
"sigs.k8s.io/controller-runtime/pkg/webhook"
3131
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
3232

33-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
34-
"github.com/api7/api7-ingress-controller/internal/controller/config"
35-
"github.com/api7/api7-ingress-controller/internal/provider/adc"
33+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
34+
"github.com/apache/apisix-ingress-controller/internal/controller/config"
35+
"github.com/apache/apisix-ingress-controller/internal/provider/adc"
3636
)
3737

3838
var (

‎internal/provider/adc/adc.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
3030

31-
adctypes "github.com/api7/api7-ingress-controller/api/adc"
32-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
33-
"github.com/api7/api7-ingress-controller/internal/controller/config"
34-
"github.com/api7/api7-ingress-controller/internal/controller/label"
35-
"github.com/api7/api7-ingress-controller/internal/provider"
36-
"github.com/api7/api7-ingress-controller/internal/provider/adc/translator"
31+
adctypes "github.com/apache/apisix-ingress-controller/api/adc"
32+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
33+
"github.com/apache/apisix-ingress-controller/internal/controller/config"
34+
"github.com/apache/apisix-ingress-controller/internal/controller/label"
35+
"github.com/apache/apisix-ingress-controller/internal/provider"
36+
"github.com/apache/apisix-ingress-controller/internal/provider/adc/translator"
3737
)
3838

3939
type adcConfig struct {

‎internal/provider/adc/cache/cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
package cache
1414

1515
import (
16-
types "github.com/api7/api7-ingress-controller/api/adc"
16+
types "github.com/apache/apisix-ingress-controller/api/adc"
1717
)
1818

1919
type Cache interface {

‎internal/provider/adc/cache/indexer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"fmt"
1717
"strings"
1818

19-
"github.com/api7/api7-ingress-controller/api/adc"
20-
"github.com/api7/api7-ingress-controller/internal/controller/label"
19+
"github.com/apache/apisix-ingress-controller/api/adc"
20+
"github.com/apache/apisix-ingress-controller/internal/controller/label"
2121
)
2222

2323
const (

‎internal/provider/adc/cache/memdb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/hashicorp/go-memdb"
2020
"go.uber.org/zap"
2121

22-
types "github.com/api7/api7-ingress-controller/api/adc"
22+
types "github.com/apache/apisix-ingress-controller/api/adc"
2323
)
2424

2525
var (

‎internal/provider/adc/cache/noop_db.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
package cache
1414

1515
import (
16-
types "github.com/api7/api7-ingress-controller/api/adc"
16+
types "github.com/apache/apisix-ingress-controller/api/adc"
1717
)
1818

1919
type noopCache struct {

‎internal/provider/adc/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"go.uber.org/zap"
2121
"k8s.io/apimachinery/pkg/types"
2222

23-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
24-
"github.com/api7/api7-ingress-controller/internal/provider"
23+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
24+
"github.com/apache/apisix-ingress-controller/internal/provider"
2525
)
2626

2727
func (d *adcClient) getConfigsForGatewayProxy(tctx *provider.TranslateContext, gatewayProxy *v1alpha1.GatewayProxy) (*adcConfig, error) {

‎internal/provider/adc/store.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717

1818
"github.com/api7/gopkg/pkg/log"
1919

20-
adctypes "github.com/api7/api7-ingress-controller/api/adc"
21-
"github.com/api7/api7-ingress-controller/internal/controller/label"
22-
"github.com/api7/api7-ingress-controller/internal/provider/adc/cache"
20+
adctypes "github.com/apache/apisix-ingress-controller/api/adc"
21+
"github.com/apache/apisix-ingress-controller/internal/controller/label"
22+
"github.com/apache/apisix-ingress-controller/internal/provider/adc/cache"
2323
)
2424

2525
type Store struct {

‎internal/provider/adc/translator/consumer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717

1818
"k8s.io/apimachinery/pkg/types"
1919

20-
adctypes "github.com/api7/api7-ingress-controller/api/adc"
21-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
22-
"github.com/api7/api7-ingress-controller/internal/provider"
20+
adctypes "github.com/apache/apisix-ingress-controller/api/adc"
21+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
22+
"github.com/apache/apisix-ingress-controller/internal/provider"
2323
)
2424

2525
func (t *Translator) TranslateConsumerV1alpha1(tctx *provider.TranslateContext, consumerV *v1alpha1.Consumer) (*TranslateResult, error) {

‎internal/provider/adc/translator/gateway.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
"k8s.io/apimachinery/pkg/types"
2626
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
2727

28-
adctypes "github.com/api7/api7-ingress-controller/api/adc"
29-
"github.com/api7/api7-ingress-controller/api/v1alpha1"
30-
"github.com/api7/api7-ingress-controller/internal/controller/label"
31-
"github.com/api7/api7-ingress-controller/internal/id"
32-
"github.com/api7/api7-ingress-controller/internal/provider"
28+
adctypes "github.com/apache/apisix-ingress-controller/api/adc"
29+
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
30+
"github.com/apache/apisix-ingress-controller/internal/controller/label"
31+
"github.com/apache/apisix-ingress-controller/internal/id"
32+
"github.com/apache/apisix-ingress-controller/internal/provider"
3333
)
3434

3535
func (t *Translator) TranslateGateway(tctx *provider.TranslateContext, obj *gatewayv1.Gateway) (*TranslateResult, error) {

0 commit comments

Comments
 (0)