change CSI to Cluster in API

Signed-off-by: Drew Erny <[email protected]>
moby · Jul 19, 2022 · a5f27e4 · a5f27e4
1 parent 62ffb2b
commit a5f27e4
Show file tree

Hide file tree

Showing 8 changed files with 424 additions and 424 deletions.
diff --git a/api/api.pb.txt b/api/api.pb.txt
@@ -2779,10 +2779,10 @@ file {
         }
       }
       value {
-        name: "CSI"
+        name: "CLUSTER"
         number: 4
         options {
-          66001: "MountTypeCSI"
+          66001: "MountTypeCluster"
         }
       }
       options {

diff --git a/api/types.pb.go b/api/types.pb.go
diff --git a/api/types.proto b/api/types.proto
@@ -239,7 +239,7 @@ message Mount {
 		VOLUME = 1 [(gogoproto.enumvalue_customname) = "MountTypeVolume"];  // Remote storage volumes
 		TMPFS = 2 [(gogoproto.enumvalue_customname) = "MountTypeTmpfs"]; // Mount a tmpfs
 		NPIPE = 3 [(gogoproto.enumvalue_customname) = "MountTypeNamedPipe"]; // Windows named pipes
-		CSI = 4 [(gogoproto.enumvalue_customname) = "MountTypeCSI"]; // CSI volume
+		CLUSTER = 4 [(gogoproto.enumvalue_customname) = "MountTypeCluster"]; // CSI volume
 	}
 
 	// Type defines the nature of the mount.

diff --git a/manager/dispatcher/dispatcher_test.go b/manager/dispatcher/dispatcher_test.go
@@ -655,11 +655,11 @@ func TestAssignmentsWithVolume(t *testing.T) {
 				Container: &api.ContainerSpec{
 					Mounts: []api.Mount{
 						{
-							Type:   api.MountTypeCSI,
+							Type:   api.MountTypeCluster,
 							Source: "volumeName",
 							Target: "/foo",
 						}, {
-							Type:   api.MountTypeCSI,
+							Type:   api.MountTypeCluster,
 							Source: "group:volumeGroup",
 							Target: "/bar",
 						},

diff --git a/manager/scheduler/filter.go b/manager/scheduler/filter.go
@@ -419,7 +419,7 @@ func (f *VolumesFilter) SetTask(t *api.Task) bool {
 	// hasCSI will be set true if one of the mounts is a CSI-type mount.
 	hasCSI := false
 	for _, mount := range c.Mounts {
-		if mount.Type == api.MountTypeCSI {
+		if mount.Type == api.MountTypeCluster {
 			hasCSI = true
 			f.requestedVolumes = append(f.requestedVolumes, &mount)
 		}

diff --git a/manager/scheduler/scheduler_ginkgo_test.go b/manager/scheduler/scheduler_ginkgo_test.go
@@ -129,7 +129,7 @@ var _ = Describe("Scheduler", func() {
 							Container: &api.ContainerSpec{
 								Mounts: []api.Mount{
 									{
-										Type:   api.MountTypeCSI,
+										Type:   api.MountTypeCluster,
 										Source: "volume1",
 										Target: "/var/",
 									},
@@ -474,12 +474,12 @@ var _ = Describe("Scheduler", func() {
 							Container: &api.ContainerSpec{
 								Mounts: []api.Mount{
 									{
-										Type:   api.MountTypeCSI,
+										Type:   api.MountTypeCluster,
 										Source: "volume1",
 										Target: "/var/",
 									},
 									{
-										Type:   api.MountTypeCSI,
+										Type:   api.MountTypeCluster,
 										Source: "group:group2",
 										Target: "/home/",
 									},
@@ -511,7 +511,7 @@ var _ = Describe("Scheduler", func() {
 							Container: &api.ContainerSpec{
 								Mounts: []api.Mount{
 									{
-										Type:   api.MountTypeCSI,
+										Type:   api.MountTypeCluster,
 										Source: "volume1",
 										Target: "/foo/",
 									},
@@ -539,7 +539,7 @@ var _ = Describe("Scheduler", func() {
 							Container: &api.ContainerSpec{
 								Mounts: []api.Mount{
 									{
-										Type:   api.MountTypeCSI,
+										Type:   api.MountTypeCluster,
 										Source: "group:group2",
 										Target: "/foo/",
 									},

diff --git a/manager/scheduler/volumes.go b/manager/scheduler/volumes.go
@@ -111,7 +111,7 @@ func (vs *volumeSet) chooseTaskVolumes(task *api.Task, nodeInfo *NodeInfo) ([]*a
 		return nil, nil
 	}
 	for _, mount := range task.Spec.GetContainer().Mounts {
-		if mount.Type == api.MountTypeCSI {
+		if mount.Type == api.MountTypeCluster {
 			candidate := vs.isVolumeAvailableOnNode(&mount, nodeInfo)
 			if candidate == "" {
 				// TODO(dperny): return structured error types, instead of

diff --git a/manager/scheduler/volumes_test.go b/manager/scheduler/volumes_test.go
@@ -129,15 +129,15 @@ var _ = Describe("volumeSet", func() {
 						Container: &api.ContainerSpec{
 							Mounts: []api.Mount{
 								{
-									Type:   api.MountTypeCSI,
+									Type:   api.MountTypeCluster,
 									Source: v1.Spec.Group,
 									Target: "/var/spool/mail",
 								}, {
 									Type:   api.MountTypeBind,
 									Source: "/var/run/docker.sock",
 									Target: "/var/run/docker.sock",
 								}, {
-									Type:     api.MountTypeCSI,
+									Type:     api.MountTypeCluster,
 									Source:   v2.Spec.Annotations.Name,
 									Target:   "/srv/www",
 									ReadOnly: true,
@@ -444,7 +444,7 @@ var _ = Describe("volumeSet", func() {
 
 			It("should choose and return an available volume", func() {
 				mount := &api.Mount{
-					Type:   api.MountTypeCSI,
+					Type:   api.MountTypeCluster,
 					Source: "volumeName1",
 				}
 				volumeID := vs.isVolumeAvailableOnNode(mount, node)
@@ -453,7 +453,7 @@ var _ = Describe("volumeSet", func() {
 
 			It("should return an empty string if there are no available volumes", func() {
 				mount := &api.Mount{
-					Type:   api.MountTypeCSI,
+					Type:   api.MountTypeCluster,
 					Source: "volumeNameNotReal",
 				}
 				volumeID := vs.isVolumeAvailableOnNode(mount, node)
@@ -462,7 +462,7 @@ var _ = Describe("volumeSet", func() {
 
 			It("should specify one volume from a group, if the source is a group", func() {
 				mount := &api.Mount{
-					Type:   api.MountTypeCSI,
+					Type:   api.MountTypeCluster,
 					Source: "group:someVolumeGroup",
 				}
 				volumeID := vs.isVolumeAvailableOnNode(mount, node)
@@ -480,20 +480,20 @@ var _ = Describe("volumeSet", func() {
 			vs.addOrUpdateVolume(v3)
 			mounts := []api.Mount{
 				{
-					Type:     api.MountTypeCSI,
+					Type:     api.MountTypeCluster,
 					Source:   "group:volumeGroup",
 					Target:   "/somedir",
 					ReadOnly: true,
 				}, {
-					Type:   api.MountTypeCSI,
+					Type:   api.MountTypeCluster,
 					Source: v2.Spec.Annotations.Name,
 					Target: "/someOtherDir",
 				}, {
 					Type:   api.MountTypeBind,
 					Source: "/some/subdir",
 					Target: "/some/container/dir",
 				}, {
-					Type:   api.MountTypeCSI,
+					Type:   api.MountTypeCluster,
 					Source: v3.Spec.Annotations.Name,
 					Target: "/some/third/dir",
 				},
@@ -569,12 +569,12 @@ var _ = Describe("volumeSet", func() {
 							Container: &api.ContainerSpec{
 								Mounts: []api.Mount{
 									{
-										Type:   api.MountTypeCSI,
+										Type:   api.MountTypeCluster,
 										Source: volumes[i].Spec.Annotations.Name,
 										Target: "bar",
 									},
 									{
-										Type:   api.MountTypeCSI,
+										Type:   api.MountTypeCluster,
 										Source: allVolume.Spec.Annotations.Name,
 										Target: "baz",
 									},