Skip to content

chore: rename module from github.com/api7/api7-ingress-controller to github.com/apache/apisix-ingress-controller #131

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

Merged
merged 1 commit into from
May 9, 2025
Merged

chore: rename module from github.com/api7/api7-ingress-controller to github.com/apache/apisix-ingress-controller #131

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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 @@ -24,9 +24,9 @@ CRD_DOCS_OUTPUT ?= docs/crd/api.md
export KUBECONFIG = /tmp/$(KIND_NAME).kubeconfig

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

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
Expand Down
8 changes: 4 additions & 4 deletions PROJECT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ domain: github.com
layout:
- go.kubebuilder.io/v4
projectName: apisix-ingress-controller
repo: github.com/api7/api7-ingress-controller
repo: github.com/apache/apisix-ingress-controller
resources:
- api:
crdVersion: v1
Expand All @@ -15,7 +15,7 @@ resources:
domain: github.com
group: apisix.apache.org
kind: Guestbook
path: github.com/api7/api7-ingress-controller/api/v1alpha1
path: github.com/apache/apisix-ingress-controller/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
Expand All @@ -24,14 +24,14 @@ resources:
domain: github.com
group: apisix.apache.org
kind: GatewayProxy
path: github.com/api7/api7-ingress-controller/api/v1alpha1
path: github.com/apache/apisix-ingress-controller/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
domain: github.com
group: apisix.apache.org
kind: HTTPRoutePolicy
path: github.com/api7/api7-ingress-controller/api/v1alpha1
path: github.com/apache/apisix-ingress-controller/api/v1alpha1
version: v1alpha1
version: "3"
2 changes: 1 addition & 1 deletion cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package main
import (
"github.com/spf13/cobra"

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

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/root/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (

// +kubebuilder:scaffold:imports

"github.com/api7/api7-ingress-controller/internal/controller/config"
"github.com/api7/api7-ingress-controller/internal/manager"
"github.com/api7/api7-ingress-controller/internal/version"
"github.com/apache/apisix-ingress-controller/internal/controller/config"
"github.com/apache/apisix-ingress-controller/internal/manager"
"github.com/apache/apisix-ingress-controller/internal/version"
"github.com/api7/gopkg/pkg/log"
)

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

go 1.22.0

toolchain go1.22.5

require (
github.com/Masterminds/sprig/v3 v3.2.3
github.com/apache/apisix-ingress-controller v1.8.2
github.com/api7/gopkg v0.2.1-0.20230601092738-0f3730f9b57a
github.com/gavv/httpexpect v2.0.0+incompatible
github.com/gavv/httpexpect/v2 v2.16.0
Expand Down
59 changes: 59 additions & 0 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

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

"gopkg.in/yaml.v2"

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

var (
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/config/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package config

import (
"github.com/api7/api7-ingress-controller/internal/types"
"github.com/apache/apisix-ingress-controller/internal/types"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/consumer_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
"github.com/api7/api7-ingress-controller/internal/provider"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
"github.com/apache/apisix-ingress-controller/internal/provider"
)

// ConsumerReconciler reconciles a Gateway object.
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/gateway_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
"github.com/api7/api7-ingress-controller/internal/provider"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
"github.com/apache/apisix-ingress-controller/internal/provider"
)

// GatewayReconciler reconciles a Gateway object.
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/gatewayclass_congroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/predicate"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

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

const (
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/httproute_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ import (
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
"sigs.k8s.io/gateway-api/apis/v1alpha2"

"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
"github.com/api7/api7-ingress-controller/internal/provider"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
"github.com/apache/apisix-ingress-controller/internal/provider"
)

// HTTPRouteReconciler reconciles a GatewayClass object.
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/httproutepolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
"sigs.k8s.io/gateway-api/apis/v1alpha2"

"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
"github.com/api7/api7-ingress-controller/internal/provider"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
"github.com/apache/apisix-ingress-controller/internal/provider"
)

func (r *HTTPRouteReconciler) processHTTPRoutePolicies(tctx *provider.TranslateContext, httpRoute *gatewayv1.HTTPRoute) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/indexer/indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

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

const (
Expand Down
8 changes: 4 additions & 4 deletions internal/controller/ingress_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/source"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/controller/config"
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
"github.com/api7/api7-ingress-controller/internal/provider"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/controller/config"
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
"github.com/apache/apisix-ingress-controller/internal/provider"
)

// IngressReconciler reconciles a Ingress object.
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/ingressclass_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
"github.com/api7/api7-ingress-controller/internal/provider"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
"github.com/apache/apisix-ingress-controller/internal/provider"
)

// IngressClassReconciler reconciles a IngressClass object.
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/label/label.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package label
import (
"sigs.k8s.io/controller-runtime/pkg/client"

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

type Label map[string]string
Expand Down
8 changes: 4 additions & 4 deletions internal/controller/policies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"

"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/controller/config"
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
"github.com/api7/api7-ingress-controller/internal/provider"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/controller/config"
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
"github.com/apache/apisix-ingress-controller/internal/provider"
)

type PolicyTargetKey struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"

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

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

gatewayapisixiov1alpha1 "github.com/api7/api7-ingress-controller/api/v1alpha1"
gatewayapisixiov1alpha1 "github.com/apache/apisix-ingress-controller/api/v1alpha1"
)

// These tests use Ginkgo (BDD-style Go testing framework). Refer to
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/controller/config"
"github.com/api7/api7-ingress-controller/internal/provider"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/controller/config"
"github.com/apache/apisix-ingress-controller/internal/provider"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions internal/manager/controllers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/manager"

"github.com/api7/api7-ingress-controller/internal/controller"
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
"github.com/api7/api7-ingress-controller/internal/provider"
"github.com/apache/apisix-ingress-controller/internal/controller"
"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
"github.com/apache/apisix-ingress-controller/internal/provider"
)

// K8s
Expand Down
6 changes: 3 additions & 3 deletions internal/manager/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/webhook"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/controller/config"
"github.com/api7/api7-ingress-controller/internal/provider/adc"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/controller/config"
"github.com/apache/apisix-ingress-controller/internal/provider/adc"
)

var (
Expand Down
12 changes: 6 additions & 6 deletions internal/provider/adc/adc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

adctypes "github.com/api7/api7-ingress-controller/api/adc"
"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/controller/config"
"github.com/api7/api7-ingress-controller/internal/controller/label"
"github.com/api7/api7-ingress-controller/internal/provider"
"github.com/api7/api7-ingress-controller/internal/provider/adc/translator"
adctypes "github.com/apache/apisix-ingress-controller/api/adc"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/controller/config"
"github.com/apache/apisix-ingress-controller/internal/controller/label"
"github.com/apache/apisix-ingress-controller/internal/provider"
"github.com/apache/apisix-ingress-controller/internal/provider/adc/translator"
)

type adcConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/adc/cache/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package cache

import (
types "github.com/api7/api7-ingress-controller/api/adc"
types "github.com/apache/apisix-ingress-controller/api/adc"
)

type Cache interface {
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/adc/cache/indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"fmt"
"strings"

"github.com/api7/api7-ingress-controller/api/adc"
"github.com/api7/api7-ingress-controller/internal/controller/label"
"github.com/apache/apisix-ingress-controller/api/adc"
"github.com/apache/apisix-ingress-controller/internal/controller/label"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/adc/cache/memdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/hashicorp/go-memdb"
"go.uber.org/zap"

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

var (
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/adc/cache/noop_db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package cache

import (
types "github.com/api7/api7-ingress-controller/api/adc"
types "github.com/apache/apisix-ingress-controller/api/adc"
)

type noopCache struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/adc/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"go.uber.org/zap"
"k8s.io/apimachinery/pkg/types"

"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/provider"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/provider"
)

func (d *adcClient) getConfigsForGatewayProxy(tctx *provider.TranslateContext, gatewayProxy *v1alpha1.GatewayProxy) (*adcConfig, error) {
Expand Down
6 changes: 3 additions & 3 deletions internal/provider/adc/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (

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

adctypes "github.com/api7/api7-ingress-controller/api/adc"
"github.com/api7/api7-ingress-controller/internal/controller/label"
"github.com/api7/api7-ingress-controller/internal/provider/adc/cache"
adctypes "github.com/apache/apisix-ingress-controller/api/adc"
"github.com/apache/apisix-ingress-controller/internal/controller/label"
"github.com/apache/apisix-ingress-controller/internal/provider/adc/cache"
)

type Store struct {
Expand Down
6 changes: 3 additions & 3 deletions internal/provider/adc/translator/consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (

"k8s.io/apimachinery/pkg/types"

adctypes "github.com/api7/api7-ingress-controller/api/adc"
"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/provider"
adctypes "github.com/apache/apisix-ingress-controller/api/adc"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/provider"
)

func (t *Translator) TranslateConsumerV1alpha1(tctx *provider.TranslateContext, consumerV *v1alpha1.Consumer) (*TranslateResult, error) {
Expand Down
10 changes: 5 additions & 5 deletions internal/provider/adc/translator/gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import (
"k8s.io/apimachinery/pkg/types"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

adctypes "github.com/api7/api7-ingress-controller/api/adc"
"github.com/api7/api7-ingress-controller/api/v1alpha1"
"github.com/api7/api7-ingress-controller/internal/controller/label"
"github.com/api7/api7-ingress-controller/internal/id"
"github.com/api7/api7-ingress-controller/internal/provider"
adctypes "github.com/apache/apisix-ingress-controller/api/adc"
"github.com/apache/apisix-ingress-controller/api/v1alpha1"
"github.com/apache/apisix-ingress-controller/internal/controller/label"
"github.com/apache/apisix-ingress-controller/internal/id"
"github.com/apache/apisix-ingress-controller/internal/provider"
)

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