This is an automated email from the ASF dual-hosted git repository.
ronething pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push:
new c7d77325 chore: remove useless provider (#2429)
c7d77325 is described below
commit c7d77325a46d9c158e21a0562db7164c7fa34bd9
Author: Ashing Zheng <axing...@gmail.com>
AuthorDate: Fri Jun 27 09:17:46 2025 +0800
chore: remove useless provider (#2429)
Signed-off-by: ashing <axing...@gmail.com>
---
docs/crd/api.md | 2 +-
docs/template/gv_list.tpl | 2 +-
internal/controller/config/config.go | 4 +---
internal/controller/config/types.go | 1 -
internal/provider/adc/adc.go | 8 --------
test/e2e/framework/framework.go | 3 +--
test/e2e/scaffold/adc.go | 1 -
7 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/docs/crd/api.md b/docs/crd/api.md
index 4b253808..e66c0ba3 100644
--- a/docs/crd/api.md
+++ b/docs/crd/api.md
@@ -4,7 +4,7 @@ slug: /reference/apisix-ingress-controller/crd-reference
description: Explore detailed reference documentation for the custom resource
definitions (CRDs) supported by the APISIX Ingress Controller.
---
-This document provides the API resource description the API7 Ingress
Controller custom resource definitions (CRDs).
+This document provides the API resource description the APISIX Ingress
Controller custom resource definitions (CRDs).
## Packages
- [apisix.apache.org/v1alpha1](#apisixapacheorgv1alpha1)
diff --git a/docs/template/gv_list.tpl b/docs/template/gv_list.tpl
index 31ae052d..d723151a 100644
--- a/docs/template/gv_list.tpl
+++ b/docs/template/gv_list.tpl
@@ -26,7 +26,7 @@ slug: /reference/apisix-ingress-controller/crd-reference
description: Explore detailed reference documentation for the custom resource
definitions (CRDs) supported by the APISIX Ingress Controller.
---
-This document provides the API resource description the API7 Ingress
Controller custom resource definitions (CRDs).
+This document provides the API resource description the APISIX Ingress
Controller custom resource definitions (CRDs).
## Packages
{{- range $groupVersions }}
diff --git a/internal/controller/config/config.go
b/internal/controller/config/config.go
index 774f2728..3eda4493 100644
--- a/internal/controller/config/config.go
+++ b/internal/controller/config/config.go
@@ -51,7 +51,7 @@ func NewDefaultConfig() *Config {
LeaderElection: NewLeaderElection(),
ExecADCTimeout: types.TimeDuration{Duration: 15 *
time.Second},
ProviderConfig: ProviderConfig{
- Type: ProviderTypeAPI7EE,
+ Type: ProviderTypeStandalone,
SyncPeriod: types.TimeDuration{Duration: 0},
InitSyncDelay: types.TimeDuration{Duration: 20 *
time.Minute},
},
@@ -123,8 +123,6 @@ func validateProvider(config ProviderConfig) error {
return fmt.Errorf("sync_period must be greater than 0
for standalone provider")
}
return nil
- case ProviderTypeAPI7EE:
- return nil
default:
return fmt.Errorf("unsupported provider type: %s", config.Type)
}
diff --git a/internal/controller/config/types.go
b/internal/controller/config/types.go
index 8669268f..dfe1dd32 100644
--- a/internal/controller/config/types.go
+++ b/internal/controller/config/types.go
@@ -25,7 +25,6 @@ type ProviderType string
const (
ProviderTypeStandalone ProviderType = "apisix-standalone"
- ProviderTypeAPI7EE ProviderType = "api7ee"
ProviderTypeAPISIX ProviderType = "apisix"
)
diff --git a/internal/provider/adc/adc.go b/internal/provider/adc/adc.go
index 96f6338e..4cf076d8 100644
--- a/internal/provider/adc/adc.go
+++ b/internal/provider/adc/adc.go
@@ -52,7 +52,6 @@ type BackendMode string
const (
BackendModeAPISIXStandalone string = "apisix-standalone"
- BackendModeAPI7EE string = "api7ee"
BackendModeAPISIX string = "apisix"
)
@@ -266,13 +265,6 @@ func (d *adcClient) Delete(ctx context.Context, obj
client.Object) error {
})
}
return nil
- case BackendModeAPI7EE:
- return d.sync(ctx, Task{
- Name: obj.GetName(),
- Labels: labels,
- ResourceTypes: resourceTypes,
- configs: configs,
- })
default:
log.Errorw("unknown backend mode", zap.String("mode",
d.BackendMode))
return errors.New("unknown backend mode: " + d.BackendMode)
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
index 1c8d22d9..e4e55ff1 100644
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -32,8 +32,7 @@ import (
)
var (
- // TODO: set namespace from env
- _namespace = "api7-ee-e2e"
+ _namespace = "apisix-e2e"
_framework *Framework
)
diff --git a/test/e2e/scaffold/adc.go b/test/e2e/scaffold/adc.go
index 18d7d78c..a04344fb 100644
--- a/test/e2e/scaffold/adc.go
+++ b/test/e2e/scaffold/adc.go
@@ -99,7 +99,6 @@ func (a *adcDataplaneResource) Consumer() ConsumerResource {
}
func init() {
- // dashboard sdk log
l, err := log.NewLogger(
log.WithOutputFile("stderr"),
log.WithLogLevel("debug"),
