Skip to content

Commit c6fd25d

Browse files
huffmancahuffmanca
committed
Updated CSIDriver references
1 parent 726af6b commit c6fd25d

File tree

45 files changed

+1190
-366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1190
-366
lines changed

‎api/openapi-spec/swagger.json‎

Lines changed: 991 additions & 98 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/kube-controller-manager/app/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ go_library(
127127
"//staging/src/k8s.io/client-go/dynamic:go_default_library",
128128
"//staging/src/k8s.io/client-go/informers:go_default_library",
129129
"//staging/src/k8s.io/client-go/informers/storage/v1:go_default_library",
130-
"//staging/src/k8s.io/client-go/informers/storage/v1beta1:go_default_library",
131130
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
132131
"//staging/src/k8s.io/client-go/metadata:go_default_library",
133132
"//staging/src/k8s.io/client-go/metadata/metadatainformer:go_default_library",

‎cmd/kube-controller-manager/app/core.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,11 @@ import (
3030

3131
"k8s.io/klog"
3232

33-
"k8s.io/api/core/v1"
33+
v1 "k8s.io/api/core/v1"
3434
"k8s.io/apimachinery/pkg/runtime/schema"
3535
utilfeature "k8s.io/apiserver/pkg/util/feature"
3636
cacheddiscovery "k8s.io/client-go/discovery/cached/memory"
3737
storagev1informer "k8s.io/client-go/informers/storage/v1"
38-
storagev1beta1informer "k8s.io/client-go/informers/storage/v1beta1"
3938
clientset "k8s.io/client-go/kubernetes"
4039
"k8s.io/client-go/metadata"
4140
restclient "k8s.io/client-go/rest"
@@ -313,15 +312,12 @@ func startAttachDetachController(ctx ControllerContext) (http.Handler, bool, err
313312
}
314313

315314
var (
316-
csiNodeInformer storagev1informer.CSINodeInformer
317-
csiDriverInformer storagev1beta1informer.CSIDriverInformer
315+
csiNodeInformer storagev1informer.CSINodeInformer
318316
)
319317
if utilfeature.DefaultFeatureGate.Enabled(features.CSINodeInfo) {
320318
csiNodeInformer = ctx.InformerFactory.Storage().V1().CSINodes()
321319
}
322-
if utilfeature.DefaultFeatureGate.Enabled(features.CSIDriverRegistry) {
323-
csiDriverInformer = ctx.InformerFactory.Storage().V1beta1().CSIDrivers()
324-
}
320+
csiDriverInformer := ctx.InformerFactory.Storage().V1().CSIDrivers()
325321

326322
plugins, err := ProbeAttachableVolumePlugins()
327323
if err != nil {

‎pkg/api/testing/defaulting_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ func TestDefaulting(t *testing.T) {
163163
{Group: "storage.k8s.io", Version: "v1", Kind: "StorageClassList"}: {},
164164
{Group: "storage.k8s.io", Version: "v1", Kind: "VolumeAttachment"}: {},
165165
{Group: "storage.k8s.io", Version: "v1", Kind: "VolumeAttachmentList"}: {},
166+
{Group: "storage.k8s.io", Version: "v1", Kind: "CSIDriver"}: {},
167+
{Group: "storage.k8s.io", Version: "v1", Kind: "CSIDriverList"}: {},
166168
{Group: "storage.k8s.io", Version: "v1beta1", Kind: "VolumeAttachment"}: {},
167169
{Group: "storage.k8s.io", Version: "v1beta1", Kind: "VolumeAttachmentList"}: {},
168170
{Group: "authentication.k8s.io", Version: "v1", Kind: "TokenRequest"}: {},

‎pkg/controller/volume/attachdetach/BUILD‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ go_library(
3434
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
3535
"//staging/src/k8s.io/client-go/informers/core/v1:go_default_library",
3636
"//staging/src/k8s.io/client-go/informers/storage/v1:go_default_library",
37-
"//staging/src/k8s.io/client-go/informers/storage/v1beta1:go_default_library",
3837
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
3938
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
4039
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
4140
"//staging/src/k8s.io/client-go/listers/core/v1:go_default_library",
4241
"//staging/src/k8s.io/client-go/listers/storage/v1:go_default_library",
43-
"//staging/src/k8s.io/client-go/listers/storage/v1beta1:go_default_library",
4442
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
4543
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
4644
"//staging/src/k8s.io/client-go/util/workqueue:go_default_library",

‎pkg/controller/volume/attachdetach/attach_detach_controller.go‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,11 @@ import (
3737
utilfeature "k8s.io/apiserver/pkg/util/feature"
3838
coreinformers "k8s.io/client-go/informers/core/v1"
3939
storageinformersv1 "k8s.io/client-go/informers/storage/v1"
40-
storageinformers "k8s.io/client-go/informers/storage/v1beta1"
4140
clientset "k8s.io/client-go/kubernetes"
4241
"k8s.io/client-go/kubernetes/scheme"
4342
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
4443
corelisters "k8s.io/client-go/listers/core/v1"
4544
storagelistersv1 "k8s.io/client-go/listers/storage/v1"
46-
storagelisters "k8s.io/client-go/listers/storage/v1beta1"
4745
kcache "k8s.io/client-go/tools/cache"
4846
"k8s.io/client-go/tools/record"
4947
"k8s.io/client-go/util/workqueue"
@@ -111,7 +109,7 @@ func NewAttachDetachController(
111109
pvcInformer coreinformers.PersistentVolumeClaimInformer,
112110
pvInformer coreinformers.PersistentVolumeInformer,
113111
csiNodeInformer storageinformersv1.CSINodeInformer,
114-
csiDriverInformer storageinformers.CSIDriverInformer,
112+
csiDriverInformer storageinformersv1.CSIDriverInformer,
115113
cloud cloudprovider.Interface,
116114
plugins []volume.VolumePlugin,
117115
prober volume.DynamicPluginProber,
@@ -140,10 +138,8 @@ func NewAttachDetachController(
140138
adc.csiNodeSynced = csiNodeInformer.Informer().HasSynced
141139
}
142140

143-
if utilfeature.DefaultFeatureGate.Enabled(features.CSIDriverRegistry) {
144-
adc.csiDriverLister = csiDriverInformer.Lister()
145-
adc.csiDriversSynced = csiDriverInformer.Informer().HasSynced
146-
}
141+
adc.csiDriverLister = csiDriverInformer.Lister()
142+
adc.csiDriversSynced = csiDriverInformer.Informer().HasSynced
147143

148144
if err := adc.volumePluginMgr.InitPlugins(plugins, prober, adc); err != nil {
149145
return nil, fmt.Errorf("Could not initialize volume plugins for Attach/Detach Controller: %+v", err)
@@ -281,7 +277,7 @@ type attachDetachController struct {
281277
// csiDriverLister is the shared CSIDriver lister used to fetch and store
282278
// CSIDriver objects from the API server. It is shared with other controllers
283279
// and therefore the CSIDriver objects in its store should be treated as immutable.
284-
csiDriverLister storagelisters.CSIDriverLister
280+
csiDriverLister storagelistersv1.CSIDriverLister
285281
csiDriversSynced kcache.InformerSynced
286282

287283
// cloud provider used by volume host
@@ -693,7 +689,7 @@ func (adc *attachDetachController) CSINodeLister() storagelistersv1.CSINodeListe
693689
return adc.csiNodeLister
694690
}
695691

696-
func (adc *attachDetachController) CSIDriverLister() storagelisters.CSIDriverLister {
692+
func (adc *attachDetachController) CSIDriverLister() storagelistersv1.CSIDriverLister {
697693
return adc.csiDriverLister
698694
}
699695

@@ -822,6 +818,6 @@ func (adc *attachDetachController) GetSubpather() subpath.Interface {
822818
return nil
823819
}
824820

825-
func (adc *attachDetachController) GetCSIDriverLister() storagelisters.CSIDriverLister {
821+
func (adc *attachDetachController) GetCSIDriverLister() storagelistersv1.CSIDriverLister {
826822
return adc.csiDriverLister
827823
}

‎pkg/controller/volume/attachdetach/attach_detach_controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func Test_NewAttachDetachController_Positive(t *testing.T) {
4747
informerFactory.Core().V1().PersistentVolumeClaims(),
4848
informerFactory.Core().V1().PersistentVolumes(),
4949
informerFactory.Storage().V1().CSINodes(),
50-
informerFactory.Storage().V1beta1().CSIDrivers(),
50+
informerFactory.Storage().V1().CSIDrivers(),
5151
nil, /* cloud */
5252
nil, /* plugins */
5353
nil, /* prober */
@@ -248,7 +248,7 @@ func attachDetachRecoveryTestCase(t *testing.T, extraPods1 []*v1.Pod, extraPods2
248248
informerFactory.Core().V1().PersistentVolumeClaims(),
249249
informerFactory.Core().V1().PersistentVolumes(),
250250
informerFactory.Storage().V1().CSINodes(),
251-
informerFactory.Storage().V1beta1().CSIDrivers(),
251+
informerFactory.Storage().V1().CSIDrivers(),
252252
nil, /* cloud */
253253
plugins,
254254
prober,

‎pkg/features/kube_features.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
608608
TopologyManager: {Default: true, PreRelease: featuregate.Beta},
609609
ServiceNodeExclusion: {Default: false, PreRelease: featuregate.Alpha},
610610
NodeDisruptionExclusion: {Default: false, PreRelease: featuregate.Alpha},
611-
CSIDriverRegistry: {Default: true, PreRelease: featuregate.GA},
611+
CSIDriverRegistry: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.20
612612
CSINodeInfo: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.19
613613
BlockVolume: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.20
614614
StorageObjectInUseProtection: {Default: true, PreRelease: featuregate.GA},

‎pkg/kubelet/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ go_library(
132132
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
133133
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
134134
"//staging/src/k8s.io/client-go/listers/core/v1:go_default_library",
135-
"//staging/src/k8s.io/client-go/listers/storage/v1beta1:go_default_library",
135+
"//staging/src/k8s.io/client-go/listers/storage/v1:go_default_library",
136136
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
137137
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
138138
"//staging/src/k8s.io/client-go/util/certificate:go_default_library",

‎pkg/kubelet/volume_host.go‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@ import (
2929
v1 "k8s.io/api/core/v1"
3030
"k8s.io/apimachinery/pkg/types"
3131
"k8s.io/apimachinery/pkg/util/wait"
32-
utilfeature "k8s.io/apiserver/pkg/util/feature"
3332
"k8s.io/client-go/informers"
3433
clientset "k8s.io/client-go/kubernetes"
35-
storagelisters "k8s.io/client-go/listers/storage/v1beta1"
34+
storagelisters "k8s.io/client-go/listers/storage/v1"
3635
"k8s.io/client-go/tools/cache"
3736
"k8s.io/client-go/tools/record"
3837
cloudprovider "k8s.io/cloud-provider"
39-
"k8s.io/kubernetes/pkg/features"
4038
"k8s.io/kubernetes/pkg/kubelet/configmap"
4139
"k8s.io/kubernetes/pkg/kubelet/secret"
4240
"k8s.io/kubernetes/pkg/kubelet/token"
@@ -65,17 +63,15 @@ func NewInitializedVolumePluginMgr(
6563
var csiDriverLister storagelisters.CSIDriverLister
6664
var csiDriversSynced cache.InformerSynced
6765
const resyncPeriod = 0
68-
if utilfeature.DefaultFeatureGate.Enabled(features.CSIDriverRegistry) {
69-
// Don't initialize if kubeClient is nil
70-
if kubelet.kubeClient != nil {
71-
informerFactory = informers.NewSharedInformerFactory(kubelet.kubeClient, resyncPeriod)
72-
csiDriverInformer := informerFactory.Storage().V1beta1().CSIDrivers()
73-
csiDriverLister = csiDriverInformer.Lister()
74-
csiDriversSynced = csiDriverInformer.Informer().HasSynced
75-
76-
} else {
77-
klog.Warning("kubeClient is nil. Skip initialization of CSIDriverLister")
78-
}
66+
// Don't initialize if kubeClient is nil
67+
if kubelet.kubeClient != nil {
68+
informerFactory = informers.NewSharedInformerFactory(kubelet.kubeClient, resyncPeriod)
69+
csiDriverInformer := informerFactory.Storage().V1().CSIDrivers()
70+
csiDriverLister = csiDriverInformer.Lister()
71+
csiDriversSynced = csiDriverInformer.Informer().HasSynced
72+
73+
} else {
74+
klog.Warning("kubeClient is nil. Skip initialization of CSIDriverLister")
7975
}
8076

8177
kvh := &kubeletVolumeHost{

0 commit comments

Comments
 (0)