Add CSINode to storage/v1

pkg/apis/storage/types.go

@@ -405,7 +405,7 @@ type VolumeNodeResources struct {
 	// Maximum number of unique volumes managed by the CSI driver that can be used on a node.
 	// A volume that is both attached and mounted on a node is considered to be used once, not twice.
 	// The same rule applies for a unique volume that is shared among multiple pods on the same node.
-	// If this field is nil, then the supported number of volumes on this node is unbounded.
+	// If this field is not specified, then the supported number of volumes on this node is unbounded.
 	// +optional
 	Count *int32
 }

pkg/kubeapiserver/BUILD

@@ -22,7 +22,6 @@ go_library(
         "//pkg/apis/networking:go_default_library",
         "//pkg/apis/policy:go_default_library",
         "//pkg/apis/storage:go_default_library",
-        "//pkg/features:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",
@@ -30,7 +29,6 @@ go_library(
         "//staging/src/k8s.io/apiserver/pkg/server/resourceconfig:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/server/storage:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
     ],
 )
 

pkg/kubeapiserver/default_storage_factory_builder.go

@@ -26,7 +26,6 @@ import (
 	"k8s.io/apiserver/pkg/server/resourceconfig"
 	serverstorage "k8s.io/apiserver/pkg/server/storage"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"k8s.io/kubernetes/pkg/apis/apps"
 	"k8s.io/kubernetes/pkg/apis/batch"
@@ -36,7 +35,6 @@ import (
 	"k8s.io/kubernetes/pkg/apis/networking"
 	"k8s.io/kubernetes/pkg/apis/policy"
 	apisstorage "k8s.io/kubernetes/pkg/apis/storage"
-	"k8s.io/kubernetes/pkg/features"
 )
 
 // SpecialDefaultResourcePrefixes are prefixes compiled into Kubernetes.
@@ -56,14 +54,9 @@ func NewStorageFactoryConfig() *StorageFactoryConfig {
 	resources := []schema.GroupVersionResource{
 		batch.Resource("cronjobs").WithVersion("v1beta1"),
 		networking.Resource("ingresses").WithVersion("v1beta1"),
-	}
-	// add csinodes if CSINodeInfo feature gate is enabled
-	if utilfeature.DefaultFeatureGate.Enabled(features.CSINodeInfo) {
-		resources = append(resources, apisstorage.Resource("csinodes").WithVersion("v1beta1"))
-	}
-	// add csidrivers if CSIDriverRegistry feature gate is enabled
-	if utilfeature.DefaultFeatureGate.Enabled(features.CSIDriverRegistry) {
-		resources = append(resources, apisstorage.Resource("csidrivers").WithVersion("v1beta1"))
+		// TODO #83513 csinodes override can be removed in 1.18
+		apisstorage.Resource("csinodes").WithVersion("v1beta1"),
+		apisstorage.Resource("csidrivers").WithVersion("v1beta1"),
 	}
 
 	return &StorageFactoryConfig{

pkg/master/storageversionhashdata/data.go

@@ -81,6 +81,7 @@ var GVRToStorageVersionHash = map[string]string{
 	"rbac.authorization.k8s.io/v1beta1/roles":                              "7FuwZcIIItM=",
 	"scheduling.k8s.io/v1beta1/priorityclasses":                            "1QwjyaZjj3Y=",
 	"scheduling.k8s.io/v1/priorityclasses":                                 "1QwjyaZjj3Y=",
+	"storage.k8s.io/v1/csinodes":                                           "Pe62DkZtjuo=",
 	"storage.k8s.io/v1/storageclasses":                                     "K+m6uJwbjGY=",
 	"storage.k8s.io/v1/volumeattachments":                                  "vQAqD28V4AY=",
 	"storage.k8s.io/v1beta1/csidrivers":                                    "hL6j/rwBV5w=",

pkg/registry/storage/rest/storage_storage.go

@@ -135,6 +135,15 @@ func (p RESTStorageProvider) v1Storage(apiResourceConfigSource serverstorage.API
 		"volumeattachments/status": volumeAttachmentStorage.Status,
 	}
 
+	// register csinodes if CSINodeInfo feature gate is enabled
+	if utilfeature.DefaultFeatureGate.Enabled(features.CSINodeInfo) {
+		csiNodeStorage, err := csinodestore.NewStorage(restOptionsGetter)
+		if err != nil {
+			return nil, err
+		}
+		storage["csinodes"] = csiNodeStorage.CSINode
+	}
+
 	return storage, nil
 }