Merge branch 'kubernetes-sigs:master' into master

Author: ivanLeont

pkg/gce-pd-csi-driver/controller.go

@@ -1620,9 +1620,6 @@ func (gceCS *GCEControllerServer) CreateSnapshot(ctx context.Context, req *csi.C
 		}
 		return nil, common.LoggedError("CreateSnapshot, failed to getDisk: ", err)
 	}
-	if common.IsHyperdisk(disk.GetPDType()) && disk.GetAccessMode() == common.GCEReadWriteManyAccessMode {
-		return nil, status.Errorf(codes.InvalidArgument, "Cannot create snapshot for disk type %s with access mode %s", common.DiskTypeHdHA, common.GCEReadWriteManyAccessMode)
-	}
 
 	snapshotParams, err := common.ExtractAndDefaultSnapshotParameters(req.GetParameters(), gceCS.Driver.name, gceCS.Driver.extraTags)
 	if err != nil {

pkg/gce-pd-csi-driver/controller_test.go

@@ -265,24 +265,6 @@ func TestCreateSnapshotArguments(t *testing.T) {
 				ReadyToUse:     false,
 			},
 		},
-		{
-			name: "fail to create snapshot for HdHA multi-writer",
-			req: &csi.CreateSnapshotRequest{
-				Name:           name,
-				SourceVolumeId: testRegionalID,
-				Parameters:     map[string]string{common.ParameterKeyStorageLocations: " US-WEST2"},
-			},
-			seedDisks: []*gce.CloudDisk{
-				gce.CloudDiskFromV1(&compute.Disk{
-					Name:       name,
-					SelfLink:   fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/project/regions/country-region/name/%s", name),
-					Type:       common.DiskTypeHdHA,
-					AccessMode: common.GCEReadWriteManyAccessMode,
-					Region:     "country-region",
-				}),
-			},
-			expErrCode: codes.InvalidArgument,
-		},
 	}
 
 	for _, tc := range testCases {

pkg/gce-pd-csi-driver/node.go

@@ -848,7 +848,7 @@ func (ns *GCENodeServer) GetVolumeLimits(ctx context.Context) (int64, error) {
 	}
 
 	// Process gen4 machine attach limits
-	gen4MachineTypesPrefix := []string{"c4a-", "c4-", "n4-"}
+	gen4MachineTypesPrefix := []string{"c4a-", "c4-", "n4-", "c4d-"}
 	for _, gen4Prefix := range gen4MachineTypesPrefix {
 		if strings.HasPrefix(machineType, gen4Prefix) {
 			machineTypeSlice := strings.Split(machineType, "-")

pkg/gce-pd-csi-driver/node_test.go

@@ -340,6 +340,11 @@ func TestNodeGetVolumeLimits(t *testing.T) {
 			machineType:    "c4a-standard-32-lssd",
 			expVolumeLimit: 49,
 		},
+		{
+			name:           "c4d-standard-32",
+			machineType:    "c4d-standard-32",
+			expVolumeLimit: 49,
+		},
 	}
 
 	for _, tc := range testCases {