Skip to content

Commit

Permalink
addressed review comments - 1
Browse files Browse the repository at this point in the history 
Signed-off-by: Shubham Chauhan <shubham@tetrate.io>
  • Loading branch information
@chauhanshubham
chauhanshubham committed Nov 30, 2022
1 parent 5480e4a commit 9903b7f
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 36 deletions.
4 changes: 2 additions & 2 deletions api/config/v1alpha1/groupversion_info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

// Package v1alpha1 contains API Schema definitions for the config v1alpha1 API group.
//
// +kubebuilder:object:generate=true
// +groupName=config.gateway.envoyproxy.io
//+kubebuilder:object:generate=true
//+groupName=config.gateway.envoyproxy.io
package v1alpha1

import (
Expand Down
56 changes: 26 additions & 30 deletions internal/provider/kubernetes/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,22 +144,21 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, request reconcile.

var cc controlledClasses

for i := range gatewayClasses.Items {
gwClass := gatewayClasses.Items[i].DeepCopy()
for _, gwClass := range gatewayClasses.Items {
if gwClass.Spec.ControllerName == r.classController {
// The gatewayclass was marked for deletion and the finalizer removed,
// so clean-up dependents.
if !gwClass.DeletionTimestamp.IsZero() &&
!slice.ContainsString(gwClass.Finalizers, gatewayClassFinalizer) {
r.log.Info("gatewayclass marked for deletion")
cc.removeMatch(gwClass)
cc.removeMatch(&gwClass)

// Delete the gatewayclass from the watchable map.
r.resources.GatewayAPIResources.Delete(gwClass.Name)
continue
}

cc.addMatch(gwClass)
cc.addMatch(&gwClass)
}
}

Expand Down Expand Up @@ -231,22 +230,15 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, request reconcile.
return reconcile.Result{}, err
}

for i := range gatewayList.Items {
gtw := gatewayList.Items[i].DeepCopy()
for _, gtw := range gatewayList.Items {
r.log.Info("processing Gateway", "namespace", gtw.Namespace, "name", gtw.Name)
allAssociatedNamespaces[gtw.Namespace] = struct{}{}

if gtw.Spec.Listeners == nil {
continue
}

for l := range gtw.Spec.Listeners {
listener := gtw.Spec.Listeners[l].DeepCopy()
for _, listener := range gtw.Spec.Listeners {
// Get Secret for gateway if it exists.
if terminatesTLS(listener) {
for c := range listener.TLS.CertificateRefs {
certRef := listener.TLS.CertificateRefs[c].DeepCopy()
if refsSecret(certRef) {
if terminatesTLS(&listener) {
for _, certRef := range listener.TLS.CertificateRefs {
if refsSecret(&certRef) {
secret := new(corev1.Secret)
secretNamespace := gatewayapi.NamespaceDerefOr(certRef.Namespace, gtw.Namespace)
err := r.client.Get(ctx,
Expand All @@ -269,11 +261,11 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, request reconcile.
continue
}

resourceTree.ReferenceGrants = append(resourceTree.ReferenceGrants, refGrant.DeepCopy())
resourceTree.ReferenceGrants = append(resourceTree.ReferenceGrants, refGrant)
}

allAssociatedNamespaces[secretNamespace] = struct{}{}
resourceTree.Secrets = append(resourceTree.Secrets, secret.DeepCopy())
resourceTree.Secrets = append(resourceTree.Secrets, secret)
}
}
}
Expand All @@ -283,7 +275,7 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, request reconcile.
// Get TLSRoute objects and check if it exists.
tlsRouteList := &gwapiv1a2.TLSRouteList{}
if err := r.client.List(ctx, tlsRouteList, &client.ListOptions{
FieldSelector: fields.OneTermEqualSelector(gatewayTLSRouteIndex, utils.NamespacedName(gtw).String()),
FieldSelector: fields.OneTermEqualSelector(gatewayTLSRouteIndex, utils.NamespacedName(&gtw).String()),
}); err != nil {
r.log.Error(err, "unable to find associated TLSRoutes")
return reconcile.Result{}, err
Expand Down Expand Up @@ -314,19 +306,19 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, request reconcile.
continue
}

resourceTree.ReferenceGrants = append(resourceTree.ReferenceGrants, refGrant.DeepCopy())
resourceTree.ReferenceGrants = append(resourceTree.ReferenceGrants, refGrant)
}
}
}

allAssociatedNamespaces[tlsRoute.Namespace] = struct{}{}
resourceTree.TLSRoutes = append(resourceTree.TLSRoutes, tlsRoute.DeepCopy())
resourceTree.TLSRoutes = append(resourceTree.TLSRoutes, &tlsRoute)
}

// Get HTTPRoute objects and check if it exists.
httpRouteList := &gwapiv1b1.HTTPRouteList{}
if err := r.client.List(ctx, httpRouteList, &client.ListOptions{
FieldSelector: fields.OneTermEqualSelector(gatewayHTTPRouteIndex, utils.NamespacedName(gtw).String()),
FieldSelector: fields.OneTermEqualSelector(gatewayHTTPRouteIndex, utils.NamespacedName(&gtw).String()),
}); err != nil {
r.log.Error(err, "unable to find associated HTTPRoutes")
return reconcile.Result{}, err
Expand Down Expand Up @@ -356,13 +348,13 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, request reconcile.
continue
}

resourceTree.ReferenceGrants = append(resourceTree.ReferenceGrants, refGrant.DeepCopy())
resourceTree.ReferenceGrants = append(resourceTree.ReferenceGrants, refGrant)
}
}
}

allAssociatedNamespaces[httpRoute.Namespace] = struct{}{}
resourceTree.HTTPRoutes = append(resourceTree.HTTPRoutes, httpRoute.DeepCopy())
resourceTree.HTTPRoutes = append(resourceTree.HTTPRoutes, &httpRoute)
}

for serviceNamespaceName := range routeServicesList {
Expand All @@ -380,7 +372,7 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, request reconcile.
}

allAssociatedNamespaces[service.Namespace] = struct{}{}
resourceTree.Services = append(resourceTree.Services, service.DeepCopy())
resourceTree.Services = append(resourceTree.Services, service)
}
}

Expand All @@ -396,10 +388,10 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, request reconcile.
return reconcile.Result{}, err
}

resourceTree.Namespaces = append(resourceTree.Namespaces, namespace.DeepCopy())
resourceTree.Namespaces = append(resourceTree.Namespaces, namespace)
}

resourceTree.Gateways = append(resourceTree.Gateways, gtw)
resourceTree.Gateways = append(resourceTree.Gateways, &gtw)
}

if err := updater(acceptedGC, true); err != nil {
Expand Down Expand Up @@ -431,7 +423,7 @@ func (r *gatewayAPIReconciler) Reconcile(ctx context.Context, request reconcile.

r.resources.GatewayAPIResources.Store(acceptedGC.Name, resourceTree)

r.log.WithName(request.Name).Info("reconciled successfully")
r.log.WithName(request.Name).Info("reconciled gatewayAPI object successfully", "namespace", request.Namespace, "name", request.Name)
return reconcile.Result{}, nil
}

Expand All @@ -445,8 +437,9 @@ func (r *gatewayAPIReconciler) getNamespace(ctx context.Context, name string) (*
return ns, nil
}

// enqueueRequestForOwningGateway returns an event handler that maps events for
// resources with Gateway owning labels to reconcile requests for those Gateway objects.
// processDeploymentForOwningGateway tries finding the owning Gateway of the Deployment
// if it exists, finds the Gateway's Service, and further updates the Gateway
// status Ready condition.
func (r *gatewayAPIReconciler) processDeploymentForOwningGateway(obj client.Object) (request []reconcile.Request) {
// Process Deployment Reconcile nothing.
ctx := context.Background()
Expand Down Expand Up @@ -474,6 +467,9 @@ func (r *gatewayAPIReconciler) processDeploymentForOwningGateway(obj client.Obje
return
}

// processServiceForOwningGateway tries finding the owning Gateway of the Service
// if it exists, finds the Gateway's Deployment, and further updates the Gateway
// status Ready condition.
func (r *gatewayAPIReconciler) processServiceForOwningGateway(obj client.Object) (request []reconcile.Request) {
// Process Service Reconcile nothing.
ctx := context.Background()
Expand Down
8 changes: 4 additions & 4 deletions internal/status/status.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ func (u *UpdateWriter) Send(update Update) {
//
// Supported objects:
//
// GatewayClasses
// Gateway
// HTTPRoute
// TLSRoute
// GatewayClasses
// Gateway
// HTTPRoute
// TLSRoute
func isStatusEqual(objA, objB interface{}) bool {
opts := cmpopts.IgnoreFields(metav1.Condition{}, "LastTransitionTime", "ObservedGeneration")
switch a := objA.(type) {
Expand Down

0 comments on commit 9903b7f

Please sign in to comment.