diff --git a/test/k8s-integration/config/test-config-template.in b/test/k8s-integration/config/test-config-template.in index 05338fbed..4dd964915 100644 --- a/test/k8s-integration/config/test-config-template.in +++ b/test/k8s-integration/config/test-config-template.in @@ -14,7 +14,7 @@ Timeouts: {{ end }} {{end}} DriverInfo: - Name: csi-gcepd-{{.StorageClass}}--{{.SnapshotClass}}--{{.VolumeAttributesClass}} + Name: csi-gcepd-{{.StorageClass}}--{{.SnapshotClass}} SupportedFsType: {{range .SupportedFsType}} {{ . }}: {{end}} diff --git a/test/k8s-integration/driver-config.go b/test/k8s-integration/driver-config.go index b5e16892b..a6c6cfdf8 100644 --- a/test/k8s-integration/driver-config.go +++ b/test/k8s-integration/driver-config.go @@ -130,12 +130,8 @@ func generateDriverConfigFile(testParams *testParameters) (string, error) { } var absVacFilePath string - var vacName string if testParams.volumeAttributesClassFile != "" { absVacFilePath = filepath.Join(testParams.pkgDir, testConfigDir, testParams.volumeAttributesClassFile) - vacName = testParams.volumeAttributesClassFile[:strings.LastIndex(testParams.volumeAttributesClassFile, ".")] - } else { - vacName = "no-vac" } if !strings.Contains(testParams.storageClassFile, "sc-extreme") { @@ -160,7 +156,6 @@ func generateDriverConfigFile(testParams *testParameters) (string, error) { SnapshotClassFile: absSnapshotClassFilePath, SnapshotClass: snapshotClassName, VolumeAttributesClassFile: absVacFilePath, - VolumeAttributesClass: vacName, SupportedFsType: fsTypes, Capabilities: caps, MinimumVolumeSize: minimumVolumeSize,