Running pipeline

Author: bjee19

internal/framework/runnables/runnables.go

@@ -2,6 +2,7 @@ package runnables
 
 import (
 	"context"
+	"fmt"
 
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
@@ -56,6 +57,7 @@ func NewCallFunctionsAfterBecameLeader(
 
 func (j *CallFunctionsAfterBecameLeader) Start(ctx context.Context) error {
 	for _, f := range j.enableFunctions {
+		fmt.Println("We are calling these functions after we became leader")
 		f(ctx)
 	}
 

internal/mode/static/provisioner/handler.go

@@ -55,13 +55,17 @@ func (h *eventHandler) HandleEventBatch(ctx context.Context, logger logr.Logger,
 		case *events.UpsertEvent:
 			switch obj := e.Resource.(type) {
 			case *gatewayv1.Gateway:
+				fmt.Println("We are handling a gateway upsert event")
 				h.store.updateGateway(obj)
 			case *appsv1.Deployment, *corev1.ServiceAccount, *corev1.ConfigMap, *corev1.Secret:
 				objLabels := labels.Set(obj.GetLabels())
 				if h.labelSelector.Matches(objLabels) {
 					gatewayName := objLabels.Get(controller.GatewayLabel)
 					gatewayNSName := types.NamespacedName{Namespace: obj.GetNamespace(), Name: gatewayName}
 
+					fmt.Println("Here is the type: " + obj.GetObjectKind().GroupVersionKind().Kind)
+					fmt.Println("We are processing the upsert of this resource: " + obj.GetName())
+
 					if err := h.updateOrDeleteResources(ctx, obj, gatewayNSName); err != nil {
 						logger.Error(err, "error handling resource update")
 					}
@@ -72,10 +76,16 @@ func (h *eventHandler) HandleEventBatch(ctx context.Context, logger logr.Logger,
 					gatewayName := objLabels.Get(controller.GatewayLabel)
 					gatewayNSName := types.NamespacedName{Namespace: obj.GetNamespace(), Name: gatewayName}
 
+					fmt.Println("Here is the type: " + obj.GetObjectKind().GroupVersionKind().Kind)
+					fmt.Println("We are processing the upsert of this resource: " + obj.GetName())
+
 					if err := h.updateOrDeleteResources(ctx, obj, gatewayNSName); err != nil {
 						logger.Error(err, "error handling resource update")
 					}
 
+					// theres a gateway and ngf deployed
+					// we delete ngf, wait until it comes back on, then before it takes the leader lease we delete the gateway.
+
 					statusUpdate := &status.QueueObject{
 						Deployment:     client.ObjectKeyFromObject(obj),
 						UpdateType:     status.UpdateGateway,
@@ -87,8 +97,15 @@ func (h *eventHandler) HandleEventBatch(ctx context.Context, logger logr.Logger,
 				panic(fmt.Errorf("unknown resource type %T", e.Resource))
 			}
 		case *events.DeleteEvent:
+			obj := e
 			switch e.Type.(type) {
 			case *gatewayv1.Gateway:
+
+				if !h.provisioner.isLeader() {
+					h.provisioner.setResourceToDelete(obj.NamespacedName)
+				}
+
+				fmt.Println("We see a delete event for the gateway! ")
 				if err := h.provisioner.deprovisionNginx(ctx, e.NamespacedName); err != nil {
 					logger.Error(err, "error deprovisioning nginx resources")
 				}
@@ -116,6 +133,7 @@ func (h *eventHandler) updateOrDeleteResources(
 ) error {
 	if gw := h.store.getGateway(gatewayNSName); gw == nil {
 		if !h.provisioner.isLeader() {
+			fmt.Println("We are setting resources to be deleted since gateway is nil and we are not leader")
 			h.provisioner.setResourceToDelete(gatewayNSName)
 
 			return nil

internal/mode/static/provisioner/objects.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"maps"
+	"sort"
 	"strconv"
 	"time"
 
@@ -467,6 +468,12 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
 		podAnnotations["prometheus.io/port"] = strconv.Itoa(int(metricsPort))
 	}
 
+	// need to sort ports so everytime buildNginxPodTemplateSpec is called it will generate the exact same
+	// array of ports. This is needed to satisfy deterministic results of the method.
+	sort.Slice(containerPorts, func(i, j int) bool {
+		return containerPorts[i].ContainerPort < containerPorts[j].ContainerPort
+	})
+
 	image, pullPolicy := p.buildImage(nProxyCfg)
 
 	spec := corev1.PodTemplateSpec{
@@ -622,6 +629,12 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
 		spec.Spec.ImagePullSecrets = append(spec.Spec.ImagePullSecrets, ref)
 	}
 
+	// need to sort ports so everytime buildNginxPodTemplateSpec is called it will generate the exact same
+	// array of ports. This is needed to satisfy deterministic results of the method.
+	sort.Slice(spec.Spec.ImagePullSecrets, func(i, j int) bool {
+		return spec.Spec.ImagePullSecrets[i].Name < spec.Spec.ImagePullSecrets[j].Name
+	})
+
 	if p.cfg.Plus {
 		initCmd := spec.Spec.InitContainers[0].Command
 		initCmd = append(initCmd,

internal/mode/static/provisioner/provisioner.go

@@ -120,7 +120,9 @@ func (p *NginxProvisioner) Enable(ctx context.Context) {
 	p.lock.Unlock()
 
 	p.lock.RLock()
+	fmt.Println("We are in the provioner's Enable")
 	for _, gatewayNSName := range p.resourcesToDeleteOnStartup {
+		fmt.Println("We are deleting some resources: " + gatewayNSName.Name)
 		if err := p.deprovisionNginx(ctx, gatewayNSName); err != nil {
 			p.cfg.Logger.Error(err, "error deprovisioning nginx resources on startup")
 		}
@@ -309,7 +311,9 @@ func (p *NginxProvisioner) deprovisionNginx(ctx context.Context, gatewayNSName t
 		Namespace: gatewayNSName.Namespace,
 	}
 
+	fmt.Println("We got into deprovisionNginx!")
 	if p.isLeader() {
+		fmt.Println("We are a leader and are removing nginx resources")
 		p.cfg.Logger.Info(
 			"Removing nginx resources for Gateway",
 			"name", gatewayNSName.Name,

tests/framework/resourcemanager.go

@@ -334,17 +334,22 @@ func (rm *ResourceManager) WaitForAppsToBeReady(namespace string) error {
 // WaitForAppsToBeReadyWithCtx waits for all apps in the specified namespace to be ready or
 // until the provided context is canceled.
 func (rm *ResourceManager) WaitForAppsToBeReadyWithCtx(ctx context.Context, namespace string) error {
+	fmt.Println("waiting on pods to be ready...")
 	if err := rm.WaitForPodsToBeReady(ctx, namespace); err != nil {
 		return err
 	}
 
+	fmt.Println("waiting on routes to be ready...")
+
 	if err := rm.waitForHTTPRoutesToBeReady(ctx, namespace); err != nil {
 		return err
 	}
+	fmt.Println("waiting on grpc routes to be ready...")
 
 	if err := rm.waitForGRPCRoutesToBeReady(ctx, namespace); err != nil {
 		return err
 	}
+	fmt.Println("waiting on gateways to be ready...")
 
 	return rm.waitForGatewaysToBeReady(ctx, namespace)
 }