pull from xing

xing-yang · Aug 28, 2019 · fefe96a · fefe96a
2 parents 2d966de + 6666da6
commit fefe96a
Show file tree

Hide file tree

Showing 327 changed files with 88,310 additions and 39,610 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -13,19 +13,29 @@ required = [
   name = "github.com/container-storage-interface/spec"
   version = "=1.1.0"
 
+# TODO: all the k8s.io dependencies are overrides due to
+# csi-lib-utils constraints. Once 1.16.0 is released, update
+# all of these versions back to a constraint.
+
 # The dependency on external-provisioner should be removed with #60.
-[[constraint]]
+[[override]]
   name = "k8s.io/api"
-  version = "kubernetes-1.14.0"
+  branch = "master"
 
-[[constraint]]
+[[override]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.14.0"
+  branch = "master"
 
-[[constraint]]
+[[override]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.14.0"
+  branch = "master"
+
+[[override]]
+  name = "k8s.io/utils"
+  branch = "master"
+
 
+# These dependencies are used for CRD API generation
 [[constraint]]
   name = "k8s.io/code-generator"
   version = "kubernetes-1.14.0"

diff --git a/cmd/csi-snapshotter/create_crd.go b/cmd/csi-snapshotter/create_crd.go
diff --git a/cmd/csi-snapshotter/main.go b/cmd/csi-snapshotter/main.go
@@ -43,7 +43,6 @@ import (
 	clientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
 	snapshotscheme "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned/scheme"
 	informers "github.com/kubernetes-csi/external-snapshotter/pkg/client/informers/externalversions"
-	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	coreinformers "k8s.io/client-go/informers"
 )
 
@@ -119,20 +118,6 @@ func main() {
 	factory := informers.NewSharedInformerFactory(snapClient, *resyncPeriod)
 	coreFactory := coreinformers.NewSharedInformerFactory(kubeClient, *resyncPeriod)
 
-	// Create CRD resource
-	aeclientset, err := apiextensionsclient.NewForConfig(config)
-	if err != nil {
-		klog.Error(err.Error())
-		os.Exit(1)
-	}
-
-	// initialize CRD resource if it does not exist
-	err = CreateCRD(aeclientset)
-	if err != nil {
-		klog.Error(err.Error())
-		os.Exit(1)
-	}
-
 	// Add Snapshot types to the defualt Kubernetes so events can be logged for them
 	snapshotscheme.AddToScheme(scheme.Scheme)
 

diff --git a/pkg/apis/volumesnapshot/v1beta1/zz_generated.deepcopy.go b/pkg/apis/volumesnapshot/v1beta1/zz_generated.deepcopy.go