Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test/e2e/utils/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ var (
metadataPrefetchMinimumVersion = version.MustParseGeneric("1.32.0")
longMountOptionsMinimumVersion = version.MustParseGeneric("1.32.0")
supportsMachineTypeAutoConfigMinimumVersion = version.MustParseGeneric("1.33.0")
sidecarBucketAccessCheckMinimumVersion = version.MustParseGeneric("1.34.0")
)

// gcloudCommand constructs an exec.Cmd for a gcloud command,
Expand Down
10 changes: 8 additions & 2 deletions test/e2e/utils/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,14 @@ func Handle(testParams *TestParameters) error {
if err = os.Setenv(TestWithSAVolumeInjectionEnvVar, strconv.FormatBool(supportSAVolInjection)); err != nil {
klog.Fatalf(`env variable "%s" could not be set: %v`, TestWithSAVolumeInjectionEnvVar, err)
}
if err = os.Setenv(TestWithSidecarBucketAccessCheckEnvVar, strconv.FormatBool(testParams.EnableSidecarBucketAccessCheck)); err != nil {
klog.Fatalf(`env variable "%s" could not be set: %v`, TestWithSidecarBucketAccessCheckEnvVar, err)
supportSidecarBucketAccessCheck, err := ClusterAtLeastMinVersion(testParams.GkeClusterVersion, testParams.GkeNodeVersion, sidecarBucketAccessCheckMinimumVersion)
if err != nil {
klog.Fatalf(`managed driver version for sidecar bucket access check support could not be determined: %v`, err)
}
if !testParams.UseGKEManagedDriver || (testParams.UseGKEManagedDriver && supportSidecarBucketAccessCheck) {
if err = os.Setenv(TestWithSidecarBucketAccessCheckEnvVar, strconv.FormatBool(testParams.EnableSidecarBucketAccessCheck)); err != nil {
klog.Fatalf(`env variable "%s" could not be set: %v`, TestWithSidecarBucketAccessCheckEnvVar, err)
}
}

supportsMachineTypeAutoConfig, err := ClusterAtLeastMinVersion(testParams.GkeClusterVersion, testParams.GkeNodeVersion, supportsMachineTypeAutoConfigMinimumVersion)
Expand Down