github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

e2e/framework: copied constants for default storage class annotations should be unexported

Browse Source 
Signed-off-by: Andrew Sy Kim <kim.andrewsy@gmail.com>
This commit is contained in:
Andrew Sy Kim 2020-03-17 16:40:23 -04:00
parent 60cb0d3cc1
commit d4d3f3dda8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/framework/pv/pv.go
View File

@ -53,13 +53,13 @@ const (
// VolumeSelectorKey is the key for volume selector. // VolumeSelectorKey is the key for volume selector.
VolumeSelectorKey = "e2e-pv-pool" VolumeSelectorKey = "e2e-pv-pool"
// IsDefaultStorageClassAnnotation represents a StorageClass annotation that // isDefaultStorageClassAnnotation represents a StorageClass annotation that
// marks a class as the default StorageClass // marks a class as the default StorageClass
IsDefaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class" isDefaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class"
// BetaIsDefaultStorageClassAnnotation is the beta version of IsDefaultStorageClassAnnotation. // betaIsDefaultStorageClassAnnotation is the beta version of IsDefaultStorageClassAnnotation.
// TODO: remove Beta when no longer used // TODO: remove Beta when no longer used
BetaIsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class" betaIsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class"
) )
var ( var (
@ -804,10 +804,10 @@ func GetDefaultStorageClassName(c clientset.Interface) (string, error) {
// annotation is set // annotation is set
// TODO: remove Beta when no longer needed // TODO: remove Beta when no longer needed
func isDefaultAnnotation(obj metav1.ObjectMeta) bool { func isDefaultAnnotation(obj metav1.ObjectMeta) bool {
if obj.Annotations[IsDefaultStorageClassAnnotation] == "true" { if obj.Annotations[isDefaultStorageClassAnnotation] == "true" {
return true return true
} }
if obj.Annotations[BetaIsDefaultStorageClassAnnotation] == "true" { if obj.Annotations[betaIsDefaultStorageClassAnnotation] == "true" {
return true return true
} }