Fixup items after move provider from vk/vk

This commit is contained in:
Brian Goff
2019-06-14 12:49:28 -07:00
parent 38456348d6
commit a894106043
7 changed files with 33 additions and 33 deletions

View File

@@ -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,