use NotifyContext and remove NotifyNodeStatus

Signed-off-by: Heba Elayoty <[email protected]>
virtual-kubelet · Jan 24, 2023 · 210515a · 210515a
1 parent b886eb7
commit 210515a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 39 deletions.
diff --git a/cmd/virtual-kubelet/context.go b/cmd/virtual-kubelet/context.go
diff --git a/cmd/virtual-kubelet/main.go b/cmd/virtual-kubelet/main.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"os/signal"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -51,7 +52,7 @@ var (
 )
 
 func main() {
-	ctx, cancel := BaseContext(context.Background())
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
 	defer cancel()
 
 	binaryName := filepath.Base(os.Args[0])
@@ -226,12 +227,11 @@ func main() {
 				}
 
 				if vkVersion {
-					p, err := azproviderv2.NewACIProvider(ctx, cfgPath, azConfig, azACIAPIs, cfg, os.Getenv("VKUBELET_POD_IP"), int32(listenPort), operatingSystem, clusterDomain)
-					//        azproviderv2.NewACIProvider(ctx, cfg.ConfigPath, azConfig, azACIAPIs, cfg.ResourceManager, cfg.NodeName, cfg.OperatingSystem, cfg.InternalIP, cfg.DaemonPort, cfg.KubeClusterDomain)
+					p, err := azproviderv2.NewACIProvider(ctx, cfgPath, azConfig, azACIAPIs, cfg, nodeName, operatingSystem, os.Getenv("VKUBELET_POD_IP"), int32(listenPort), clusterDomain)
 					return p, nil, err
 				} else {
 					p, err := azproviderv1.NewACIProvider(cfgPath, cfg, os.Getenv("VKUBELET_POD_IP"), int32(listenPort), operatingSystem, clusterDomain)
-					return p, p, err
+					return p, nil, err
 				}
 			},
 			withConfigureRoutes,

diff --git a/pkg/provider/aci_test.go b/pkg/provider/aci_test.go
@@ -587,7 +587,7 @@ func createTestProvider(aciMocks *MockACIProvider, configMapMocker *MockConfigMa
 	cfg.Node.Name = fakeNodeName
 	cfg.Node.Status.NodeInfo.OperatingSystem = "Linux"
 
-	provider, err := NewACIProvider(ctx, "example.toml", azConfig, aciMocks, cfg, "0.0.0.0", 10250, "Linux", "cluster.local")
+	provider, err := NewACIProvider(ctx, "example.toml", azConfig, aciMocks, cfg, fakeNodeName, "Linux", "0.0.0.0", 10250, "cluster.local")
 	if err != nil {
 		return nil, err
 	}

diff --git a/provider/aci.go b/provider/aci.go
@@ -1233,9 +1233,6 @@ func (p *ACIProvider) Ping(ctx context.Context) error {
 	return nil
 }
 
-func (p *ACIProvider) NotifyNodeStatus(ctx context.Context, cb func(*v1.Node)) {
-}
-
 // getContainerGroup returns a container group from ACI.
 func (p *ACIProvider) getContainerGroup(ctx context.Context, namespace, name string) (*aci.ContainerGroup, error) {
 	cg, status, err := p.aciClient.GetContainerGroup(ctx, p.resourceGroup, fmt.Sprintf("%s-%s", namespace, name))