@@ -65,7 +65,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
65
65
return nil
66
66
}
67
67
68
- //var ngfPodName string
68
+ // var ngfPodName string
69
69
70
70
BeforeEach (func () {
71
71
// this test is unique in that it will check the entire log of both ngf and nginx containers
@@ -89,7 +89,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
89
89
Expect (resourceManager .Apply ([]client.Object {& ns })).To (Succeed ())
90
90
Expect (resourceManager .ApplyFromFiles (files , ns .Name )).To (Succeed ())
91
91
Expect (resourceManager .WaitForAppsToBeReady (ns .Name )).To (Succeed ())
92
- //Expect(resourceManager.WaitForAppsToBeReadyWithPodCount(ns.Name, 2)).To(Succeed())
92
+ // Expect(resourceManager.WaitForAppsToBeReadyWithPodCount(ns.Name, 2)).To(Succeed())
93
93
94
94
nginxPodNames , err := framework .GetReadyNginxPodNames (k8sClient , ns .Name , timeoutConfig .GetTimeout )
95
95
Expect (err ).ToNot (HaveOccurred ())
@@ -256,7 +256,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
256
256
257
257
Expect (resourceManager .ApplyFromFiles (files , ns .Name )).To (Succeed ())
258
258
Expect (resourceManager .WaitForAppsToBeReady (ns .Name )).To (Succeed ())
259
- //Expect(resourceManager.WaitForAppsToBeReadyWithPodCount(ns.Name, 2)).To(Succeed())
259
+ // Expect(resourceManager.WaitForAppsToBeReadyWithPodCount(ns.Name, 2)).To(Succeed())
260
260
261
261
var nginxPodNames []string
262
262
var err error
@@ -286,7 +286,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
286
286
// When the NGINX process is killed, some errors are expected in the NGF logs while we wait for the
287
287
// NGINX container to be restarted. Therefore, we don't want to check the NGF logs for errors when the container
288
288
// we restarted was NGINX.
289
- //if containerName != nginxContainerName {
289
+ // if containerName != nginxContainerName {
290
290
// checkNGFContainerLogsForErrors(ngfPodName)
291
291
//}
292
292
}
@@ -370,7 +370,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
370
370
setUpPortForward (nginxPodName , ns .Name )
371
371
372
372
checkNGFFunctionality (teaURL , coffeeURL , ngfPodName , "" , files , ns )
373
- //if errorLogs := getUnexpectedNginxErrorLogs(ngfPodName, ns.Name); errorLogs != "" {
373
+ // if errorLogs := getUnexpectedNginxErrorLogs(ngfPodName, ns.Name); errorLogs != "" {
374
374
// Skip(fmt.Sprintf("NGINX has unexpected error logs: \n%s", errorLogs))
375
375
//}
376
376
}
@@ -384,7 +384,6 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
384
384
}
385
385
386
386
It ("recovers when nginx container is restarted" , func () {
387
-
388
387
nginxPodNames , err := framework .GetReadyNginxPodNames (k8sClient , ns .Name , timeoutConfig .GetTimeout )
389
388
Expect (err ).ToNot (HaveOccurred ())
390
389
Expect (nginxPodNames ).To (HaveLen (1 ))
@@ -400,14 +399,18 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
400
399
setUpPortForward (nginxPodNames [0 ], ns .Name )
401
400
402
401
checkNGFFunctionality (teaURL , coffeeURL , nginxPodName , nginxContainerName , files , & ns )
403
- //if errorLogs := getUnexpectedNginxErrorLogs(nginxPodName, ns.Name); errorLogs != "" {
402
+ // if errorLogs := getUnexpectedNginxErrorLogs(nginxPodName, ns.Name); errorLogs != "" {
404
403
// Skip(fmt.Sprintf("NGINX has unexpected error logs: \n%s", errorLogs))
405
404
//}
406
405
})
407
406
408
407
It ("recovers when NGF Pod is restarted" , func () {
409
-
410
- startingNGFPodNames , err := framework .GetReadyNGFPodNames (k8sClient , ngfNamespace , releaseName , timeoutConfig .GetTimeout )
408
+ startingNGFPodNames , err := framework .GetReadyNGFPodNames (
409
+ k8sClient ,
410
+ ngfNamespace ,
411
+ releaseName ,
412
+ timeoutConfig .GetTimeout ,
413
+ )
411
414
Expect (err ).ToNot (HaveOccurred ())
412
415
Expect (startingNGFPodNames ).To (HaveLen (1 ))
413
416
@@ -422,7 +425,12 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
422
425
var newNGFPodNames []string
423
426
Eventually (
424
427
func () bool {
425
- newNGFPodNames , err = framework .GetReadyNGFPodNames (k8sClient , ngfNamespace , releaseName , timeoutConfig .GetStatusTimeout )
428
+ newNGFPodNames , err = framework .GetReadyNGFPodNames (
429
+ k8sClient ,
430
+ ngfNamespace ,
431
+ releaseName ,
432
+ timeoutConfig .GetStatusTimeout ,
433
+ )
426
434
return len (newNGFPodNames ) == 1 && err == nil
427
435
}).
428
436
WithTimeout (timeoutConfig .CreateTimeout * 2 ).
@@ -436,7 +444,6 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
436
444
Expect (newNGFPodName ).ToNot (Equal (startingNGFPodNames [0 ]))
437
445
438
446
checkNGFFunctionality (teaURL , coffeeURL , newNGFPodName , "" , files , & ns )
439
-
440
447
})
441
448
442
449
It ("recovers when drained node is restarted" , func () {
@@ -448,7 +455,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
448
455
})
449
456
})
450
457
451
- //func runRecoveryTest(teaURL, coffeeURL, ngfPodName, containerName string, files []string, ns *core.Namespace) {
458
+ // func runRecoveryTest(teaURL, coffeeURL, ngfPodName, containerName string, files []string, ns *core.Namespace) {
452
459
// var (
453
460
// err error
454
461
// leaseName string
0 commit comments