pkg/admission/storageclass: pick random storageclass if >1 present

Signed-off-by: danishprakash <grafitykoncept@gmail.com>

pkg/volume/util/storageclass.go

@@ -17,9 +17,9 @@ limitations under the License.
 package util
 
 import (
-	"fmt"
+	"sort"
+
 	storagev1 "k8s.io/api/storage/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	storagev1listers "k8s.io/client-go/listers/storage/v1"
@@ -54,10 +54,17 @@ func GetDefaultClass(lister storagev1listers.StorageClassLister) (*storagev1.Sto
 	if len(defaultClasses) == 0 {
 		return nil, nil
 	}
+
+	sort.Slice(defaultClasses, func(i, j int) bool {
+		if defaultClasses[i].CreationTimestamp.UnixNano() == defaultClasses[j].CreationTimestamp.UnixNano() {
+			return defaultClasses[i].Name < defaultClasses[j].Name
+		}
+		return defaultClasses[i].CreationTimestamp.UnixNano() > defaultClasses[j].CreationTimestamp.UnixNano()
+	})
 	if len(defaultClasses) > 1 {
-		klog.V(4).Infof("GetDefaultClass %d defaults found", len(defaultClasses))
+		klog.V(4).Infof("%d default StorageClasses were found, choosing the newest: %s", len(defaultClasses), defaultClasses[0].Name)
-		return nil, errors.NewInternalError(fmt.Errorf("%d default StorageClasses were found", len(defaultClasses)))
 	}
+
 	return defaultClasses[0], nil
 }
 

plugin/pkg/admission/storage/storageclass/setdefault/admission.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+
 	"k8s.io/kubernetes/pkg/volume/util"
 
 	"k8s.io/klog/v2"

plugin/pkg/admission/storage/storageclass/setdefault/admission_test.go

@@ -19,6 +19,7 @@ package setdefault
 import (
 	"context"
 	"testing"
+	"time"
 
 	"k8s.io/klog/v2"
 
@@ -96,6 +97,30 @@ func TestAdmission(t *testing.T) {
 		},
 		Provisioner: "nondefault1",
 	}
+	classWithCreateTime1 := &storagev1.StorageClass{
+		TypeMeta: metav1.TypeMeta{
+			Kind: "StorageClass",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:              "default1",
+			CreationTimestamp: metav1.NewTime(time.Date(2022, time.Month(1), 1, 0, 0, 0, 1, time.UTC)),
+			Annotations: map[string]string{
+				storageutil.IsDefaultStorageClassAnnotation: "true",
+			},
+		},
+	}
+	classWithCreateTime2 := &storagev1.StorageClass{
+		TypeMeta: metav1.TypeMeta{
+			Kind: "StorageClass",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:              "default2",
+			CreationTimestamp: metav1.NewTime(time.Date(2022, time.Month(1), 1, 0, 0, 0, 0, time.UTC)),
+			Annotations: map[string]string{
+				storageutil.IsDefaultStorageClassAnnotation: "true",
+			},
+		},
+	}
 
 	claimWithClass := &api.PersistentVolumeClaim{
 		TypeMeta: metav1.TypeMeta{
@@ -166,13 +191,6 @@ func TestAdmission(t *testing.T) {
 			false,
 			"foo",
 		},
-		{
-			"two defaults, error with PVC with class=nil",
-			[]*storagev1.StorageClass{defaultClass1, defaultClass2, classWithFalseDefault, classWithNoDefault, classWithEmptyDefault},
-			claimWithNoClass,
-			true,
-			"",
-		},
 		{
 			"two defaults, no modification of PVC with class=''",
 			[]*storagev1.StorageClass{defaultClass1, defaultClass2, classWithFalseDefault, classWithNoDefault, classWithEmptyDefault},
@@ -187,6 +205,20 @@ func TestAdmission(t *testing.T) {
 			false,
 			"foo",
 		},
+		{
+			"two defaults with same creation time, choose the one with smaller name",
+			[]*storagev1.StorageClass{defaultClass1, defaultClass2, classWithFalseDefault, classWithNoDefault, classWithEmptyDefault},
+			claimWithNoClass,
+			false,
+			defaultClass1.Name,
+		},
+		{
+			"two defaults, choose the one with newer creation time",
+			[]*storagev1.StorageClass{classWithCreateTime1, classWithCreateTime2, classWithFalseDefault, classWithNoDefault, classWithEmptyDefault},
+			claimWithNoClass,
+			false,
+			classWithCreateTime1.Name,
+		},
 	}
 
 	for _, test := range tests {