Skip to content

Commit e2aa686

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#43945 from mikkeloscar/storage-default-beta
Automatic merge from submit-queue Remove 'beta' from default storage class annotation (storage/util) **What this PR does / why we need it**: This is a follow up to: kubernetes#42991 where I believe this file was overlooked. It removes `beta` from the default storageclass annotation. Without this fix you are not able to specify a default storage class like this: ```yaml apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: standard annotations: storageclass.kubernetes.io/is-default-class: "true" provisioner: kubernetes.io/aws-ebs parameters: type: gp2 ``` because the annotation is ignored in: https://github.com/kubernetes/kubernetes/blob/master/plugin/pkg/admission/storageclass/default/admission.go#L129 **Special notes for your reviewer**: **Release note**: ```release-note None ``` /cc @jsafrane
2 parents ae57772 + 3beee8d commit e2aa686

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pkg/apis/storage/util/helpers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2020

2121
// IsDefaultStorageClassAnnotation represents a StorageClass annotation that
2222
// marks a class as the default StorageClass
23-
//TODO: Update IsDefaultStorageClassannotation and remove Beta when no longer used
24-
const IsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class"
23+
//TODO: remove Beta when no longer used
24+
const IsDefaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class"
2525
const BetaIsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class"
2626

2727
// IsDefaultAnnotationText returns a pretty Yes/No String if

0 commit comments

Comments
 (0)