From 837a943234d590e3274f0bf4239c100adb2f8228 Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Wed, 5 Aug 2020 09:26:36 -0700 Subject: [PATCH] Update for k8s 1.19 --- pkg/cloudprovider/cloudprovider.go | 4 ++++ pkg/daemons/executor/embed.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go index e36abd76a7..83f255161f 100644 --- a/pkg/cloudprovider/cloudprovider.go +++ b/pkg/cloudprovider/cloudprovider.go @@ -33,6 +33,10 @@ func (k *k3s) Instances() (cloudprovider.Instances, bool) { return k, true } +func (k *k3s) InstancesV2() (cloudprovider.InstancesV2, bool) { + return nil, false +} + func (k *k3s) LoadBalancer() (cloudprovider.LoadBalancer, bool) { return nil, false } diff --git a/pkg/daemons/executor/embed.go b/pkg/daemons/executor/embed.go index 1560de8c7e..90e04bf1f1 100644 --- a/pkg/daemons/executor/embed.go +++ b/pkg/daemons/executor/embed.go @@ -24,7 +24,7 @@ func init() { type Embedded struct{} func (Embedded) Kubelet(args []string) error { - command := kubelet.NewKubeletCommand(context.Background().Done()) + command := kubelet.NewKubeletCommand(context.Background()) command.SetArgs(args) go func() {