Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions internal/controller/gatewayclass_congroller.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

"github.com/api7/api7-ingress-controller/internal/controller/config"
"github.com/api7/api7-ingress-controller/internal/controller/indexer"
)

const (
Expand Down Expand Up @@ -61,20 +62,18 @@ func (r *GatewayClassReconciler) Reconcile(ctx context.Context, req ctrl.Request
} else {
if controllerutil.ContainsFinalizer(gc, FinalizerGatewayClassProtection) {
var gatewayList gatewayv1.GatewayList
if err := r.List(ctx, &gatewayList); err != nil {
if err := r.List(ctx, &gatewayList, client.MatchingFields{indexer.GatewayClassIndexRef: gc.Name}); err != nil {
r.Log.Error(err, "failed to list gateways")
return ctrl.Result{}, err
}
var gateways []types.NamespacedName
for _, gateway := range gatewayList.Items {
if string(gateway.Spec.GatewayClassName) == gc.GetName() {
if len(gatewayList.Items) > 0 {
var gateways []types.NamespacedName
for _, item := range gatewayList.Items {
gateways = append(gateways, types.NamespacedName{
Namespace: gateway.GetNamespace(),
Name: gateway.GetName(),
Namespace: item.GetNamespace(),
Name: item.GetName(),
})
}
}
if len(gateways) > 0 {
r.Eventf(gc, "Warning", "DeletionBlocked", "the GatewayClass is still used by Gateways: %v", gateways)
return ctrl.Result{RequeueAfter: 5 * time.Second}, nil
} else {
Expand Down
13 changes: 13 additions & 0 deletions internal/controller/indexer/indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const (
IngressClassParametersRef = "ingressClassParametersRef"
ConsumerGatewayRef = "consumerGatewayRef"
PolicyTargetRefs = "targetRefs"
GatewayClassIndexRef = "gatewayClassRef"
)

func SetupIndexer(mgr ctrl.Manager) error {
Expand All @@ -36,6 +37,7 @@ func SetupIndexer(mgr ctrl.Manager) error {
setupIngressClassIndexer,
setupGatewayProxyIndexer,
setupGatewaySecretIndex,
setupGatewayClassIndexer,
} {
if err := setup(mgr); err != nil {
return err
Expand Down Expand Up @@ -193,6 +195,17 @@ func setupGatewaySecretIndex(mgr ctrl.Manager) error {
)
}

func setupGatewayClassIndexer(mgr ctrl.Manager) error {
return mgr.GetFieldIndexer().IndexField(
context.Background(),
&gatewayv1.Gateway{},
GatewayClassIndexRef,
func(obj client.Object) (requests []string) {
return []string{string(obj.(*gatewayv1.Gateway).Spec.GatewayClassName)}
},
)
}

func GatewayProxySecretIndexFunc(rawObj client.Object) []string {
gatewayProxy := rawObj.(*v1alpha1.GatewayProxy)
secretKeys := make([]string, 0)
Expand Down
Loading