fix: remove gateway config items from the config file.

charts/templates/configmap.yaml

@@ -10,13 +10,3 @@ data:
     controller_name: {{ .Values.controllerName | default "gateway.api7.io/api7-ingress-controller" }}
 
     leader_election_id: "api7-ingress-controller-leader"
-
-    gateway_configs:
-    - name: "api7ee"
-      control_plane:
-        admin_key: "{{ required "Provide a valid admin key!" .Values.admin.key }}"
-        endpoints:
-          - "{{ .Values.admin.endpoint }}"
-        tls_verify: {{ .Values.admin.tlsVerify }}
-      addresses:                      # record the status address of the gateway-api gateway
-      - "{{ .Values.statusAddress }}"

cmd/root/root.go

@@ -91,7 +91,6 @@ func newAPI7IngressController() *cobra.Command {
 	cfg := config.ControllerConfig
 	var configPath string
 
-	var controlPlanesFlag GatewayConfigsFlag
 	cmd := &cobra.Command{
 		Use:     "api7-ingress-controller [command]",
 		Long:    "Yet another Ingress controller for Kubernetes using api7ee Gateway as the high performance reverse proxy.",
@@ -104,8 +103,6 @@ func newAPI7IngressController() *cobra.Command {
 				}
 				cfg = c
 				config.SetControllerConfig(c)
-			} else {
-				cfg.GatewayConfigs = controlPlanesFlag.GatewayConfigs
 			}
 
 			if err := cfg.Validate(); err != nil {
@@ -153,7 +150,6 @@ func newAPI7IngressController() *cobra.Command {
 	cmd.Flags().StringVar(&cfg.MetricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
 		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
 	cmd.Flags().StringVar(&cfg.ProbeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
-	cmd.Flags().Var(&controlPlanesFlag, "control-planes", "Control planes configuration in YAML format")
 	cmd.Flags().StringVar(&cfg.LogLevel, "log-level", config.DefaultLogLevel, "The log level for api7-ingress-controller")
 	cmd.Flags().StringVar(&cfg.ControllerName,
 		"controller-name",

config/samples/config.yaml

@@ -1,4 +1,4 @@
-log_level: "info"                               # The log level of the API7 Ingress Controller.
+log_level: "debug"                               # The log level of the API7 Ingress Controller.
                                                 # the default value is "info".
 
 controller_name: gateway.api7.io/api7-ingress-controller  # The controller name of the API7 Ingress Controller,
@@ -16,15 +16,15 @@ leader_election:
                                         # will wait between tries of actions with the controller.
   disable: false                        # Whether to disable leader election.
 
-ingress_class: api7 # The ingress class name of the API7 Ingress Controller.
-ingress_publish_service: "" # The service name of the ingress publish service.
-ingress_status_address: [] # The status address of the ingress.
-gateway_configs:                  # The configuration of the API7 Gateway.
-- name: api7                      # The name of the Gateway in the Gateway API.
-  control_plane:
-    admin_key: "${ADMIN_KEY}"     # The admin key of the control plane.
-    endpoints:         
-      - ${ENDPOINT}               # The endpoint of the control plane.
-    tls_verify: false
-  addresses:                      # record the status address of the gateway-api gateway
-  - "172.18.0.4"                  # The LB IP of the gateway service.
+# ingress_class: api7 # The ingress class name of the API7 Ingress Controller.
+# ingress_publish_service: "" # The service name of the ingress publish service.
+# ingress_status_address: [] # The status address of the ingress.
+# gateway_configs:                  # The configuration of the API7 Gateway.
+# - name: api7                      # The name of the Gateway in the Gateway API.
+#   control_plane:
+#     admin_key: "${ADMIN_KEY}"     # The admin key of the control plane.
+#     endpoints:         
+#       - ${ENDPOINT}               # The endpoint of the control plane.
+#     tls_verify: false
+#   addresses:                      # record the status address of the gateway-api gateway
+#   - "172.18.0.4"                  # The LB IP of the gateway service.

docs/configure.md

@@ -14,16 +14,6 @@ controller_name: gateway.api7.io/api7-ingress-controller  # The controller name
 
 leader_election_id: "api7-ingress-controller-leader" # The leader election ID for the API7 Ingress Controller.
                                                         # The default value is "api7-ingress-controller-leader".
-
-gateway_configs:               # The configuration of the API7 Gateway.
-- name: api7                      # The name of the Gateway in the Gateway API.
-  control_plane:
-    admin_key: "${ADMIN_KEY}"     # The admin key of the control plane.
-    endpoints:         
-      - ${ENDPOINT}/apisix/admin        # The endpoint of the control plane.                    
-    tls_verify: false
-  addresses:                      # record the status address of the gateway-api gateway
-  - "172.18.0.4"                  # The LB IP of the gateway service.
 ```
 
 ### Controller Name

internal/controller/config/config.go

@@ -30,7 +30,6 @@ func NewDefaultConfig() *Config {
 		LeaderElectionID: DefaultLeaderElectionID,
 		ProbeAddr:        DefaultProbeAddr,
 		MetricsAddr:      DefaultMetricsAddr,
-		IngressClass:     DefaultIngressClass,
 		LeaderElection:   NewLeaderElection(),
 	}
 }
@@ -84,21 +83,13 @@ func NewConfigFromFile(filename string) (*Config, error) {
 }
 
 func (c *Config) Validate() error {
-
-	if len(c.GatewayConfigs) == 0 {
-		return fmt.Errorf("gateway_configs config is required")
-	}
-	for _, gc := range c.GatewayConfigs {
-		if err := c.validateGatewayConfig(gc); err != nil {
-			return fmt.Errorf("failed to validate control_planes: %w", err)
-		}
-	}
 	if c.ControllerName == "" {
 		return fmt.Errorf("controller_name is required")
 	}
 	return nil
 }
 
+//nolint:unused
 func (c *Config) validateGatewayConfig(gc *GatewayConfig) error {
 
 	if gc.Name == "" {
@@ -118,75 +109,6 @@ func (c *Config) validateGatewayConfig(gc *GatewayConfig) error {
 	return nil
 }
 
-var gatewayNameMap map[string]*GatewayConfig
-var gatewayNameList []string
-
-func initGatewayNameMap() {
-	if gatewayNameMap == nil {
-		gatewayNameMap = make(map[string]*GatewayConfig)
-		for _, gc := range ControllerConfig.GatewayConfigs {
-			gatewayNameMap[gc.Name] = gc
-		}
-	}
-}
-
-func GetControlPlaneConfigByGatewatName(gatewatName string) *ControlPlaneConfig {
-	initGatewayNameMap()
-	if gc, ok := gatewayNameMap[gatewatName]; ok {
-		return gc.ControlPlane
-	}
-	return nil
-}
-
-func GetGatewayConfig(gatewayName string) *GatewayConfig {
-	initGatewayNameMap()
-	if gc, ok := gatewayNameMap[gatewayName]; ok {
-		return gc
-	}
-	return nil
-}
-
-func GetFirstGatewayConfig() *GatewayConfig {
-	if len(ControllerConfig.GatewayConfigs) > 0 {
-		return ControllerConfig.GatewayConfigs[0]
-	}
-	return nil
-}
-
-func GetGatewayAddresses(gatewayName string) []string {
-	initGatewayNameMap()
-	if gc, ok := gatewayNameMap[gatewayName]; ok {
-		return gc.Addresses
-	}
-	return nil
-}
-
-func GatewayConfigs() []*GatewayConfig {
-	return ControllerConfig.GatewayConfigs
-}
-
-func GatewayNameList() []string {
-	if gatewayNameList == nil {
-		gatewayNameList = make([]string, 0, len(ControllerConfig.GatewayConfigs))
-		for _, gc := range ControllerConfig.GatewayConfigs {
-			gatewayNameList = append(gatewayNameList, gc.Name)
-		}
-	}
-	return gatewayNameList
-}
-
-func GetIngressClass() string {
-	return ControllerConfig.IngressClass
-}
-
-func GetIngressPublishService() string {
-	return ControllerConfig.IngressPublishService
-}
-
-func GetIngressStatusAddress() []string {
-	return ControllerConfig.IngressStatusAddress
-}
-
 func GetControllerName() string {
 	return ControllerConfig.ControllerName
 }

internal/controller/config/types.go

@@ -17,30 +17,23 @@ const (
 	// DefaultLogLevel is the default log level for apisix-ingress-controller.
 	DefaultLogLevel = "info"
 
-	// DefaultIngressClass is the default ingress class name for Ingress resources
-	DefaultIngressClass = "api7"
-
 	DefaultMetricsAddr = ":8080"
 	DefaultProbeAddr   = ":8081"
 )
 
 // 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"`
-	GatewayConfigs        []*GatewayConfig `json:"gateway_configs" yaml:"gateway_configs"`
-	MetricsAddr           string           `json:"metrics_addr" yaml:"metrics_addr"`
-	EnableHTTP2           bool             `json:"enable_http2" yaml:"enable_http2"`
-	ProbeAddr             string           `json:"probe_addr" yaml:"probe_addr"`
-	SecureMetrics         bool             `json:"secure_metrics" yaml:"secure_metrics"`
-	IngressClass          string           `json:"ingress_class" yaml:"ingress_class"`
-	IngressPublishService string           `json:"ingress_publish_service" yaml:"ingress_publish_service"`
-	IngressStatusAddress  []string         `json:"ingress_status_address" yaml:"ingress_status_address"`
-	LeaderElection        *LeaderElection  `json:"leader_election" yaml:"leader_election"`
+	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"`
+	MetricsAddr      string          `json:"metrics_addr" yaml:"metrics_addr"`
+	EnableHTTP2      bool            `json:"enable_http2" yaml:"enable_http2"`
+	ProbeAddr        string          `json:"probe_addr" yaml:"probe_addr"`
+	SecureMetrics    bool            `json:"secure_metrics" yaml:"secure_metrics"`
+	LeaderElection   *LeaderElection `json:"leader_election" yaml:"leader_election"`
 }
 
 type GatewayConfig struct {

internal/controller/gateway_controller.go

@@ -6,7 +6,6 @@ import (
 	"reflect"
 
 	"github.com/api7/api7-ingress-controller/api/v1alpha1"
-	"github.com/api7/api7-ingress-controller/internal/controller/config"
 	"github.com/api7/api7-ingress-controller/internal/controller/indexer"
 	"github.com/api7/api7-ingress-controller/internal/provider"
 	"github.com/api7/gopkg/pkg/log"
@@ -81,23 +80,6 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	}
 	conditionProgrammedStatus, conditionProgrammedMsg := true, "Programmed"
 
-	cfg := config.GetFirstGatewayConfig()
-
-	var addrs []gatewayv1.GatewayStatusAddress
-
-	if len(gateway.Status.Addresses) != len(cfg.Addresses) {
-		for _, addr := range cfg.Addresses {
-			if addr == "" {
-				continue
-			}
-			addrs = append(addrs,
-				gatewayv1.GatewayStatusAddress{
-					Value: addr,
-				},
-			)
-		}
-	}
-
 	r.Log.Info("gateway has been accepted", "gateway", gateway.GetName())
 	type status struct {
 		status bool
@@ -119,6 +101,35 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		}
 	}
 
+	var addrs []gatewayv1.GatewayStatusAddress
+
+	rk := provider.ResourceKind{
+		Kind:      gateway.Kind,
+		Namespace: gateway.Namespace,
+		Name:      gateway.Name,
+	}
+
+	gatewayProxy, ok := tctx.GatewayProxies[rk]
+	if !ok {
+		acceptStatus = status{
+			status: false,
+			msg:    "gateway proxy not found",
+		}
+	} else {
+		if len(gateway.Status.Addresses) != len(gatewayProxy.Spec.StatusAddress) {
+			for _, addr := range gatewayProxy.Spec.StatusAddress {
+				if addr == "" {
+					continue
+				}
+				addrs = append(addrs,
+					gatewayv1.GatewayStatusAddress{
+						Value: addr,
+					},
+				)
+			}
+		}
+	}
+
 	if err := r.Provider.Update(ctx, tctx, gateway); err != nil {
 		acceptStatus = status{
 			status: false,