From 997cb0930dca33a7f2a5182bb3d1add43c803079 Mon Sep 17 00:00:00 2001 From: zhangmin Date: Wed, 22 Jul 2020 11:09:04 +0800 Subject: [PATCH] fix pvc count of sc Signed-off-by: zhangmin --- .../v1alpha2/storageclass/storageclasses.go | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/pkg/models/resources/v1alpha2/storageclass/storageclasses.go b/pkg/models/resources/v1alpha2/storageclass/storageclasses.go index f0d466e5d..fa651e1e4 100644 --- a/pkg/models/resources/v1alpha2/storageclass/storageclasses.go +++ b/pkg/models/resources/v1alpha2/storageclass/storageclasses.go @@ -90,13 +90,10 @@ func (s *storageClassesSearcher) Search(namespace string, conditions *params.Con r := make([]interface{}, 0) for _, i := range result { count := s.countPersistentVolumeClaims(i.Name) - isSnapshotAllow := s.isSnapshotAllowed(i.Provisioner) if i.Annotations == nil { i.Annotations = make(map[string]string) - i.Annotations["kubesphere.io/pvc-count"] = string(count) - i.Annotations["kubesphere.io/allow-snapshot"] = strconv.FormatBool(isSnapshotAllow) } - + i.Annotations["kubesphere.io/pvc-count"] = strconv.Itoa(count) r = append(r, i) } return r, nil @@ -117,20 +114,3 @@ func (s *storageClassesSearcher) countPersistentVolumeClaims(name string) int { return count } - -func (s *storageClassesSearcher) isSnapshotAllowed(provisioner string) bool { - if len(provisioner) == 0 { - return false - } - - volumeSnapshotClasses, err := s.snapshotInformers.Snapshot().V1beta1().VolumeSnapshotClasses().Lister().List(labels.Everything()) - if err != nil { - return false - } - for _, volumeSnapshotClass := range volumeSnapshotClasses { - if volumeSnapshotClass.Driver == provisioner { - return true - } - } - return false -}