Skip to content

Commit 21449dd

Browse files
committed
Running pipeline
1 parent 9463c12 commit 21449dd

File tree

5 files changed

+4
-30
lines changed

5 files changed

+4
-30
lines changed

internal/framework/runnables/runnables.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package runnables
22

33
import (
44
"context"
5-
"fmt"
65

76
"sigs.k8s.io/controller-runtime/pkg/manager"
87
)
@@ -57,7 +56,6 @@ func NewCallFunctionsAfterBecameLeader(
5756

5857
func (j *CallFunctionsAfterBecameLeader) Start(ctx context.Context) error {
5958
for _, f := range j.enableFunctions {
60-
fmt.Println("We are calling these functions after we became leader")
6159
f(ctx)
6260
}
6361

internal/mode/static/provisioner/handler.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,12 @@ func (h *eventHandler) HandleEventBatch(ctx context.Context, logger logr.Logger,
5555
case *events.UpsertEvent:
5656
switch obj := e.Resource.(type) {
5757
case *gatewayv1.Gateway:
58-
fmt.Println("We are handling a gateway upsert event")
5958
h.store.updateGateway(obj)
6059
case *appsv1.Deployment, *corev1.ServiceAccount, *corev1.ConfigMap, *corev1.Secret:
6160
objLabels := labels.Set(obj.GetLabels())
6261
if h.labelSelector.Matches(objLabels) {
6362
gatewayName := objLabels.Get(controller.GatewayLabel)
6463
gatewayNSName := types.NamespacedName{Namespace: obj.GetNamespace(), Name: gatewayName}
65-
66-
fmt.Println("Here is the type: " + obj.GetObjectKind().GroupVersionKind().Kind)
67-
fmt.Println("We are processing the upsert of this resource: " + obj.GetName())
68-
6964
if err := h.updateOrDeleteResources(ctx, obj, gatewayNSName); err != nil {
7065
logger.Error(err, "error handling resource update")
7166
}
@@ -75,17 +70,10 @@ func (h *eventHandler) HandleEventBatch(ctx context.Context, logger logr.Logger,
7570
if h.labelSelector.Matches(objLabels) {
7671
gatewayName := objLabels.Get(controller.GatewayLabel)
7772
gatewayNSName := types.NamespacedName{Namespace: obj.GetNamespace(), Name: gatewayName}
78-
79-
fmt.Println("Here is the type: " + obj.GetObjectKind().GroupVersionKind().Kind)
80-
fmt.Println("We are processing the upsert of this resource: " + obj.GetName())
81-
8273
if err := h.updateOrDeleteResources(ctx, obj, gatewayNSName); err != nil {
8374
logger.Error(err, "error handling resource update")
8475
}
8576

86-
// theres a gateway and ngf deployed
87-
// we delete ngf, wait until it comes back on, then before it takes the leader lease we delete the gateway.
88-
8977
statusUpdate := &status.QueueObject{
9078
Deployment: client.ObjectKeyFromObject(obj),
9179
UpdateType: status.UpdateGateway,
@@ -100,12 +88,10 @@ func (h *eventHandler) HandleEventBatch(ctx context.Context, logger logr.Logger,
10088
obj := e
10189
switch e.Type.(type) {
10290
case *gatewayv1.Gateway:
103-
10491
if !h.provisioner.isLeader() {
10592
h.provisioner.setResourceToDelete(obj.NamespacedName)
10693
}
10794

108-
fmt.Println("We see a delete event for the gateway! ")
10995
if err := h.provisioner.deprovisionNginx(ctx, e.NamespacedName); err != nil {
11096
logger.Error(err, "error deprovisioning nginx resources")
11197
}
@@ -133,7 +119,6 @@ func (h *eventHandler) updateOrDeleteResources(
133119
) error {
134120
if gw := h.store.getGateway(gatewayNSName); gw == nil {
135121
if !h.provisioner.isLeader() {
136-
fmt.Println("We are setting resources to be deleted since gateway is nil and we are not leader")
137122
h.provisioner.setResourceToDelete(gatewayNSName)
138123

139124
return nil

internal/mode/static/provisioner/provisioner.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,7 @@ func (p *NginxProvisioner) Enable(ctx context.Context) {
120120
p.lock.Unlock()
121121

122122
p.lock.RLock()
123-
fmt.Println("We are in the provioner's Enable")
124123
for _, gatewayNSName := range p.resourcesToDeleteOnStartup {
125-
fmt.Println("We are deleting some resources: " + gatewayNSName.Name)
126124
if err := p.deprovisionNginx(ctx, gatewayNSName); err != nil {
127125
p.cfg.Logger.Error(err, "error deprovisioning nginx resources on startup")
128126
}
@@ -310,10 +308,8 @@ func (p *NginxProvisioner) deprovisionNginx(ctx context.Context, gatewayNSName t
310308
Name: controller.CreateNginxResourceName(gatewayNSName.Name, p.cfg.GCName),
311309
Namespace: gatewayNSName.Namespace,
312310
}
313-
314-
fmt.Println("We got into deprovisionNginx!")
311+
315312
if p.isLeader() {
316-
fmt.Println("We are a leader and are removing nginx resources")
317313
p.cfg.Logger.Info(
318314
"Removing nginx resources for Gateway",
319315
"name", gatewayNSName.Name,

tests/framework/resourcemanager.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -334,22 +334,17 @@ func (rm *ResourceManager) WaitForAppsToBeReady(namespace string) error {
334334
// WaitForAppsToBeReadyWithCtx waits for all apps in the specified namespace to be ready or
335335
// until the provided context is canceled.
336336
func (rm *ResourceManager) WaitForAppsToBeReadyWithCtx(ctx context.Context, namespace string) error {
337-
fmt.Println("waiting on pods to be ready...")
338337
if err := rm.WaitForPodsToBeReady(ctx, namespace); err != nil {
339338
return err
340339
}
341340

342-
fmt.Println("waiting on routes to be ready...")
343-
344341
if err := rm.waitForHTTPRoutesToBeReady(ctx, namespace); err != nil {
345342
return err
346343
}
347-
fmt.Println("waiting on grpc routes to be ready...")
348344

349345
if err := rm.waitForGRPCRoutesToBeReady(ctx, namespace); err != nil {
350346
return err
351347
}
352-
fmt.Println("waiting on gateways to be ready...")
353348

354349
return rm.waitForGatewaysToBeReady(ctx, namespace)
355350
}

tests/suite/graceful_recovery_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,9 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
286286
// When the NGINX process is killed, some errors are expected in the NGF logs while we wait for the
287287
// NGINX container to be restarted. Therefore, we don't want to check the NGF logs for errors when the container
288288
// we restarted was NGINX.
289-
if containerName != nginxContainerName {
290-
checkNGFContainerLogsForErrors(ngfPodName)
291-
}
289+
//if containerName != nginxContainerName {
290+
// checkNGFContainerLogsForErrors(ngfPodName)
291+
//}
292292
}
293293

294294
runRestartNodeTest := func(teaURL, coffeeURL string, files []string, ns *core.Namespace, drain bool) {

0 commit comments

Comments
 (0)