chore: adjust configuration items (#145)

Signed-off-by: ashing <[email protected]>

Author: ronething

charts/templates/configmap.yaml

@@ -5,10 +5,6 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data:
   config.yaml: |
-    cert_file: {{ .Values.config.certFile | default "" }}
-
-    key_file: {{ .Values.config.keyFile | default "" }}
-
     log_level: {{ .Values.config.logLevel | default "info" }}
 
     controller_name: {{ .Values.config.controllerName | default "apisix.apache.org/apisix-ingress-controller" }}
@@ -34,3 +30,8 @@ data:
     secure_metrics: {{ .Values.config.secureMetrics | default "" }}
     
     exec_adc_timeout: {{ .Values.config.execADCTimeout | default "15s" }}
+
+    provider:
+      sync_period: {{ .Values.config.provider.syncPeriod | default "0s" }}
+
+      init_sync_delay: {{ .Values.config.provider.initSyncDelay | default "20m" }}

charts/values.yaml

@@ -38,8 +38,6 @@ deployment:
     tag: "dev"
 
 config:
-  certFile: ""
-  keyFile: ""
   logLevel: "info"
   controllerName: apisix.apache.org/apisix-ingress-controller
   leaderElection:
@@ -53,3 +51,6 @@ config:
   probeAddr: ":8081"
   secureMetrics: ""
   execADCTimeout: "15s"
+  provider:
+    syncPeriod: "0s"
+    initSyncDelay: "20m"

config/samples/config.yaml

@@ -16,6 +16,18 @@ leader_election:
                                         # will wait between tries of actions with the controller.
   disable: false                        # Whether to disable leader election.
 
+metrics_addr: ":8080"                   # The address the metrics endpoint binds to.
+                                        # The default value is ":8080".
+
+enable_http2: false                     # Whether to enable HTTP/2 for the server.
+                                        # The default value is false.
+
+probe_addr: ":8081"                     # The address the probe endpoint binds to.
+                                        # The default value is ":8081".
+
+secure_metrics: ""                      # The secure metrics configuration.
+                                        # The default value is "" (empty).
+
 exec_adc_timeout: 15s                   # The timeout for the ADC to execute.
                                         # The default value is 15 seconds.
 

internal/controller/config/types.go

@@ -36,8 +36,6 @@ const (
 // Config contains all config items which are necessary for
 // apisix-ingress-controller's running.
 type Config struct {
-	CertFilePath     string             `json:"cert_file" yaml:"cert_file"`
-	KeyFilePath      string             `json:"key_file" yaml:"key_file"`
 	LogLevel         string             `json:"log_level" yaml:"log_level"`
 	ControllerName   string             `json:"controller_name" yaml:"controller_name"`
 	LeaderElectionID string             `json:"leader_election_id" yaml:"leader_election_id"`