Avoid create tag from metadata req of snapshot

kubernetes · Jun 17, 2021 · ea4c0a4 · ea4c0a4
1 parent f88591c
commit ea4c0a4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/pkg/csi/cinder/controllerserver.go b/pkg/csi/cinder/controllerserver.go
@@ -363,9 +363,6 @@ func (cs *controllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
 	} else {
 		// Add cluster ID to the snapshot metadata
 		properties := map[string]string{cinderCSIClusterIDKey: cs.Driver.cluster}
-		for mKey, mVal := range req.Parameters {
-			properties[mKey] = mVal
-		}
 
 		// TODO: Delegate the check to openstack itself and ignore the conflict
 		snap, err = cs.Cloud.CreateSnapshot(name, volumeId, &properties)

diff --git a/pkg/csi/cinder/controllerserver_test.go b/pkg/csi/cinder/controllerserver_test.go
@@ -407,7 +407,7 @@ func TestListVolumes(t *testing.T) {
 // Test CreateSnapshot
 func TestCreateSnapshot(t *testing.T) {
 
-	osmock.On("CreateSnapshot", FakeSnapshotName, FakeVolID, &map[string]string{cinderCSIClusterIDKey: "cluster", "tag": "tag1"}).Return(&FakeSnapshotRes, nil)
+	osmock.On("CreateSnapshot", FakeSnapshotName, FakeVolID, &map[string]string{cinderCSIClusterIDKey: "cluster"}).Return(&FakeSnapshotRes, nil)
 	osmock.On("ListSnapshots", map[string]string{"Name": FakeSnapshotName}).Return(FakeSnapshotListEmpty, "", nil)
 	osmock.On("WaitSnapshotReady", FakeSnapshotID).Return(nil)