Merge pull request #782 from ibuildthecloud/master

Fix CSI and update vendor
k3s-io · Sep 1, 2019 · 4a5360e · 4a5360e
2 parents 8a9c867 + 209acb5
commit 4a5360e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 49 deletions.
diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go
@@ -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

diff --git a/vendor/k8s.io/client-go/pkg/version/base.go b/vendor/k8s.io/client-go/pkg/version/base.go
diff --git a/vendor/k8s.io/kubernetes/pkg/version/base.go b/vendor/k8s.io/kubernetes/pkg/version/base.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go b/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/plugins.go b/vendor/k8s.io/kubernetes/pkg/volume/plugins.go