Add golangci-lint workflow (#4999)
* fix lint workflow * add golang lint * close http response body
This commit is contained in:
@@ -528,6 +528,7 @@ func (mo monitoringOperator) GetAppWorkloads(ns string, apps []string) map[strin
|
||||
if applicationVersion != "" && appObject.Labels[constants.ApplicationVersion] != applicationVersion {
|
||||
return false
|
||||
}
|
||||
//nolint:staticcheck
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -547,41 +548,6 @@ func (mo monitoringOperator) GetAppWorkloads(ns string, apps []string) map[strin
|
||||
return componentsMap
|
||||
}
|
||||
|
||||
func (mo monitoringOperator) getApplicationPVCs(appObject *v1beta1.Application) []string {
|
||||
|
||||
var pvcList []string
|
||||
|
||||
ns := appObject.Namespace
|
||||
for _, com := range appObject.Status.ComponentList.Objects {
|
||||
|
||||
switch strings.Title(com.Kind) {
|
||||
case "Deployment":
|
||||
deployObj, err := mo.k8s.AppsV1().Deployments(ns).Get(context.Background(), com.Name, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
klog.Error(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
for _, vol := range deployObj.Spec.Template.Spec.Volumes {
|
||||
pvcList = append(pvcList, vol.PersistentVolumeClaim.ClaimName)
|
||||
}
|
||||
case "Statefulset":
|
||||
stsObj, err := mo.k8s.AppsV1().StatefulSets(ns).Get(context.Background(), com.Name, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
klog.Error(err.Error())
|
||||
return nil
|
||||
}
|
||||
for _, vol := range stsObj.Spec.Template.Spec.Volumes {
|
||||
pvcList = append(pvcList, vol.PersistentVolumeClaim.ClaimName)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return pvcList
|
||||
|
||||
}
|
||||
|
||||
func (mo monitoringOperator) GetSerivePodsMap(ns string, services []string) map[string][]string {
|
||||
var svcPodsMap = make(map[string][]string)
|
||||
|
||||
|
||||
@@ -161,7 +161,7 @@ func (raw *Metrics) Sort(target, order, identifier string) *Metrics {
|
||||
for _, mv := range item.MetricValues {
|
||||
v, ok := mv.Metadata[identifier]
|
||||
if ok && v != "" {
|
||||
ordinal, _ := resourceOrdinal[v]
|
||||
ordinal := resourceOrdinal[v]
|
||||
sorted[ordinal] = mv
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,9 +31,6 @@ const (
|
||||
METER_RESOURCE_TYPE_NET_EGRESS
|
||||
METER_RESOURCE_TYPE_PVC
|
||||
|
||||
meteringConfigDir = "/etc/kubesphere/metering/"
|
||||
meteringConfigName = "ks-metering.yaml"
|
||||
|
||||
meteringDefaultPrecision = 10
|
||||
meteringFeePrecision = 3
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user