Skip to content

Commit 633e466

Browse files
mattcarymattcary
authored
Merge pull request #955 from mattcary/cp-image
Cherry-pick of #929
2 parents 5ca2c64 + 2c9984f commit 633e466

14 files changed

+174
-26
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,17 @@ func (d *CloudDisk) GetSourceDiskId() string {
188188
}
189189
}
190190

191+
func (d *CloudDisk) GetImageId() string {
192+
switch {
193+
case d.disk != nil:
194+
return d.disk.SourceImageId
195+
case d.betaDisk != nil:
196+
return d.betaDisk.SourceImageId
197+
default:
198+
return ""
199+
}
200+
}
201+
191202
func (d *CloudDisk) GetKMSKeyName() string {
192203
switch {
193204
case d.disk != nil:

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

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -196,16 +196,30 @@ func (cloud *FakeCloudProvider) InsertDisk(ctx context.Context, project string,
196196
}
197197

198198
computeDisk := &computev1.Disk{
199-
Name: volKey.Name,
200-
SizeGb: common.BytesToGbRoundUp(capBytes),
201-
Description: "Disk created by GCE-PD CSI Driver",
202-
Type: cloud.GetDiskTypeURI(project, volKey, params.DiskType),
203-
SourceSnapshotId: snapshotID,
204-
SourceDiskId: volumeContentSourceVolumeID,
205-
SourceImageId: snapshotID,
206-
Status: cloud.mockDiskStatus,
207-
Labels: params.Labels,
199+
Name: volKey.Name,
200+
SizeGb: common.BytesToGbRoundUp(capBytes),
201+
Description: "Disk created by GCE-PD CSI Driver",
202+
Type: cloud.GetDiskTypeURI(project, volKey, params.DiskType),
203+
SourceDiskId: volumeContentSourceVolumeID,
204+
Status: cloud.mockDiskStatus,
205+
Labels: params.Labels,
208206
}
207+
208+
if snapshotID != "" {
209+
_, snapshotType, _, err := common.SnapshotIDToProjectKey(snapshotID)
210+
if err != nil {
211+
return err
212+
}
213+
switch snapshotType {
214+
case common.DiskSnapshotType:
215+
computeDisk.SourceSnapshotId = snapshotID
216+
case common.DiskImageType:
217+
computeDisk.SourceImageId = snapshotID
218+
default:
219+
return fmt.Errorf("invalid snapshot type in snapshot ID: %s", snapshotType)
220+
}
221+
}
222+
209223
if params.DiskEncryptionKMSKey != "" {
210224
computeDisk.DiskEncryptionKey = &computev1.CustomerEncryptionKey{
211225
KmsKeyName: params.DiskEncryptionKMSKey,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ func (cloud *CloudProvider) CreateImage(ctx context.Context, project string, vol
871871
StorageLocations: snapshotParams.StorageLocations,
872872
}
873873

874-
_, err = cloud.service.Images.Insert(project, image).Context(ctx).Do()
874+
_, err = cloud.service.Images.Insert(project, image).Context(ctx).ForceCreate(true).Do()
875875
if err != nil {
876876
return nil, err
877877
}

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1480,8 +1480,9 @@ func generateCreateVolumeResponse(disk *gce.CloudDisk, zones []string) *csi.Crea
14801480
},
14811481
}
14821482
snapshotID := disk.GetSnapshotId()
1483+
imageID := disk.GetImageId()
14831484
diskID := disk.GetSourceDiskId()
1484-
if diskID != "" || snapshotID != "" {
1485+
if diskID != "" || snapshotID != "" || imageID != "" {
14851486
contentSource := &csi.VolumeContentSource{}
14861487
if snapshotID != "" {
14871488
contentSource = &csi.VolumeContentSource{
@@ -1501,6 +1502,15 @@ func generateCreateVolumeResponse(disk *gce.CloudDisk, zones []string) *csi.Crea
15011502
},
15021503
}
15031504
}
1505+
if imageID != "" {
1506+
contentSource = &csi.VolumeContentSource{
1507+
Type: &csi.VolumeContentSource_Snapshot{
1508+
Snapshot: &csi.VolumeContentSource_SnapshotSource{
1509+
SnapshotId: imageID,
1510+
},
1511+
},
1512+
}
1513+
}
15041514
createResp.Volume.ContentSource = contentSource
15051515
}
15061516
return createResp

‎test/e2e/tests/single_zone_e2e_test.go

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -946,6 +946,65 @@ var _ = Describe("GCE PD CSI Driver", func() {
946946
Expect(gce.IsGCEError(err, "notFound")).To(BeTrue(), "Expected snapshot to not be found")
947947
}()
948948
})
949+
950+
// Use the region of the test location.
951+
It("Should successfully create snapshot backed by disk image", func() {
952+
testContext := getRandomTestContext()
953+
954+
p, z, _ := testContext.Instance.GetIdentity()
955+
client := testContext.Client
956+
957+
// Create Disk
958+
volName, volID := createAndValidateUniqueZonalDisk(client, p, z)
959+
960+
// Create Snapshot
961+
snapshotName := testNamePrefix + string(uuid.NewUUID())
962+
testImageFamily := "test-family"
963+
964+
snapshotParams := map[string]string{common.ParameterKeySnapshotType: common.DiskImageType, common.ParameterKeyImageFamily: testImageFamily}
965+
snapshotID, err := client.CreateSnapshot(snapshotName, volID, snapshotParams)
966+
Expect(err).To(BeNil(), "CreateSnapshot failed with error: %v", err)
967+
968+
// Validate Snapshot Created
969+
snapshot, err := computeService.Images.Get(p, snapshotName).Do()
970+
Expect(err).To(BeNil(), "Could not get snapshot from cloud directly")
971+
Expect(snapshot.Name).To(Equal(snapshotName))
972+
973+
err = wait.Poll(10*time.Second, 5*time.Minute, func() (bool, error) {
974+
snapshot, err := computeService.Images.Get(p, snapshotName).Do()
975+
Expect(err).To(BeNil(), "Could not get snapshot from cloud directly")
976+
if snapshot.Status == "READY" {
977+
return true, nil
978+
}
979+
return false, nil
980+
})
981+
Expect(err).To(BeNil(), "Could not wait for snapshot be ready")
982+
983+
// Check Snapshot Type
984+
snapshot, err = computeService.Images.Get(p, snapshotName).Do()
985+
Expect(err).To(BeNil(), "Could not get snapshot from cloud directly")
986+
_, snapshotType, _, err := common.SnapshotIDToProjectKey(cleanSelfLink(snapshot.SelfLink))
987+
Expect(err).To(BeNil(), "Failed to parse snapshot ID")
988+
Expect(snapshotType).To(Equal(common.DiskImageType), "Expected images type in snapshot ID")
989+
990+
defer func() {
991+
// Delete Disk
992+
err := client.DeleteVolume(volID)
993+
Expect(err).To(BeNil(), "DeleteVolume failed")
994+
995+
// Validate Disk Deleted
996+
_, err = computeService.Disks.Get(p, z, volName).Do()
997+
Expect(gce.IsGCEError(err, "notFound")).To(BeTrue(), "Expected disk to not be found")
998+
999+
// Delete Snapshot
1000+
err = client.DeleteSnapshot(snapshotID)
1001+
Expect(err).To(BeNil(), "DeleteSnapshot failed")
1002+
1003+
// Validate Snapshot Deleted
1004+
_, err = computeService.Images.Get(p, snapshotName).Do()
1005+
Expect(gce.IsGCEError(err, "notFound")).To(BeTrue(), "Expected snapshot to not be found")
1006+
}()
1007+
})
9491008
})
9501009

9511010
func equalWithinEpsilon(a, b, epsiolon int64) bool {
@@ -1025,3 +1084,9 @@ func createAndValidateUniqueZonalMultiWriterDisk(client *remote.CsiClient, proje
10251084

10261085
return volName, volID
10271086
}
1087+
1088+
func cleanSelfLink(selfLink string) string {
1089+
temp := strings.TrimPrefix(selfLink, gce.GCEComputeAPIEndpoint)
1090+
temp = strings.TrimPrefix(temp, gce.GCEComputeBetaAPIEndpoint)
1091+
return strings.TrimPrefix(temp, gce.GCEComputeAlphaAPIEndpoint)
1092+
}

‎test/k8s-integration/config/image-volumesnapshotclass.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: snapshot.storage.k8s.io/v1beta1
2+
kind: VolumeSnapshotClass
3+
metadata:
4+
name: csi-gce-image-snapshot-class
5+
driver: pd.csi.storage.gke.io
6+
deletionPolicy: Delete
7+
parameters:
8+
snapshot-type: images
9+
image-family: integration-test

‎test/k8s-integration/config/test-config-template.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Timeouts:
1010
{{ end }}
1111
{{end}}
1212
DriverInfo:
13-
Name: csi-gcepd-{{.StorageClass}}
13+
Name: csi-gcepd-{{.StorageClass}}--{{.SnapshotClass}}
1414
SupportedFsType:
1515
{{range .SupportedFsType}} {{ . }}:
1616
{{end}}
@@ -28,4 +28,4 @@ DriverInfo:
2828
Max: 64Ti
2929
TopologyKeys:
3030
- topology.gke.io/zone
31-
NumAllowedTopologies: {{.NumAllowedTopologies}}
31+
NumAllowedTopologies: {{.NumAllowedTopologies}}

‎test/k8s-integration/driver-config.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ type driverConfig struct {
1313
StorageClassFile string
1414
StorageClass string
1515
SnapshotClassFile string
16+
SnapshotClass string
1617
Capabilities []string
1718
SupportedFsType []string
1819
MinimumVolumeSize string
@@ -115,11 +116,15 @@ func generateDriverConfigFile(testParams *testParameters, storageClassFile strin
115116
}
116117

117118
var absSnapshotClassFilePath string
119+
var snapshotClassName string
118120
// If snapshot class is passed in as argument, include snapshot specific driver capabiltiites.
119121
if testParams.snapshotClassFile != "" {
120122
caps = append(caps, "snapshotDataSource")
121123
// Update the absolute file path pointing to the snapshot class file, if it is provided as an argument.
122124
absSnapshotClassFilePath = filepath.Join(testParams.pkgDir, testConfigDir, testParams.snapshotClassFile)
125+
snapshotClassName = testParams.snapshotClassFile[:strings.LastIndex(testParams.snapshotClassFile, ".")]
126+
} else {
127+
snapshotClassName = "no-volumesnapshotclass"
123128
}
124129

125130
caps = append(caps, "pvcDataSource")
@@ -136,6 +141,7 @@ func generateDriverConfigFile(testParams *testParameters, storageClassFile strin
136141
StorageClassFile: filepath.Join(testParams.pkgDir, testConfigDir, storageClassFile),
137142
StorageClass: storageClassFile[:strings.LastIndex(storageClassFile, ".")],
138143
SnapshotClassFile: absSnapshotClassFilePath,
144+
SnapshotClass: snapshotClassName,
139145
SupportedFsType: fsTypes,
140146
Capabilities: caps,
141147
MinimumVolumeSize: minimumVolumeSize,

‎test/k8s-integration/main.go

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var (
5757
// Test infrastructure flags
5858
boskosResourceType = flag.String("boskos-resource-type", "gce-project", "name of the boskos resource type to reserve")
5959
storageClassFiles = flag.String("storageclass-files", "", "name of storageclass yaml file to use for test relative to test/k8s-integration/config. This may be a comma-separated list to test multiple storage classes")
60-
snapshotClassFile = flag.String("snapshotclass-file", "", "name of snapshotclass yaml file to use for test relative to test/k8s-integration/config")
60+
snapshotClassFiles = flag.String("snapshotclass-files", "", "name of snapshotclass yaml file to use for test relative to test/k8s-integration/config. This may be a comma-separated list to test multiple storage classes")
6161
inProw = flag.Bool("run-in-prow", false, "is the test running in PROW")
6262

6363
// Driver flags
@@ -203,7 +203,6 @@ func handle() error {
203203
testParams := &testParameters{
204204
platform: *platform,
205205
testFocus: *testFocus,
206-
snapshotClassFile: *snapshotClassFile,
207206
stagingVersion: string(uuid.NewUUID()),
208207
deploymentStrategy: *deploymentStrat,
209208
useGKEManagedDriver: *useGKEManagedDriver,
@@ -481,6 +480,7 @@ func handle() error {
481480
// Run the tests using the k8sSourceDir kubernetes
482481
if len(*storageClassFiles) != 0 {
483482
applicableStorageClassFiles := []string{}
483+
applicableSnapshotClassFiles := []string{}
484484
for _, rawScFile := range strings.Split(*storageClassFiles, ",") {
485485
scFile := strings.TrimSpace(rawScFile)
486486
if len(scFile) == 0 {
@@ -495,13 +495,29 @@ func handle() error {
495495
if len(applicableStorageClassFiles) == 0 {
496496
return fmt.Errorf("No applicable storage classes found")
497497
}
498+
for _, rawSnapshotClassFile := range strings.Split(*snapshotClassFiles, ",") {
499+
snapshotClassFile := strings.TrimSpace(rawSnapshotClassFile)
500+
if len(snapshotClassFile) != 0 {
501+
applicableSnapshotClassFiles = append(applicableSnapshotClassFiles, snapshotClassFile)
502+
}
503+
}
504+
if len(applicableSnapshotClassFiles) == 0 {
505+
// when no snapshot class specified, we run the tests without snapshot capability
506+
applicableSnapshotClassFiles = append(applicableSnapshotClassFiles, "")
507+
}
498508
var ginkgoErrors []string
499509
var testOutputDirs []string
500510
for _, scFile := range applicableStorageClassFiles {
501511
outputDir := strings.TrimSuffix(scFile, ".yaml")
502-
testOutputDirs = append(testOutputDirs, outputDir)
503-
if err = runCSITests(testParams, scFile, outputDir); err != nil {
504-
ginkgoErrors = append(ginkgoErrors, err.Error())
512+
for _, snapshotClassFile := range applicableSnapshotClassFiles {
513+
if len(snapshotClassFile) != 0 {
514+
outputDir = fmt.Sprintf("%s--%s", outputDir, strings.TrimSuffix(snapshotClassFile, ".yaml"))
515+
}
516+
testOutputDirs = append(testOutputDirs, outputDir)
517+
testParams.snapshotClassFile = snapshotClassFile
518+
if err = runCSITests(testParams, scFile, outputDir); err != nil {
519+
ginkgoErrors = append(ginkgoErrors, err.Error())
520+
}
505521
}
506522
}
507523
if err = mergeArtifacts(testOutputDirs); err != nil {

‎test/run-k8s-integration-ci.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ readonly run_intree_plugin_tests=${RUN_INTREE_PLUGIN_TESTS:-false}
2929
readonly use_kubetest2=${USE_KUBETEST2:-true}
3030
readonly test_pd_labels=${TEST_PD_LABELS:-true}
3131
readonly migration_test=${MIGRATION_TEST:-false}
32+
readonly test_disk_image_snapshot=${TEST_DISK_IMAGE_SNAPSHOT:-true}
3233

3334
readonly GCE_PD_TEST_FOCUS="PersistentVolumes\sGCEPD|[V|v]olume\sexpand|\[sig-storage\]\sIn-tree\sVolumes\s\[Driver:\sgcepd\]|allowedTopologies|Pod\sDisks|PersistentVolumes\sDefault"
3435

@@ -62,7 +63,7 @@ fi
6263
base_cmd="${PKGDIR}/bin/k8s-integration-test \
6364
--run-in-prow=true --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
6465
--do-driver-build=${do_driver_build} --teardown-driver=${teardown_driver} --boskos-resource-type=${boskos_resource_type} \
65-
--storageclass-files="${storage_classes}" --snapshotclass-file=pd-volumesnapshotclass.yaml \
66+
--storageclass-files="${storage_classes}" \
6667
--deployment-strategy=${deployment_strategy} --test-version=${test_version} \
6768
--num-nodes=3 --image-type=${image_type} --use-kubetest2=${use_kubetest2}"
6869

@@ -100,4 +101,10 @@ if [ -n "$gke_node_version" ]; then
100101
base_cmd="${base_cmd} --gke-node-version=${gke_node_version}"
101102
fi
102103

104+
if [ "$test_disk_image_snapshot" = true ]; then
105+
base_cmd="${base_cmd} --snapshotclass-files=image-volumesnapshotclass.yaml,pd-volumesnapshotclass.yaml"
106+
else
107+
base_cmd="${base_cmd} --snapshotclass-files=pd-volumesnapshotclass.yaml"
108+
fi
109+
103110
eval "$base_cmd"

0 commit comments

Comments
 (0)