Merge pull request #262 from pohly/vendor-k8s-1.14

vendor: update to k8s.io 1.14, avoid glog

Author: k8s-ci-robot

Gopkg.lock

@@ -44,6 +44,19 @@
   name = "github.com/kubernetes-csi/external-snapshotter"
   branch = "master"
 
+# We need a version which does not use glog, because pulling in glog clashes
+# with klog.Init. Anything >= 1.12 is fine, but we can't specify that
+# because of the lack of semantic versioning in Kubernetes. Therefore we
+# have to pick a certain release, otherwise we (more or less randomly) end
+# up with something older or master.
+[[constraint]]
+  name = "k8s.io/apiserver"
+  version = "kubernetes-1.14.0"
+
+[[constraint]]
+  name = "k8s.io/component-base"
+  version = "kubernetes-1.14.0"
+
 [prune]
   non-go = true
   go-tests = true

Gopkg.toml

@@ -40,7 +40,7 @@ import (
 	"k8s.io/klog"
 
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
-	utilflag "k8s.io/apiserver/pkg/util/flag"
+	utilflag "k8s.io/component-base/cli/flag"
 	csitranslationlib "k8s.io/csi-translation-lib"
 )
 
@@ -76,7 +76,7 @@ func init() {
 	flag.Set("logtostderr", "true")
 	flag.Parse()
 
-	if err := utilfeature.DefaultFeatureGate.SetFromMap(featureGates); err != nil {
+	if err := utilfeature.DefaultMutableFeatureGate.SetFromMap(featureGates); err != nil {
 		klog.Fatal(err)
 	}
 

cmd/csi-provisioner/csi-provisioner.go

@@ -26,7 +26,7 @@ const (
 )
 
 func init() {
-	utilfeature.DefaultFeatureGate.Add(defaultKubernetesFeatureGates)
+	utilfeature.DefaultMutableFeatureGate.Add(defaultKubernetesFeatureGates)
 }
 
 // defaultKubernetesFeatureGates consists of all known feature keys specific to external-provisioner.