diff --git a/go.mod b/go.mod index 0cc3012a..d0e5253a 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( k8s.io/api v0.0.0-20220824023210-64f80bd511ba k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3 k8s.io/cli-runtime v0.0.0-20220804203856-b48c51ece852 - k8s.io/client-go v0.0.0-20220824023529-0fdc4f348a5d + k8s.io/client-go v0.0.0-20220824023530-5feaced742a3 k8s.io/component-base v0.0.0-20220804202306-bd3841ae5bd6 k8s.io/component-helpers v0.0.0-20220824024213-43a709e0c466 k8s.io/klog/v2 v2.70.1 @@ -97,7 +97,7 @@ replace ( k8s.io/api => k8s.io/api v0.0.0-20220824023210-64f80bd511ba k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3 k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220804203856-b48c51ece852 - k8s.io/client-go => k8s.io/client-go v0.0.0-20220824023529-0fdc4f348a5d + k8s.io/client-go => k8s.io/client-go v0.0.0-20220824023530-5feaced742a3 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220824022809-a4e23d1b7f08 k8s.io/component-base => k8s.io/component-base v0.0.0-20220804202306-bd3841ae5bd6 k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220824024213-43a709e0c466 diff --git a/go.sum b/go.sum index 3509d105..2f6ed4fe 100644 --- a/go.sum +++ b/go.sum @@ -547,8 +547,8 @@ k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3 h1:Ru2oqar5qMV68dM0G6OEZs k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= k8s.io/cli-runtime v0.0.0-20220804203856-b48c51ece852 h1:jIB0rKV6fdXuN/fttQa5T0JCTHuOaT/1rWhiMccorL4= k8s.io/cli-runtime v0.0.0-20220804203856-b48c51ece852/go.mod h1:Tvpth9pLpTuGtIJRXkHyiRV1aySWB4fkzO/eISsDbk4= -k8s.io/client-go v0.0.0-20220824023529-0fdc4f348a5d h1:3kW3ZtpGCo40AYVi6zA1aXjxb1SSW8jxmyKcbjyvVZU= -k8s.io/client-go v0.0.0-20220824023529-0fdc4f348a5d/go.mod h1:g/NYL15K7s+CdNnWuFAbZvlVKCrToqESWFAhB6hi1bE= +k8s.io/client-go v0.0.0-20220824023530-5feaced742a3 h1:l7kl3+Y+SQOfwP0gZr66o76WJxOfHTwhe5guCzzAlgg= +k8s.io/client-go v0.0.0-20220824023530-5feaced742a3/go.mod h1:g/NYL15K7s+CdNnWuFAbZvlVKCrToqESWFAhB6hi1bE= k8s.io/component-base v0.0.0-20220804202306-bd3841ae5bd6 h1:FHz479e22/WLD6+Tr3G+YWh5IVaJYocmPjizCb7chDU= k8s.io/component-base v0.0.0-20220804202306-bd3841ae5bd6/go.mod h1:ij1d8OKrbGbeL3b7tnrEKOuN2itnGAl4CSinffjTRko= k8s.io/component-helpers v0.0.0-20220824024213-43a709e0c466 h1:TlIUI+Yqw0352K1qADGFNHZvgMqCdZIdIQfihAI1bCc= diff --git a/pkg/describe/describe.go b/pkg/describe/describe.go index 484ed09f..456c779b 100644 --- a/pkg/describe/describe.go +++ b/pkg/describe/describe.go @@ -947,8 +947,6 @@ func describeVolumes(volumes []corev1.Volume, w PrefixWriter, space string) { printAzureDiskVolumeSource(volume.VolumeSource.AzureDisk, w) case volume.VolumeSource.VsphereVolume != nil: printVsphereVolumeSource(volume.VolumeSource.VsphereVolume, w) - case volume.VolumeSource.Cinder != nil: - printCinderVolumeSource(volume.VolumeSource.Cinder, w) case volume.VolumeSource.PhotonPersistentDisk != nil: printPhotonPersistentDiskVolumeSource(volume.VolumeSource.PhotonPersistentDisk, w) case volume.VolumeSource.PortworxVolume != nil: @@ -1227,24 +1225,6 @@ func printPhotonPersistentDiskVolumeSource(photon *corev1.PhotonPersistentDiskVo photon.PdID, photon.FSType) } -func printCinderVolumeSource(cinder *corev1.CinderVolumeSource, w PrefixWriter) { - w.Write(LEVEL_2, "Type:\tCinder (a Persistent Disk resource in OpenStack)\n"+ - " VolumeID:\t%v\n"+ - " FSType:\t%v\n"+ - " ReadOnly:\t%v\n"+ - " SecretRef:\t%v\n", - cinder.VolumeID, cinder.FSType, cinder.ReadOnly, cinder.SecretRef) -} - -func printCinderPersistentVolumeSource(cinder *corev1.CinderPersistentVolumeSource, w PrefixWriter) { - w.Write(LEVEL_2, "Type:\tCinder (a Persistent Disk resource in OpenStack)\n"+ - " VolumeID:\t%v\n"+ - " FSType:\t%v\n"+ - " ReadOnly:\t%v\n"+ - " SecretRef:\t%v\n", - cinder.VolumeID, cinder.FSType, cinder.ReadOnly, cinder.SecretRef) -} - func printScaleIOVolumeSource(sio *corev1.ScaleIOVolumeSource, w PrefixWriter) { w.Write(LEVEL_2, "Type:\tScaleIO (a persistent volume backed by a block device in ScaleIO)\n"+ " Gateway:\t%v\n"+ @@ -1562,8 +1542,6 @@ func describePersistentVolume(pv *corev1.PersistentVolume, events *corev1.EventL printQuobyteVolumeSource(pv.Spec.Quobyte, w) case pv.Spec.VsphereVolume != nil: printVsphereVolumeSource(pv.Spec.VsphereVolume, w) - case pv.Spec.Cinder != nil: - printCinderPersistentVolumeSource(pv.Spec.Cinder, w) case pv.Spec.AzureDisk != nil: printAzureDiskVolumeSource(pv.Spec.AzureDisk, w) case pv.Spec.PhotonPersistentDisk != nil: diff --git a/pkg/describe/describe_test.go b/pkg/describe/describe_test.go index 5225ec2d..37eee41e 100644 --- a/pkg/describe/describe_test.go +++ b/pkg/describe/describe_test.go @@ -1483,19 +1483,6 @@ func TestPersistentVolumeDescriber(t *testing.T) { }, unexpectedElements: []string{"VolumeMode", "Filesystem"}, }, - { - name: "test8", - plugin: "cinder", - pv: &corev1.PersistentVolume{ - ObjectMeta: metav1.ObjectMeta{Name: "bar"}, - Spec: corev1.PersistentVolumeSpec{ - PersistentVolumeSource: corev1.PersistentVolumeSource{ - Cinder: &corev1.CinderPersistentVolumeSource{}, - }, - }, - }, - unexpectedElements: []string{"VolumeMode", "Filesystem"}, - }, { name: "test9", plugin: "fc",