Merge pull request #1066 from jenting/jenting/images-support-snapshot-labels

k8s-ci-robot · web-flow · commit 382229a9dbcf · 2022-11-03T09:19:38.000-07:00
Support add the snapshot labels to images
diff --git a/pkg/gce-cloud-provider/compute/fake-gce.go b/pkg/gce-cloud-provider/compute/fake-gce.go
@@ -424,6 +424,7 @@ func (cloud *FakeCloudProvider) CreateImage(ctx context.Context, project string,
 		SourceType:        "RAW",
 		Status:            "PENDING",
 		StorageLocations:  snapshotParams.StorageLocations,
+		Labels:            snapshotParams.Labels,
 	}
 
 	switch volKey.Type() {
diff --git a/pkg/gce-cloud-provider/compute/gce-compute.go b/pkg/gce-cloud-provider/compute/gce-compute.go
@@ -924,6 +924,7 @@ func (cloud *CloudProvider) CreateImage(ctx context.Context, project string, vol
 		Name:             imageName,
 		StorageLocations: snapshotParams.StorageLocations,
 		Description:      description,
+		Labels:           snapshotParams.Labels,
 	}
 
 	_, err = cloud.service.Images.Insert(project, image).Context(ctx).ForceCreate(true).Do()
diff --git a/test/k8s-integration/config/image-volumesnapshotclass.yaml b/test/k8s-integration/config/image-volumesnapshotclass.yaml
@@ -7,3 +7,5 @@ deletionPolicy: Delete
 parameters:
   snapshot-type: images
   image-family: integration-test
+  # Add labels for testing.
+  labels: key1=value1,key2=value2
diff --git a/test/k8s-integration/config/pd-volumesnapshotclass.yaml b/test/k8s-integration/config/pd-volumesnapshotclass.yaml
@@ -4,3 +4,6 @@ metadata:
   name: csi-gce-pd-snapshot-class
 driver: pd.csi.storage.gke.io
 deletionPolicy: Delete
+parameters:
+  # Add labels for testing.
+  labels: key1=value1,key2=value2

Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,7 @@ func (cloud *FakeCloudProvider) CreateImage(ctx context.Context, project string,`
`424`	`424`	`SourceType: "RAW",`
`425`	`425`	`Status: "PENDING",`
`426`	`426`	`StorageLocations: snapshotParams.StorageLocations,`
	`427`	`+ Labels: snapshotParams.Labels,`
`427`	`428`	`}`
`428`	`429`
`429`	`430`	`switch volKey.Type() {`
Original file line number	Diff line number	Diff line change
`@@ -924,6 +924,7 @@ func (cloud *CloudProvider) CreateImage(ctx context.Context, project string, vol`
`924`	`924`	`Name: imageName,`
`925`	`925`	`StorageLocations: snapshotParams.StorageLocations,`
`926`	`926`	`Description: description,`
	`927`	`+ Labels: snapshotParams.Labels,`
`927`	`928`	`}`
`928`	`929`
`929`	`930`	`_, err = cloud.service.Images.Insert(project, image).Context(ctx).ForceCreate(true).Do()`