use NotifyContext and remove NotifyNodeStatus

Signed-off-by: Heba Elayoty <hebaelayoty@gmail.com>
virtual-kubelet · Jan 18, 2023 · c59ba68 · c59ba68
1 parent 26a0a6f
commit c59ba68
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 40 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])
@@ -224,10 +225,10 @@ func main() {
 
 				if vkVersion {
 					p, err := azproviderv2.NewACIProvider(ctx, cfgPath, azConfig, azACIAPIs, cfg, os.Getenv("VKUBELET_POD_IP"), int32(listenPort), operatingSystem, clusterDomain)
-					return p, p, err
+					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.go b/pkg/provider/aci.go
@@ -763,9 +763,6 @@ func (p *ACIProvider) Ping(ctx context.Context) error {
 	return nil
 }
 
-func (p *ACIProvider) NotifyNodeStatus(ctx context.Context, cb func(*v1.Node)) {
-}
-
 func (p *ACIProvider) getImagePullSecrets(pod *v1.Pod) (*[]azaci.ImageRegistryCredential, error) {
 	ips := make([]azaci.ImageRegistryCredential, 0, len(pod.Spec.ImagePullSecrets))
 	for _, ref := range pod.Spec.ImagePullSecrets {

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))