From dec9be08bbaf9d08e04a89c13c14ac7d772ea327 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Wed, 7 Nov 2018 11:43:56 -0700 Subject: [PATCH] Fix no_etcd and k3s --- pkg/kwrapper/etcd/etcd_none.go | 2 +- pkg/kwrapper/k8s/config_none.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/kwrapper/etcd/etcd_none.go b/pkg/kwrapper/etcd/etcd_none.go index 9f749644..b6e2d87e 100644 --- a/pkg/kwrapper/etcd/etcd_none.go +++ b/pkg/kwrapper/etcd/etcd_none.go @@ -6,6 +6,6 @@ import ( "context" ) -func RunETCD(ctx context.Context) ([]string, error) { +func RunETCD(ctx context.Context, dataDir string) ([]string, error) { return nil, nil } diff --git a/pkg/kwrapper/k8s/config_none.go b/pkg/kwrapper/k8s/config_none.go index b9927786..acd2dd9d 100644 --- a/pkg/kwrapper/k8s/config_none.go +++ b/pkg/kwrapper/k8s/config_none.go @@ -4,12 +4,11 @@ package k8s import ( "context" - "fmt" "net/http" "github.com/rancher/norman/pkg/remotedialer" ) func NewK3sConfig(ctx context.Context, dataDir string, authorizer remotedialer.Authorizer) (context.Context, interface{}, http.Handler, error) { - return ctx, nil, nil, fmt.Errorf("k3s not compiled in, build with -tags k8s") + return ctx, nil, nil, nil }