From 07a930403b9e5947e945bb122a16b507830dd5e8 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 8 Aug 2022 16:01:59 -0400 Subject: [PATCH] Remove references to openstack and cinder Signed-off-by: Davanum Srinivas Kubernetes-commit: 9bbf01bae93600d3314bce0acbff1f3a0a42e74b --- pkg/describe/describe.go | 22 ---------------------- pkg/describe/describe_test.go | 13 ------------- 2 files changed, 35 deletions(-) diff --git a/pkg/describe/describe.go b/pkg/describe/describe.go index 484ed09f6..456c779bd 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 5225ec2db..37eee41ec 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",