Sync kine changes from k3s-io/kine#325

Signed-off-by: Brad Davidson <[email protected]>

pkg/rke2/rke2_linux.go

@@ -19,7 +19,7 @@ import (
 	"github.com/k3s-io/k3s/pkg/cli/cmds"
 	"github.com/k3s-io/k3s/pkg/cluster/managed"
 	"github.com/k3s-io/k3s/pkg/etcd"
-	"github.com/k3s-io/kine/pkg/endpoint"
+	"github.com/k3s-io/kine/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/rancher/rke2/pkg/cli/defaults"
 	"github.com/rancher/rke2/pkg/images"
@@ -67,8 +67,10 @@ func initExecutor(clx *cli.Context, cfg Config, isServer bool) (*podexecutor.Sta
 
 		// When the datastore sets a etcd endpoint, rke2 does not need kine with tls and changes
 		// in the --etcd-servers inside podexecutor using ExternalDatabase
-		driver, _ := endpoint.ParseStorageEndpoint(cmds.ServerConfig.DatastoreEndpoint)
-		if !(driver == endpoint.ETCDBackend) {
+		scheme, _ := util.SchemeAndAddress(cmds.ServerConfig.DatastoreEndpoint)
+		switch scheme {
+		case "http", "https":
+		default:
 			cmds.ServerConfig.KineTLS = true
 			ExternalDatabase = true
 		}