Skip to content

Commit c7d7732

Browse files
authored
chore: remove useless provider (#2429)
Signed-off-by: ashing <[email protected]>
1 parent cfa8fd5 commit c7d7732

File tree

7 files changed

+4
-17
lines changed

7 files changed

+4
-17
lines changed

docs/crd/api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ slug: /reference/apisix-ingress-controller/crd-reference
44
description: Explore detailed reference documentation for the custom resource definitions (CRDs) supported by the APISIX Ingress Controller.
55
---
66

7-
This document provides the API resource description the API7 Ingress Controller custom resource definitions (CRDs).
7+
This document provides the API resource description the APISIX Ingress Controller custom resource definitions (CRDs).
88

99
## Packages
1010
- [apisix.apache.org/v1alpha1](#apisixapacheorgv1alpha1)

docs/template/gv_list.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ slug: /reference/apisix-ingress-controller/crd-reference
2626
description: Explore detailed reference documentation for the custom resource definitions (CRDs) supported by the APISIX Ingress Controller.
2727
---
2828

29-
This document provides the API resource description the API7 Ingress Controller custom resource definitions (CRDs).
29+
This document provides the API resource description the APISIX Ingress Controller custom resource definitions (CRDs).
3030

3131
## Packages
3232
{{- range $groupVersions }}

internal/controller/config/config.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func NewDefaultConfig() *Config {
5151
LeaderElection: NewLeaderElection(),
5252
ExecADCTimeout: types.TimeDuration{Duration: 15 * time.Second},
5353
ProviderConfig: ProviderConfig{
54-
Type: ProviderTypeAPI7EE,
54+
Type: ProviderTypeStandalone,
5555
SyncPeriod: types.TimeDuration{Duration: 0},
5656
InitSyncDelay: types.TimeDuration{Duration: 20 * time.Minute},
5757
},
@@ -123,8 +123,6 @@ func validateProvider(config ProviderConfig) error {
123123
return fmt.Errorf("sync_period must be greater than 0 for standalone provider")
124124
}
125125
return nil
126-
case ProviderTypeAPI7EE:
127-
return nil
128126
default:
129127
return fmt.Errorf("unsupported provider type: %s", config.Type)
130128
}

internal/controller/config/types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ type ProviderType string
2525

2626
const (
2727
ProviderTypeStandalone ProviderType = "apisix-standalone"
28-
ProviderTypeAPI7EE ProviderType = "api7ee"
2928
ProviderTypeAPISIX ProviderType = "apisix"
3029
)
3130

internal/provider/adc/adc.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ type BackendMode string
5252

5353
const (
5454
BackendModeAPISIXStandalone string = "apisix-standalone"
55-
BackendModeAPI7EE string = "api7ee"
5655
BackendModeAPISIX string = "apisix"
5756
)
5857

@@ -266,13 +265,6 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
266265
})
267266
}
268267
return nil
269-
case BackendModeAPI7EE:
270-
return d.sync(ctx, Task{
271-
Name: obj.GetName(),
272-
Labels: labels,
273-
ResourceTypes: resourceTypes,
274-
configs: configs,
275-
})
276268
default:
277269
log.Errorw("unknown backend mode", zap.String("mode", d.BackendMode))
278270
return errors.New("unknown backend mode: " + d.BackendMode)

test/e2e/framework/framework.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ import (
3232
)
3333

3434
var (
35-
// TODO: set namespace from env
36-
_namespace = "api7-ee-e2e"
35+
_namespace = "apisix-e2e"
3736
_framework *Framework
3837
)
3938

test/e2e/scaffold/adc.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ func (a *adcDataplaneResource) Consumer() ConsumerResource {
9999
}
100100

101101
func init() {
102-
// dashboard sdk log
103102
l, err := log.NewLogger(
104103
log.WithOutputFile("stderr"),
105104
log.WithLogLevel("debug"),

0 commit comments

Comments
 (0)