fix: r

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

internal/controller/config/config.go

@@ -54,8 +54,6 @@ func NewDefaultConfig() *Config {
 			Type:          ProviderTypeAPI7EE,
 			SyncPeriod:    types.TimeDuration{Duration: 0},
 			InitSyncDelay: types.TimeDuration{Duration: 20 * time.Minute},
-			ADCServerURL:  "http://127.0.0.1:3000",
-			UseADCServer:  true,
 		},
 	}
 }

internal/controller/config/types.go

@@ -84,6 +84,4 @@ type ProviderConfig struct {
 	Type          ProviderType       `json:"type" yaml:"type"`
 	SyncPeriod    types.TimeDuration `json:"sync_period" yaml:"sync_period"`
 	InitSyncDelay types.TimeDuration `json:"init_sync_delay" yaml:"init_sync_delay"`
-	ADCServerURL  string             `json:"adc_server_url,omitempty" yaml:"adc_server_url,omitempty"`
-	UseADCServer  bool               `json:"use_adc_server,omitempty" yaml:"use_adc_server,omitempty"`
 }

internal/manager/run.go

@@ -173,8 +173,6 @@ func Run(ctx context.Context, logger logr.Logger) error {
 		SyncPeriod:    config.ControllerConfig.ProviderConfig.SyncPeriod.Duration,
 		InitSyncDelay: config.ControllerConfig.ProviderConfig.InitSyncDelay.Duration,
 		BackendMode:   string(config.ControllerConfig.ProviderConfig.Type),
-		ADCServerURL:  config.ControllerConfig.ProviderConfig.ADCServerURL,
-		UseADCServer:  config.ControllerConfig.ProviderConfig.UseADCServer,
 	})
 	if err != nil {
 		setupLog.Error(err, "unable to create provider")

internal/provider/adc/adc.go

@@ -115,15 +115,8 @@ func New(updater status.Updater, readier readiness.ReadinessManager, opts ...Opt
 	o := Options{}
 	o.ApplyOptions(opts)
 
-	// Choose executor based on configuration
-	var executor ADCExecutor
-	if o.UseADCServer && o.ADCServerURL != "" {
-		executor = NewHTTPADCExecutor(o.ADCServerURL)
-		log.Infow("using HTTP ADC Executor", zap.String("server_url", o.ADCServerURL))
-	} else {
-		executor = &DefaultADCExecutor{}
-		log.Infow("using default CLI ADC Executor")
-	}
+	executor := NewHTTPADCExecutor("http://127.0.0.1:3000")
+	log.Infow("using HTTP ADC Executor", zap.String("server_url", "http://127.0.0.1:3000"))
 
 	return &adcClient{
 		Options:    o,

internal/provider/adc/options.go

@@ -28,8 +28,6 @@ type Options struct {
 	SyncPeriod    time.Duration
 	InitSyncDelay time.Duration
 	BackendMode   string
-	ADCServerURL  string
-	UseADCServer  bool
 }
 
 func (o *Options) ApplyToList(lo *Options) {
@@ -45,12 +43,6 @@ func (o *Options) ApplyToList(lo *Options) {
 	if o.BackendMode != "" {
 		lo.BackendMode = o.BackendMode
 	}
-	if o.ADCServerURL != "" {
-		lo.ADCServerURL = o.ADCServerURL
-	}
-	if o.UseADCServer {
-		lo.UseADCServer = o.UseADCServer
-	}
 }
 
 func (o *Options) ApplyOptions(opts []Option) *Options {

test/e2e/framework/manifests/ingress.yaml

@@ -434,19 +434,33 @@ spec:
         args:
         - "server"
         - "--listen"
-        - "http://0.0.0.0:3000"
+        - "http://127.0.0.1:3000"
         ports:
         - name: http
           containerPort: 3000
           protocol: TCP
         livenessProbe:
-          tcpSocket:
-            port: 3000
+          exec:
+            command:
+              - node
+              - -e
+              - >
+                const s=require('net')
+                  .connect({host:"127.0.0.1",port:3000},
+                    ()=>{s.end();process.exit(0);});
+                s.on("error",()=>process.exit(1));
           initialDelaySeconds: 10
           periodSeconds: 10
         readinessProbe:
-          tcpSocket:
-            port: 3000
+          exec:
+            command:
+              - node
+              - -e
+              - >
+                const s=require('net')
+                  .connect({host:"127.0.0.1",port:3000},
+                    ()=>{s.end();process.exit(0);});
+                s.on("error",()=>process.exit(1));
           initialDelaySeconds: 5
           periodSeconds: 5
         securityContext: