Skip to content

Commit 718c0fd

Browse files
committed
chooise 3.8
1 parent e5b7627 commit 718c0fd

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG ENABLE_PROXY=false
33
FROM node:22 AS node_builder
44

55
ARG TARGETARCH
6-
ARG ADC_COMMIT=2449ca81e3c61169f8c1e59efb4c1173a766bce2
6+
ARG ADC_COMMIT=d0373052ba8379b9d63fceb726292becf1a8b39c
77

88
WORKDIR /app
99

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ENVTEST_K8S_VERSION = 1.30.0
1212
KIND_NAME ?= apisix-ingress-cluster
1313
GATEAY_API_VERSION ?= v1.2.0
1414

15-
DASHBOARD_VERSION ?= dev
15+
DASHBOARD_VERSION ?= v3.8.0
1616
TEST_TIMEOUT ?= 45m
1717

1818
# CRD Reference Documentation

internal/controller/config/config.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func NewDefaultConfig() *Config {
4646
LeaderElection: NewLeaderElection(),
4747
ExecADCTimeout: types.TimeDuration{Duration: 15 * time.Second},
4848
ProviderConfig: ProviderConfig{
49-
Type: ProviderTypeStandalone,
49+
Type: ProviderTypeAPI7EE,
5050
SyncPeriod: types.TimeDuration{Duration: 0},
5151
InitSyncDelay: types.TimeDuration{Duration: 20 * time.Minute},
5252
},
@@ -105,9 +105,6 @@ func (c *Config) Validate() error {
105105
if c.ControllerName == "" {
106106
return fmt.Errorf("controller_name is required")
107107
}
108-
if c.ProviderConfig.Type == "" {
109-
c.ProviderConfig.Type = ProviderTypeAPI7EE
110-
}
111108
if err := validateProviderType(c.ProviderConfig.Type); err != nil {
112109
return err
113110
}

internal/provider/adc/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (o *Options) ApplyToList(lo *Options) {
3535
if o.InitSyncDelay > 0 {
3636
lo.InitSyncDelay = o.InitSyncDelay
3737
}
38-
if o.BackendMode == "" {
38+
if o.BackendMode != "" {
3939
lo.BackendMode = o.BackendMode
4040
}
4141
}

0 commit comments

Comments
 (0)