From 583b7e108880e26a5fe87da3d5daa59ce6724a83 Mon Sep 17 00:00:00 2001 From: Shubham Chauhan Date: Wed, 23 Nov 2022 03:35:44 +0530 Subject: [PATCH] testfix conformance failure fixes Signed-off-by: Shubham Chauhan Signed-off-by: Shubham Chauhan --- internal/provider/kubernetes/controller.go | 50 ++++++++++--------- .../provider/kubernetes/kubernetes_test.go | 4 +- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/internal/provider/kubernetes/controller.go b/internal/provider/kubernetes/controller.go index eab69e4d0e20..36244b014be3 100644 --- a/internal/provider/kubernetes/controller.go +++ b/internal/provider/kubernetes/controller.go @@ -301,11 +301,11 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, request reconcile. backendNamespace := gatewayapi.NamespaceDerefOrAlpha(backendRef.Namespace, gtw.Namespace) routeServicesList[types.NamespacedName{ - Namespace: gatewayapi.NamespaceDerefOrAlpha(backendRef.Namespace, gtw.Namespace), + Namespace: backendNamespace, Name: string(backendRef.Name), }] = struct{}{} - if backendNamespace != gtw.Namespace { + if backendNamespace != tlsRoute.Namespace { from := ObjectKindNamespacedName{kind: gatewayapi.KindTLSRoute, namespace: tlsRoute.Namespace, name: tlsRoute.Name} to := ObjectKindNamespacedName{kind: gatewayapi.KindService, namespace: backendNamespace, name: string(backendRef.Name)} refGrant, err := r.findReferenceGrant(ctx, from, to) @@ -341,13 +341,13 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, request reconcile. continue } - backendNamespace := gatewayapi.NamespaceDerefOr(backendRef.Namespace, gtw.Namespace) + backendNamespace := gatewayapi.NamespaceDerefOr(backendRef.Namespace, httpRoute.Namespace) routeServicesList[types.NamespacedName{ Namespace: backendNamespace, Name: string(backendRef.Name), }] = struct{}{} - if backendNamespace != gtw.Namespace { + if backendNamespace != httpRoute.Namespace { from := ObjectKindNamespacedName{kind: gatewayapi.KindHTTPRoute, namespace: httpRoute.Namespace, name: httpRoute.Name} to := ObjectKindNamespacedName{kind: gatewayapi.KindService, namespace: backendNamespace, name: string(backendRef.Name)} refGrant, err := r.findReferenceGrant(ctx, from, to) @@ -402,20 +402,22 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, request reconcile. resourceTree.Gateways = append(resourceTree.Gateways, gtw) } + if err := updater(acceptedGC, true); err != nil { + r.log.Error(err, "unable to update GatewayClass status") + return reconcile.Result{}, nil + } + // Update finalizer on the gateway class based on the resource tree. if len(resourceTree.Gateways) == 0 { r.log.Info("No gateways found for accepted gatewayclass") - // If needed, remove the finalizer from the accepted GatewayClass. + // If needed, remove the finalizer from the accepted GatewayClass. if err := r.removeFinalizer(ctx, acceptedGC); err != nil { r.log.Error(err, fmt.Sprintf("failed to remove finalizer from gatewayclass %s", acceptedGC.Name)) - return reconcile.Result{}, nil } - } - if err := updater(acceptedGC, true); err != nil { - r.log.Error(err, "unable to update GatewayClass status") + // No further processing is required as there are no Gateways for this GatewayClass return reconcile.Result{}, nil } @@ -444,17 +446,18 @@ func (r *gatewayAPIReconciler) getNamespace(ctx context.Context, name string) (* // enqueueRequestForOwningGateway returns an event handler that maps events for // resources with Gateway owning labels to reconcile requests for those Gateway objects. -func (r *gatewayAPIReconciler) processDeploymentForOwningGateway(obj client.Object) []reconcile.Request { +func (r *gatewayAPIReconciler) processDeploymentForOwningGateway(obj client.Object) (request []reconcile.Request) { + // Process Deployment Reconcile nothing. ctx := context.Background() deployment := obj.(*appsv1.Deployment) - - // Process Deployment Reconcile nothing. - request := []reconcile.Request{} + if deployment == nil { + return + } // Check if the deployment belongs to a Gateway, if so, find the Gateway. gtw := r.findOwningGateway(ctx, deployment.GetLabels()) if gtw == nil { - return request + return } // Check if the Service for the Gateway also exists, if it does, proceed with @@ -463,24 +466,25 @@ func (r *gatewayAPIReconciler) processDeploymentForOwningGateway(obj client.Obje if err != nil { r.log.Info("failed to get Service for gateway", "namespace", gtw.Namespace, "name", gtw.Name) - return request + return } r.statusUpdateForGateway(gtw, svc, deployment) - return request + return } -func (r *gatewayAPIReconciler) processServiceForOwningGateway(obj client.Object) []reconcile.Request { +func (r *gatewayAPIReconciler) processServiceForOwningGateway(obj client.Object) (request []reconcile.Request) { + // Process Service Reconcile nothing. ctx := context.Background() svc := obj.(*corev1.Service) - - // Process Service Reconcile nothing. - request := []reconcile.Request{} + if svc == nil { + return + } // Check if the Service belongs to a Gateway, if so, find the Gateway. gtw := r.findOwningGateway(ctx, svc.GetLabels()) if gtw == nil { - return request + return } // Check if the Deployment for the Gateway also exists, if it does, proceed with @@ -489,11 +493,11 @@ func (r *gatewayAPIReconciler) processServiceForOwningGateway(obj client.Object) if err != nil { r.log.Info("failed to get Deployment for gateway", "namespace", gtw.Namespace, "name", gtw.Name) - return request + return } r.statusUpdateForGateway(gtw, svc, deployment) - return request + return } func (r gatewayAPIReconciler) findOwningGateway(ctx context.Context, labels map[string]string) *gwapiv1b1.Gateway { diff --git a/internal/provider/kubernetes/kubernetes_test.go b/internal/provider/kubernetes/kubernetes_test.go index be5f40d34989..339a8e8c20bb 100644 --- a/internal/provider/kubernetes/kubernetes_test.go +++ b/internal/provider/kubernetes/kubernetes_test.go @@ -161,9 +161,11 @@ func testGatewayClassAcceptedStatus(ctx context.Context, t *testing.T, provider return false }, defaultWait, defaultTick) + // Since there are no Gateways present for the GatewayClass, we store nothing + // in the resource map. require.Eventually(t, func() bool { _, ok := resources.GatewayAPIResources.Load(gc.Name) - return ok + return !ok }, defaultWait, defaultTick) }