Update external-attacher to use v1.0.0-rc2 csi spec

kubernetes-csi · Nov 15, 2018 · afb5c14 · afb5c14
1 parent 08b5d5b
commit afb5c14
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/pkg/connection/connection.go b/pkg/connection/connection.go
@@ -192,32 +192,32 @@ func (c *csiConnection) SupportsPluginControllerService(ctx context.Context) (bo
 	return false, nil
 }
 
-func (c *csiConnection) Attach(ctx context.Context, volumeID string, readOnly bool, nodeID string, caps *csi.VolumeCapability, attributes, secrets map[string]string) (metadata map[string]string, detached bool, err error) {
+func (c *csiConnection) Attach(ctx context.Context, volumeID string, readOnly bool, nodeID string, caps *csi.VolumeCapability, context, secrets map[string]string) (metadata map[string]string, detached bool, err error) {
 	client := csi.NewControllerClient(c.conn)
 
 	req := csi.ControllerPublishVolumeRequest{
-		VolumeId:                 volumeID,
-		NodeId:                   nodeID,
-		VolumeCapability:         caps,
-		Readonly:                 readOnly,
-		VolumeAttributes:         attributes,
-		ControllerPublishSecrets: secrets,
+		VolumeId:         volumeID,
+		NodeId:           nodeID,
+		VolumeCapability: caps,
+		Readonly:         readOnly,
+		VolumeContext:    context,
+		Secrets:          secrets,
 	}
 
 	rsp, err := client.ControllerPublishVolume(ctx, &req)
 	if err != nil {
 		return nil, isFinalError(err), err
 	}
-	return rsp.PublishInfo, false, nil
+	return rsp.PublishContext, false, nil
 }
 
 func (c *csiConnection) Detach(ctx context.Context, volumeID string, nodeID string, secrets map[string]string) (detached bool, err error) {
 	client := csi.NewControllerClient(c.conn)
 
 	req := csi.ControllerUnpublishVolumeRequest{
-		VolumeId:                   volumeID,
-		NodeId:                     nodeID,
-		ControllerUnpublishSecrets: secrets,
+		VolumeId: volumeID,
+		NodeId:   nodeID,
+		Secrets:  secrets,
 	}
 
 	_, err = client.ControllerUnpublishVolume(ctx, &req)

diff --git a/pkg/connection/connection_test.go b/pkg/connection/connection_test.go
@@ -374,15 +374,15 @@ func TestAttach(t *testing.T) {
 		VolumeId:         defaultVolumeID,
 		NodeId:           defaultNodeID,
 		VolumeCapability: defaultCaps,
-		VolumeAttributes: map[string]string{"foo": "bar"},
+		VolumeContext:    map[string]string{"foo": "bar"},
 		Readonly:         false,
 	}
 	secretsRequest := &csi.ControllerPublishVolumeRequest{
-		VolumeId:                 defaultVolumeID,
-		NodeId:                   defaultNodeID,
-		VolumeCapability:         defaultCaps,
-		ControllerPublishSecrets: map[string]string{"foo": "bar"},
-		Readonly:                 false,
+		VolumeId:         defaultVolumeID,
+		NodeId:           defaultNodeID,
+		VolumeCapability: defaultCaps,
+		Secrets:          map[string]string{"foo": "bar"},
+		Readonly:         false,
 	}
 
 	tests := []struct {
@@ -407,7 +407,7 @@ func TestAttach(t *testing.T) {
 			caps:     defaultCaps,
 			input:    defaultRequest,
 			output: &csi.ControllerPublishVolumeResponse{
-				PublishInfo: publishVolumeInfo,
+				PublishContext: publishVolumeInfo,
 			},
 			expectError:    false,
 			expectedInfo:   publishVolumeInfo,
@@ -432,7 +432,7 @@ func TestAttach(t *testing.T) {
 			readonly: true,
 			input:    readOnlyRequest,
 			output: &csi.ControllerPublishVolumeResponse{
-				PublishInfo: publishVolumeInfo,
+				PublishContext: publishVolumeInfo,
 			},
 			expectError:    false,
 			expectedInfo:   publishVolumeInfo,
@@ -468,7 +468,7 @@ func TestAttach(t *testing.T) {
 			attributes: map[string]string{"foo": "bar"},
 			input:      attributesRequest,
 			output: &csi.ControllerPublishVolumeResponse{
-				PublishInfo: publishVolumeInfo,
+				PublishContext: publishVolumeInfo,
 			},
 			expectError:    false,
 			expectedInfo:   publishVolumeInfo,
@@ -482,7 +482,7 @@ func TestAttach(t *testing.T) {
 			secrets:  map[string]string{"foo": "bar"},
 			input:    secretsRequest,
 			output: &csi.ControllerPublishVolumeResponse{
-				PublishInfo: publishVolumeInfo,
+				PublishContext: publishVolumeInfo,
 			},
 			expectError:    false,
 			expectedInfo:   publishVolumeInfo,
@@ -519,7 +519,7 @@ func TestAttach(t *testing.T) {
 			t.Errorf("test %q: got error: %v", test.name, err)
 		}
 		if err == nil && !reflect.DeepEqual(publishInfo, test.expectedInfo) {
-			t.Errorf("got unexpected PublishInfo: %+v", publishInfo)
+			t.Errorf("got unexpected PublishContext: %+v", publishInfo)
 		}
 		if detached != test.expectDetached {
 			t.Errorf("test %q: expected detached=%v, got %v", test.name, test.expectDetached, detached)
@@ -538,9 +538,9 @@ func TestDetachAttach(t *testing.T) {
 	}
 
 	secretsRequest := &csi.ControllerUnpublishVolumeRequest{
-		VolumeId:                   defaultVolumeID,
-		NodeId:                     defaultNodeID,
-		ControllerUnpublishSecrets: map[string]string{"foo": "bar"},
+		VolumeId: defaultVolumeID,
+		NodeId:   defaultNodeID,
+		Secrets:  map[string]string{"foo": "bar"},
 	}
 
 	tests := []struct {