Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docs/crd/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/template/gv_list.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 1 addition & 3 deletions internal/controller/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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},
},
Expand Down Expand Up @@ -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)
}
Expand Down
1 change: 0 additions & 1 deletion internal/controller/config/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ type ProviderType string

const (
ProviderTypeStandalone ProviderType = "apisix-standalone"
ProviderTypeAPI7EE ProviderType = "api7ee"
ProviderTypeAPISIX ProviderType = "apisix"
)

Expand Down
8 changes: 0 additions & 8 deletions internal/provider/adc/adc.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ type BackendMode string

const (
BackendModeAPISIXStandalone string = "apisix-standalone"
BackendModeAPI7EE string = "api7ee"
BackendModeAPISIX string = "apisix"
)

Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions test/e2e/framework/framework.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ import (
)

var (
// TODO: set namespace from env
_namespace = "api7-ee-e2e"
_namespace = "apisix-e2e"
_framework *Framework
)

Expand Down
1 change: 0 additions & 1 deletion test/e2e/scaffold/adc.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ func (a *adcDataplaneResource) Consumer() ConsumerResource {
}

func init() {
// dashboard sdk log
l, err := log.NewLogger(
log.WithOutputFile("stderr"),
log.WithLogLevel("debug"),
Expand Down
Loading