Fixup items after move provider from vk/vk

cmd/virtual-kubelet/commands/root/node.go

@@ -20,21 +20,14 @@ import (
 
 	"github.com/virtual-kubelet/virtual-kubelet/errdefs"
 	"github.com/virtual-kubelet/virtual-kubelet/providers"
-	"github.com/virtual-kubelet/virtual-kubelet/version"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var (
-	// vkVersion is a concatenation of the Kubernetes version the VK is built against, the string "vk" and the VK release version.
-	// TODO @pires revisit after VK 1.0 is released as agreed in https://github.com/virtual-kubelet/virtual-kubelet/pull/446#issuecomment-448423176.
-	vkVersion = strings.Join([]string{"v1.13.1", "vk", version.Version}, "-")
-)
-
 // NodeFromProvider builds a kubernetes node object from a provider
 // This is a temporary solution until node stuff actually split off from the provider interface itself.
-func NodeFromProvider(ctx context.Context, name string, taint *v1.Taint, p providers.Provider) *v1.Node {
+func NodeFromProvider(ctx context.Context, name string, taint *v1.Taint, p providers.Provider, version string) *v1.Node {
 	taints := make([]v1.Taint, 0)
 
 	if taint != nil {
@@ -59,7 +52,7 @@ func NodeFromProvider(ctx context.Context, name string, taint *v1.Taint, p provi
 			NodeInfo: v1.NodeSystemInfo{
 				OperatingSystem: p.OperatingSystem(),
 				Architecture:    "amd64",
-				KubeletVersion:  vkVersion,
+				KubeletVersion:  version,
 			},
 			Capacity:        p.Capacity(ctx),
 			Allocatable:     p.Capacity(ctx),

cmd/virtual-kubelet/commands/root/opts.go

@@ -80,6 +80,8 @@ type Opts struct {
 
 	// Startup Timeout is how long to wait for the kubelet to start
 	StartupTimeout time.Duration
+
+	Version string
 }
 
 // SetDefaultOpts sets default options for unset values on the passed in option struct.

cmd/virtual-kubelet/commands/root/root.go

@@ -22,12 +22,12 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"github.com/virtual-kubelet/alibabacloud-eci"
 	"github.com/virtual-kubelet/virtual-kubelet/errdefs"
 	"github.com/virtual-kubelet/virtual-kubelet/log"
 	"github.com/virtual-kubelet/virtual-kubelet/manager"
 	"github.com/virtual-kubelet/virtual-kubelet/node"
 	"github.com/virtual-kubelet/virtual-kubelet/providers"
-	"github.com/virtual-kubelet/virtual-kubelet/providers/register"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -120,16 +120,18 @@ func runRootCommand(ctx context.Context, c Opts) error {
 		return err
 	}
 
-	initConfig := register.InitConfig{
-		ConfigPath:      c.ProviderConfigPath,
-		NodeName:        c.NodeName,
-		OperatingSystem: c.OperatingSystem,
-		ResourceManager: rm,
-		DaemonPort:      int32(c.ListenPort),
-		InternalIP:      os.Getenv("VKUBELET_POD_IP"),
+	if c.Provider != "" && c.Provider != "alibabacloud" {
+		return errors.Errorf("provider not supported %q: alibabacloud is the only support provider", c.Provider)
 	}
 
-	p, err := register.GetProvider(c.Provider, initConfig)
+	p, err := alibabacloud.NewECIProvider(
+		c.ProviderConfigPath,
+		rm,
+		c.NodeName,
+		c.OperatingSystem,
+		os.Getenv("VKUBELET_POD_IP"),
+		c.ListenPort,
+	)
 	if err != nil {
 		return err
 	}
@@ -146,7 +148,7 @@ func runRootCommand(ctx context.Context, c Opts) error {
 		leaseClient = client.CoordinationV1beta1().Leases(corev1.NamespaceNodeLease)
 	}
 
-	pNode := NodeFromProvider(ctx, c.NodeName, taint, p)
+	pNode := NodeFromProvider(ctx, c.NodeName, taint, p, c.Version)
 	nodeRunner, err := node.NewNodeController(
 		node.NaiveNodeProvider{},
 		pNode,