Merge pull request #238 from msau42/topology-beta

Topology beta

Author: k8s-ci-robot

Gopkg.lock

@@ -43,7 +43,7 @@
 # TODO: remove when official 11.0.0 tagged
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.14.0-beta.2"
+  branch = "release-11.0"
 
 # TODO: remove when official 0.4.0 tagged
 [[constraint]]

Gopkg.toml

@@ -29,7 +29,6 @@ import (
 
 	ctrl "github.com/kubernetes-csi/external-provisioner/pkg/controller"
 	snapclientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
-	csiclientset "k8s.io/csi-api/pkg/client/clientset/versioned"
 	"sigs.k8s.io/sig-storage-lib-external-provisioner/controller"
 
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -120,10 +119,6 @@ func init() {
 	if err != nil {
 		klog.Fatalf("Failed to create snapshot client: %v", err)
 	}
-	csiAPIClient, err := csiclientset.NewForConfig(config)
-	if err != nil {
-		klog.Fatalf("Failed to create CSI API client: %v", err)
-	}
 
 	// The controller needs to know what the server version is because out-of-tree
 	// provisioners aren't officially supported until 1.5
@@ -181,7 +176,7 @@ func init() {
 
 	// Create the provisioner: it implements the Provisioner interface expected by
 	// the controller
-	csiProvisioner := ctrl.NewCSIProvisioner(clientset, csiAPIClient, *operationTimeout, identity, *volumeNamePrefix, *volumeNameUUIDLength, grpcClient, snapClient, provisionerName, pluginCapabilities, controllerCapabilities, supportsMigrationFromInTreePluginName)
+	csiProvisioner := ctrl.NewCSIProvisioner(clientset, *operationTimeout, identity, *volumeNamePrefix, *volumeNameUUIDLength, grpcClient, snapClient, provisionerName, pluginCapabilities, controllerCapabilities, supportsMigrationFromInTreePluginName)
 	provisionController = controller.NewProvisionController(
 		clientset,
 		provisionerName,

cmd/csi-provisioner/csi-provisioner.go

@@ -44,8 +44,8 @@ rules:
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
     verbs: ["get", "list"]
-  - apiGroups: ["csi.storage.k8s.io"]
-    resources: ["csinodeinfos"]
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["csinodes"]
     verbs: ["get", "list", "watch"]
   - apiGroups: [""]
     resources: ["nodes"]

deploy/kubernetes/rbac.yaml

@@ -32,7 +32,7 @@ import (
 	"sigs.k8s.io/sig-storage-lib-external-provisioner/controller"
 	"sigs.k8s.io/sig-storage-lib-external-provisioner/util"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	_ "k8s.io/apimachinery/pkg/util/json"
@@ -41,7 +41,6 @@ import (
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
-	csiclientset "k8s.io/csi-api/pkg/client/clientset/versioned"
 	csitranslationlib "k8s.io/csi-translation-lib"
 	"k8s.io/klog"
 
@@ -149,7 +148,6 @@ var (
 type csiProvisioner struct {
 	client                                kubernetes.Interface
 	csiClient                             csi.ControllerClient
-	csiAPIClient                          csiclientset.Interface
 	grpcClient                            *grpc.ClientConn
 	snapshotClient                        snapclientset.Interface
 	timeout                               time.Duration
@@ -207,7 +205,6 @@ func GetDriverCapabilities(conn *grpc.ClientConn, timeout time.Duration) (connec
 
 // NewCSIProvisioner creates new CSI provisioner
 func NewCSIProvisioner(client kubernetes.Interface,
-	csiAPIClient csiclientset.Interface,
 	connectionTimeout time.Duration,
 	identity string,
 	volumeNamePrefix string,
@@ -224,7 +221,6 @@ func NewCSIProvisioner(client kubernetes.Interface,
 		client:                                client,
 		grpcClient:                            grpcClient,
 		csiClient:                             csiClient,
-		csiAPIClient:                          csiAPIClient,
 		snapshotClient:                        snapshotClient,
 		timeout:                               connectionTimeout,
 		identity:                              identity,
@@ -433,7 +429,6 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis
 	if p.supportsTopology() {
 		requirements, err := GenerateAccessibilityRequirements(
 			p.client,
-			p.csiAPIClient,
 			p.driverName,
 			options.PVC.Name,
 			options.AllowedTopologies,