Merge pull request kubernetes#44087 from jsafrane/automated-cherry-pi…

…ck-of-#43945-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of kubernetes#43945

Cherry pick of kubernetes#43945 on release-1.6.

kubernetes#43945: Remove 'beta' from default storage class annotation

```release-note
Fixed recognition of default storage class in DefaultStorageClass admission plugin
```

pkg/apis/storage/util/helpers.go

@@ -20,8 +20,8 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // IsDefaultStorageClassAnnotation represents a StorageClass annotation that
 // marks a class as the default StorageClass
-//TODO: Update IsDefaultStorageClassannotation and remove Beta when no longer used
-const IsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class"
+//TODO: remove Beta when no longer used
+const IsDefaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class"
 const BetaIsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class"
 
 // IsDefaultAnnotationText returns a pretty Yes/No String if