E590 update method to use lbc metadata · nginx/kubernetes-ingress@4bb3f81 · GitHub
[go: up one dir, main page]

Skip to content

Commit 4bb3f81

Browse files
committed
update method to use lbc metadata
1 parent 3e1f212 commit 4bb3f81

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

internal/k8s/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3659,8 +3659,8 @@ func (lbc *LoadBalancerController) isPodMarkedForDeletion() bool {
36593659
nl.Debugf(lbc.Logger, "SIGTERM already received, controller is shutting down")
36603660
return true
36613661
}
3662-
podName := os.Getenv("POD_NAME")
3663-
podNamespace := os.Getenv("POD_NAMESPACE")
3662+
podName := lbc.metadata.pod.Name
3663+
podNamespace := lbc.metadata.pod.Namespace
36643664
pod, err := lbc.client.CoreV1().Pods(podNamespace).Get(context.Background(), podName, meta_v1.GetOptions{})
36653665
if err == nil && pod.DeletionTimestamp != nil {
36663666
nl.Debugf(lbc.Logger, "Pod %s/%s is marked for deletion", podNamespace, podName)

internal/k8s/controller_test.go

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"errors"
66
"fmt"
7-
"os"
87
"reflect"
98
"sort"
109
"strings"
@@ -3682,15 +3681,6 @@ func TestIsPodMarkedForDeletion(t *testing.T) {
36823681
test := test
36833682
t.Run(test.name, func(t *testing.T) {
36843683
client := fake.NewSimpleClientset()
3685-
3686-
err := os.Setenv("POD_NAME", test.envPodName)
3687-
if err != nil {
3688-
t.Fatalf("Failed to set POD_NAME environment variable: %v", err)
3689-
}
3690-
err = os.Setenv("POD_NAMESPACE", test.envPodNamespace)
3691-
if err != nil {
3692-
t.Fatalf("Failed to set POD_NAMESPACE environment variable: %v", err)
3693-
}
36943684
if test.podExists {
36953685
pod := &api_v1.Pod{
36963686
ObjectMeta: meta_v1.ObjectMeta{
@@ -3711,7 +3701,15 @@ func TestIsPodMarkedForDeletion(t *testing.T) {
37113701
}
37123702

37133703
lbc := &LoadBalancerController{
3714-
client: client,
3704+
client: client,
3705+
metadata: controllerMetadata{
3706+
pod: &api_v1.Pod{
3707+
ObjectMeta: meta_v1.ObjectMeta{
3708+
Name: test.envPodName,
3709+
Namespace: test.envPodNamespace,
3710+
},
3711+
},
3712+
},
37153713
ShuttingDown: test.shutdownFlag,
37163714
Logger: logger,
37173715
}

0 commit comments

Comments
 (0)
0