Merge pull request #208 from ibuildthecloud/master

Fix k3s issues

pkg/kwrapper/etcd/etcd.go

@@ -4,10 +4,12 @@ package etcd
 
 import (
 	"context"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -16,9 +18,10 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func RunETCD(ctx context.Context) ([]string, error) {
+func RunETCD(ctx context.Context, dataDir string) ([]string, error) {
 	endpoint := "http://localhost:2379"
-	go runEtcd(ctx, []string{"--data-dir=./etcd"})
+
+	go runEtcd(ctx, []string{"etcd", fmt.Sprintf("--data-dir=%s", filepath.Join(dataDir, "etcd"))})
 
 	if err := checkEtcd(endpoint); err != nil {
 		return nil, errors.Wrap(err, "waiting on etcd")

pkg/kwrapper/k8s/embedded_none.go

@@ -1,4 +1,4 @@
-// +build !k3s
+// +build !k8s
 
 package k8s
 

pkg/kwrapper/k8s/k3s.go

@@ -1,4 +1,4 @@
-// +build k3s
+// +build k8s
 
 package k8s
 
@@ -13,25 +13,28 @@ import (
 )
 
 func getEmbedded(ctx context.Context) (bool, context.Context, *rest.Config, error) {
+	var (
+		err error
+	)
+
 	sc, ok := ctx.Value(serverConfig).(*server.ServerConfig)
 	if !ok {
-		ctx, sc, _, err = NewK3sConfig(ctx, "./k3s", nil)
+		ctx, sc, _, err = NewK3sConfig(ctx, "./management-state", nil)
 		if err != nil {
 			return false, ctx, nil, err
 		}
 		sc.NoScheduler = false
 	}
 
 	if len(sc.ETCDEndpoints) == 0 {
-		etcdEndpoints, err := etcd.RunETCD(ctx)
+		etcdEndpoints, err := etcd.RunETCD(ctx, sc.DataDir)
 		if err != nil {
-			return ctx, nil, nil, err
+			return false, ctx, nil, err
 		}
 		sc.ETCDEndpoints = etcdEndpoints
 	}
 
-	err := server.Server(ctx, sc)
-	if err != nil {
+	if err = server.Server(ctx, sc); err != nil {
 		return false, ctx, nil, err
 	}
 

pkg/kwrapper/k8s/tunnel_k3s.go

@@ -1,4 +1,4 @@
-// +build k3s
+// +build k8s
 
 package k8s
 

pkg/kwrapper/k8s/tunnel_none.go

@@ -1,4 +1,4 @@
-// +build !k3s
+// +build !k8s
 
 package k8s
 

vendor.conf

@@ -1,7 +1,7 @@
 # package
 github.com/rancher/norman
 
-k8s.io/kubernetes             v1.12.1-lite5                             https://github.com/ibuildthecloud/k3s.git  transitive=true,staging=true
+k8s.io/kubernetes             v1.12.1-lite7                             https://github.com/ibuildthecloud/k3s.git  transitive=true,staging=true
 github.com/maruel/panicparse  c0182c169410cfa80c7e8f046dad208eaef91338
 bitbucket.org/ww/goautoneg    a547fc61f48d567d5b4ec6f8aee5573d8efce11d  https://github.com/rancher/goautoneg.git
 golang.org/x/sync             fd80eb99c8f653c847d294a001bdf2a3a6f768f5