github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #111730 from olemarkus/strip-default-annotation

Browse Source 
Remove default annotations from copied storage class
This commit is contained in:
Kubernetes Prow Robot 2023-05-07 19:47:18 -07:00 committed by GitHub
commit 510b3366be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/storage/framework/driver_operations.go
View File

@ -23,6 +23,7 @@ import (
storagev1 "k8s.io/api/storage/v1" storagev1 "k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apiserver/pkg/storage/names" "k8s.io/apiserver/pkg/storage/names"
"k8s.io/kubernetes/pkg/volume/util"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
) )
@ -58,6 +59,11 @@ func CopyStorageClass(sc *storagev1.StorageClass, ns string, suffix string) *sto
copy := sc.DeepCopy() copy := sc.DeepCopy()
copy.ObjectMeta.Name = names.SimpleNameGenerator.GenerateName(ns + "-" + suffix) copy.ObjectMeta.Name = names.SimpleNameGenerator.GenerateName(ns + "-" + suffix)
copy.ResourceVersion = "" copy.ResourceVersion = ""
// Remove the default annotation from the storage class if they exists.
// Multiple storage classes with this annotation will result in failure.
delete(copy.Annotations, util.BetaIsDefaultStorageClassAnnotation)
delete(copy.Annotations, util.IsDefaultStorageClassAnnotation)
return copy return copy
} }