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.

0 commit comments

Comments
 (0)