devlopment branch (#1736)

This commit is contained in:
zryfish
2020-01-02 20:52:00 +08:00
committed by GitHub
parent ff0ffe8650
commit eceadec69c
440 changed files with 61524 additions and 3699 deletions

View File

@@ -18,13 +18,13 @@
package storage
import (
"k8s.io/client-go/informers"
"strconv"
"k8s.io/api/core/v1"
storageV1 "k8s.io/api/storage/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/labels"
"kubesphere.io/kubesphere/pkg/informers"
)
type ScMetrics struct {
@@ -33,12 +33,20 @@ type ScMetrics struct {
PvcNumber string `json:"pvcNumber"`
}
func init() {
type PersistentVolumeClaimGetter interface {
GetPersistentVolumeClaimByStorageClass(storageClassName string) ([]*v1.PersistentVolumeClaim, error)
}
func GetPvcListBySc(scName string) ([]*v1.PersistentVolumeClaim, error) {
persistentVolumeClaimLister := informers.SharedInformerFactory().Core().V1().PersistentVolumeClaims().Lister()
type persistentVolumeClaimGetter struct {
informers informers.SharedInformerFactory
}
func NewPersistentVolumeClaimGetter(informers informers.SharedInformerFactory) PersistentVolumeClaimGetter {
return &persistentVolumeClaimGetter{informers: informers}
}
func (c *persistentVolumeClaimGetter) GetPersistentVolumeClaimByStorageClass(scName string) ([]*v1.PersistentVolumeClaim, error) {
persistentVolumeClaimLister := c.informers.Core().V1().PersistentVolumeClaims().Lister()
all, err := persistentVolumeClaimLister.List(labels.Everything())
if err != nil {
@@ -60,14 +68,14 @@ func GetPvcListBySc(scName string) ([]*v1.PersistentVolumeClaim, error) {
}
// Get info of metrics
func GetScMetrics(scName string) (*ScMetrics, error) {
persistentVolumeLister := informers.SharedInformerFactory().Core().V1().PersistentVolumes().Lister()
func (c *persistentVolumeClaimGetter) GetScMetrics(scName string) (*ScMetrics, error) {
persistentVolumeLister := c.informers.Core().V1().PersistentVolumes().Lister()
pvList, err := persistentVolumeLister.List(labels.Everything())
if err != nil {
return nil, err
}
// Get PVC
pvcList, err := GetPvcListBySc(scName)
pvcList, err := c.GetPersistentVolumeClaimByStorageClass(scName)
if err != nil {
return nil, err
@@ -91,10 +99,10 @@ func GetScMetrics(scName string) (*ScMetrics, error) {
}
// Get SC item list
func GetScList() ([]*storageV1.StorageClass, error) {
func (c *persistentVolumeClaimGetter) GetScList() ([]*storageV1.StorageClass, error) {
// Get StorageClass list
scList, err := informers.SharedInformerFactory().Storage().V1().StorageClasses().Lister().List(labels.Everything())
scList, err := c.informers.Storage().V1().StorageClasses().Lister().List(labels.Everything())
if err != nil {
return nil, err

View File

@@ -1,50 +0,0 @@
/*
Copyright 2019 The KubeSphere Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package storage
import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels"
"kubesphere.io/kubesphere/pkg/informers"
)
// List pods of a specific persistent volume claims
func GetPodListByPvc(pvc string, ns string) (res []*v1.Pod, err error) {
podLister := informers.SharedInformerFactory().Core().V1().Pods().Lister()
podList, err := podLister.Pods(ns).List(labels.Everything())
if err != nil {
return nil, err
}
for _, pod := range podList {
if IsPvcInPod(pod, pvc) == true {
res = append(res, pod.DeepCopy())
}
}
return res, nil
}
// Check if the persistent volume claim is related to the pod
func IsPvcInPod(pod *v1.Pod, pvcName string) bool {
for _, v := range pod.Spec.Volumes {
if v.VolumeSource.PersistentVolumeClaim != nil &&
v.VolumeSource.PersistentVolumeClaim.ClaimName == pvcName {
return true
}
}
return false
}