github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert CSI patch

pull/782/head
Darren Shepherd 2019-08-31 22:17:08 -07:00
parent 6d24760c9c
commit 209acb58c1
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cli/server/server.go
View File

@ -21,7 +21,6 @@ import (
"github.com/urfave/cli" "github.com/urfave/cli"
"k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/net"
"k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/pkg/master"
"k8s.io/kubernetes/pkg/volume/csi"
_ "github.com/go-sql-driver/mysql" // ensure we have mysql _ "github.com/go-sql-driver/mysql" // ensure we have mysql
_ "github.com/lib/pq" // ensure we have postgres _ "github.com/lib/pq" // ensure we have postgres
@ -55,9 +54,6 @@ func run(app *cli.Context, cfg *cmds.Server) error {
} }
} }
// If running agent in server, set this so that CSI initializes properly
csi.WaitForValidHostName = !cfg.DisableAgent
serverConfig := server.Config{} serverConfig := server.Config{}
serverConfig.ControlConfig.ClusterSecret = cfg.ClusterSecret serverConfig.ControlConfig.ClusterSecret = cfg.ClusterSecret
serverConfig.ControlConfig.DataDir = cfg.DataDir serverConfig.ControlConfig.DataDir = cfg.DataDir