Merge remote-tracking branch 'origin/release-v2-dev' into opensource

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

Author: ronething

charts/templates/cluster_role.yaml

@@ -170,6 +170,20 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - referencegrants
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - referencegrants/status
+  verbs:
+  - get
 - apiGroups:
   - networking.k8s.io
   resources:

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"`

internal/controller/gateway_controller.go

@@ -27,10 +27,12 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+	"sigs.k8s.io/gateway-api/apis/v1beta1"
 
 	"github.com/apache/apisix-ingress-controller/api/v1alpha1"
 	"github.com/apache/apisix-ingress-controller/internal/controller/indexer"
@@ -83,6 +85,23 @@ func (r *GatewayReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			&corev1.Secret{},
 			handler.EnqueueRequestsFromMapFunc(r.listGatewaysForSecret),
 		).
+		Watches(&v1beta1.ReferenceGrant{},
+			handler.EnqueueRequestsFromMapFunc(r.listReferenceGrantsForGateway),
+			builder.WithPredicates(predicate.Funcs{
+				CreateFunc: func(e event.CreateEvent) bool {
+					return referenceGrantHasGatewayFrom(e.Object)
+				},
+				UpdateFunc: func(e event.UpdateEvent) bool {
+					return referenceGrantHasGatewayFrom(e.ObjectOld) || referenceGrantHasGatewayFrom(e.ObjectNew)
+				},
+				DeleteFunc: func(e event.DeleteEvent) bool {
+					return referenceGrantHasGatewayFrom(e.Object)
+				},
+				GenericFunc: func(e event.GenericEvent) bool {
+					return referenceGrantHasGatewayFrom(e.Object)
+				},
+			}),
+		).
 		Complete(r)
 }
 
@@ -117,7 +136,7 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		msg:    acceptedMessage("gateway"),
 	}
 
-	// create a translate context
+	// create a translation context
 	tctx := provider.NewDefaultTranslateContext(ctx)
 
 	r.processListenerConfig(tctx, gateway)
@@ -164,20 +183,25 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		}
 	}
 
-	ListenerStatuses, err := getListenerStatus(ctx, r.Client, gateway)
+	var referenceGrantList v1beta1.ReferenceGrantList
+	if err := r.List(ctx, &referenceGrantList); err != nil {
+		r.Log.Error(err, "failed to list reference grants")
+		return ctrl.Result{}, err
+	}
+	listenerStatuses, err := getListenerStatus(ctx, r.Client, gateway, referenceGrantList.Items)
 	if err != nil {
-		log.Error(err, "failed to get listener status", "gateway", gateway.GetName())
+		r.Log.Error(err, "failed to get listener status", "gateway", types.NamespacedName{Namespace: gateway.GetNamespace(), Name: gateway.GetName()})
 		return ctrl.Result{}, err
 	}
 
 	accepted := SetGatewayConditionAccepted(gateway, acceptStatus.status, acceptStatus.msg)
-	Programmed := SetGatewayConditionProgrammed(gateway, conditionProgrammedStatus, conditionProgrammedMsg)
-	if accepted || Programmed || len(addrs) > 0 || len(ListenerStatuses) > 0 {
+	programmed := SetGatewayConditionProgrammed(gateway, conditionProgrammedStatus, conditionProgrammedMsg)
+	if accepted || programmed || len(addrs) > 0 || len(listenerStatuses) > 0 {
 		if len(addrs) > 0 {
 			gateway.Status.Addresses = addrs
 		}
-		if len(ListenerStatuses) > 0 {
-			gateway.Status.Listeners = ListenerStatuses
+		if len(listenerStatuses) > 0 {
+			gateway.Status.Listeners = listenerStatuses
 		}
 
 		return ctrl.Result{}, r.Status().Update(ctx, gateway)
@@ -348,6 +372,56 @@ func (r *GatewayReconciler) listGatewaysForSecret(ctx context.Context, obj clien
 	return requests
 }
 
+func (r *GatewayReconciler) listReferenceGrantsForGateway(ctx context.Context, obj client.Object) (requests []reconcile.Request) {
+	grant, ok := obj.(*v1beta1.ReferenceGrant)
+	if !ok {
+		r.Log.Error(
+			errors.New("unexpected object type"),
+			"ReferenceGrant watch predicate received unexpected object type",
+			"expected", FullTypeName(new(v1beta1.ReferenceGrant)), "found", FullTypeName(obj),
+		)
+		return nil
+	}
+
+	var gatewayList gatewayv1.GatewayList
+	if err := r.List(ctx, &gatewayList); err != nil {
+		r.Log.Error(err, "failed to list gateways in watch predicate", "ReferenceGrant", grant.GetName())
+		return nil
+	}
+
+	for _, gateway := range gatewayList.Items {
+		for _, from := range grant.Spec.From {
+			gw := v1beta1.ReferenceGrantFrom{
+				Group:     gatewayv1.GroupName,
+				Kind:      KindGateway,
+				Namespace: v1beta1.Namespace(gateway.GetNamespace()),
+			}
+			if from == gw {
+				requests = append(requests, reconcile.Request{
+					NamespacedName: types.NamespacedName{
+						Namespace: gateway.GetNamespace(),
+						Name:      gateway.GetName(),
+					},
+				})
+			}
+		}
+	}
+	return requests
+}
+
+func referenceGrantHasGatewayFrom(obj client.Object) bool {
+	grant, ok := obj.(*v1beta1.ReferenceGrant)
+	if !ok {
+		return false
+	}
+	for _, from := range grant.Spec.From {
+		if from.Kind == KindGateway && string(from.Group) == gatewayv1.GroupName {
+			return true
+		}
+	}
+	return false
+}
+
 func (r *GatewayReconciler) processInfrastructure(tctx *provider.TranslateContext, gateway *gatewayv1.Gateway) error {
 	rk := provider.ResourceKind{
 		Kind:      gateway.Kind,