Merge pull request #1017 from sagor999/snapshot-labels

add support for setting snapshot labels

Author: k8s-ci-robot

pkg/common/parameters.go

@@ -83,6 +83,7 @@ type SnapshotParameters struct {
 	SnapshotType     string
 	ImageFamily      string
 	Tags             map[string]string
+	Labels           map[string]string
 }
 
 // ExtractAndDefaultParameters will take the relevant parameters from a map and
@@ -149,6 +150,7 @@ func ExtractAndDefaultSnapshotParameters(parameters map[string]string, driverNam
 		StorageLocations: []string{},
 		SnapshotType:     DiskSnapshotType,
 		Tags:             make(map[string]string), // Default
+		Labels:           make(map[string]string), // Default
 	}
 	for k, v := range parameters {
 		switch strings.ToLower(k) {
@@ -172,6 +174,15 @@ func ExtractAndDefaultSnapshotParameters(parameters map[string]string, driverNam
 			p.Tags[tagKeyCreatedForSnapshotNamespace] = v
 		case ParameterKeyVolumeSnapshotContentName:
 			p.Tags[tagKeyCreatedForSnapshotContentName] = v
+		case ParameterKeyLabels:
+			paramLabels, err := ConvertLabelsStringToMap(v)
+			if err != nil {
+				return p, fmt.Errorf("parameters contain invalid labels parameter: %w", err)
+			}
+			// Override any existing labels with those from this parameter.
+			for labelKey, labelValue := range paramLabels {
+				p.Labels[labelKey] = labelValue
+			}
 		default:
 			return p, fmt.Errorf("parameters contains invalid option %q", k)
 		}

pkg/common/parameters_test.go

@@ -183,6 +183,7 @@ func TestSnapshotParameters(t *testing.T) {
 				ParameterKeyVolumeSnapshotName:        "snapshot-name",
 				ParameterKeyVolumeSnapshotContentName: "snapshot-content-name",
 				ParameterKeyVolumeSnapshotNamespace:   "snapshot-namespace",
+				ParameterKeyLabels:                    "label-1=value-a,key1=value1",
 			},
 			expectedSnapshotParames: SnapshotParameters{
 				StorageLocations: []string{"asia"},
@@ -194,6 +195,7 @@ func TestSnapshotParameters(t *testing.T) {
 					tagKeyCreatedForSnapshotNamespace:   "snapshot-namespace",
 					tagKeyCreatedBy:                     "test-driver",
 				},
+				Labels: map[string]string{"label-1": "value-a", "key1": "value1"},
 			},
 			expectError: false,
 		},
@@ -204,6 +206,7 @@ func TestSnapshotParameters(t *testing.T) {
 				StorageLocations: []string{},
 				SnapshotType:     DiskSnapshotType,
 				Tags:             make(map[string]string),
+				Labels:           map[string]string{},
 			},
 			expectError: false,
 		},

pkg/gce-cloud-provider/compute/fake-gce.go

@@ -344,6 +344,7 @@ func (cloud *FakeCloudProvider) CreateSnapshot(ctx context.Context, project stri
 		Status:            "UPLOADING",
 		SelfLink:          cloud.getGlobalSnapshotURI(project, snapshotName),
 		StorageLocations:  snapshotParams.StorageLocations,
+		Labels:            snapshotParams.Labels,
 	}
 	switch volKey.Type() {
 	case meta.Zonal:

pkg/gce-cloud-provider/compute/gce-compute.go

@@ -1059,6 +1059,7 @@ func (cloud *CloudProvider) createZonalDiskSnapshot(ctx context.Context, project
 		Name:             snapshotName,
 		StorageLocations: snapshotParams.StorageLocations,
 		Description:      description,
+		Labels:           snapshotParams.Labels,
 	}
 
 	_, err := cloud.service.Disks.CreateSnapshot(project, volKey.Zone, volKey.Name, snapshotToCreate).Context(ctx).Do()
@@ -1075,6 +1076,7 @@ func (cloud *CloudProvider) createRegionalDiskSnapshot(ctx context.Context, proj
 		Name:             snapshotName,
 		StorageLocations: snapshotParams.StorageLocations,
 		Description:      description,
+		Labels:           snapshotParams.Labels,
 	}
 
 	_, err := cloud.service.RegionDisks.CreateSnapshot(project, volKey.Region, volKey.Name, snapshotToCreate).Context(ctx).Do()