Revert CSI patch

This commit is contained in:
Darren Shepherd 2019-08-31 22:17:08 -07:00
parent 6d24760c9c
commit 209acb58c1

View File

@ -21,7 +21,6 @@ import (
"github.com/urfave/cli"
"k8s.io/apimachinery/pkg/util/net"
"k8s.io/kubernetes/pkg/master"
"k8s.io/kubernetes/pkg/volume/csi"
_ "github.com/go-sql-driver/mysql" // ensure we have mysql
_ "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.ControlConfig.ClusterSecret = cfg.ClusterSecret
serverConfig.ControlConfig.DataDir = cfg.DataDir