Merge branch 'main' into cz-golang-ci

kubecost · May 21, 2024 · e5e334b · e5e334b
2 parents 7a60111 + 56989d3
commit e5e334b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/cmd/diskautoscaler/main.go b/cmd/diskautoscaler/main.go
@@ -86,11 +86,10 @@ func main() {
 
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
 	pflag.Parse()
-	viper.BindPFlags(pflag.CommandLine)
-
-	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
-	pflag.Parse()
-	viper.BindPFlags(pflag.CommandLine)
+	err := viper.BindPFlags(pflag.CommandLine)
+	if err != nil {
+		log.Error().Msgf("viper.BindPFlags(): unable to bing flags with err: %v", err)
+	}
 
 	zerolog.SetGlobalLevel(zerolog.InfoLevel)
 	if logLevelStr := viper.GetString(logLevelConf); len(logLevelStr) > 0 {

diff --git a/pkg/diskscaler/diskscaler.go b/pkg/diskscaler/diskscaler.go
@@ -631,27 +631,27 @@ func (ds *DiskScaler) dataMoverTransientPod(ctx context.Context, namespace strin
 					Image:   "ubuntu",
 					Command: []string{"/bin/bash", "-c", "sleep infinity"},
 					VolumeMounts: []v1.VolumeMount{
-						v1.VolumeMount{
+						{
 							Name:      "orig-vol-mount",
 							MountPath: "/oldData",
 						},
-						v1.VolumeMount{
+						{
 							Name:      "backup-vol-mount",
 							MountPath: "/newData",
 						},
 					},
 				},
 			},
 			Volumes: []v1.Volume{
-				v1.Volume{
+				{
 					Name: "orig-vol-mount",
 					VolumeSource: v1.VolumeSource{
 						PersistentVolumeClaim: &v1.PersistentVolumeClaimVolumeSource{
 							ClaimName: originalPVC,
 						},
 					},
 				},
-				v1.Volume{
+				{
 					Name: "backup-vol-mount",
 					VolumeSource: v1.VolumeSource{
 						PersistentVolumeClaim: &v1.PersistentVolumeClaimVolumeSource{

diff --git a/pkg/diskscaler/service.go b/pkg/diskscaler/service.go
@@ -128,7 +128,7 @@ func (dss *DiskScalerService) getDiskScalerDeploymentWorkload(ctx context.Contex
 }
 
 func (dss *DiskScalerService) run(diskAutoScalerRun string) (RunStatus, error) {
-	status := RunStatus{}
+	var status RunStatus
 	serviceCtx := context.Background()
 	getDeploymentContext, cancel := context.WithTimeout(context.WithValue(serviceCtx, diskScalerServiceContextKey, "getDeployment"), 60*time.Second)
 	defer cancel()

diff --git a/pkg/pvsizingrecommendation/query.go b/pkg/pvsizingrecommendation/query.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"math"
 	"net/http"
 	"path"
@@ -183,7 +183,7 @@ func (krs *KubecostService) getFromCacheOrFetch(window string, overheadPercent s
 		return []byte{}, fmt.Errorf("executing query: %w", err)
 	}
 	defer resp.Body.Close()
-	respBody, err := ioutil.ReadAll(resp.Body)
+	respBody, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return []byte{}, fmt.Errorf("reading response body: %s", err)
 	}