lint

Signed-off-by: Mikhail Scherba <[email protected]>
flant · Oct 17, 2024 · 8cca014 · 8cca014
1 parent cd8345d
commit 8cca014
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/pkg/helm/helm3/helm3.go b/pkg/helm/helm3/helm3.go
@@ -250,7 +250,8 @@ func (h *Helm3Client) ListReleasesNames() ([]string, error) {
 
 // Render renders helm templates for chart
 func (h *Helm3Client) Render(releaseName string, chart string, valuesPaths []string, setValues []string, namespace string, debug bool) (string, error) {
-	args := []string{"template", releaseName, chart,
+	args := []string{
+		"template", releaseName, chart,
 		"--post-renderer", "./post-renderer",
 	}
 

diff --git a/pkg/helm/version_detect.go b/pkg/helm/version_detect.go
@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	DefaultHelmBinPath = "helm"
+	DefaultHelmBinPath          = "helm"
 	DefaultHelmPostRendererPath = "./post-renderer"
 )
 

diff --git a/pkg/helm_resources_manager/helm_resources_manager.go b/pkg/helm_resources_manager/helm_resources_manager.go
@@ -5,14 +5,13 @@ import (
 	"fmt"
 
 	log "github.com/sirupsen/logrus"
+	"k8s.io/apimachinery/pkg/labels"
+	cr_cache "sigs.k8s.io/controller-runtime/pkg/cache"
 
 	"github.com/flant/addon-operator/pkg/app"
 	. "github.com/flant/addon-operator/pkg/helm_resources_manager/types"
 	klient "github.com/flant/kube-client/client"
 	"github.com/flant/kube-client/manifest"
-
-	"k8s.io/apimachinery/pkg/labels"
-	cr_cache "sigs.k8s.io/controller-runtime/pkg/cache"
 )
 
 type HelmResourcesManager interface {
@@ -50,7 +49,6 @@ type helmResourcesManager struct {
 var _ HelmResourcesManager = &helmResourcesManager{}
 
 func NewHelmResourcesManager(ctx context.Context, kclient *klient.Client) (HelmResourcesManager, error) {
-	cctx, cancel := context.WithCancel(ctx)
 	if kclient == nil {
 		return nil, fmt.Errorf("kube client not set")
 	}
@@ -67,6 +65,7 @@ func NewHelmResourcesManager(ctx context.Context, kclient *klient.Client) (HelmR
 		return nil, err
 	}
 
+	cctx, cancel := context.WithCancel(ctx)
 	go cache.Start(cctx)
 	log.Debug("Helm resource manager: cache's been started")
 	if synced := cache.WaitForCacheSync(cctx); !synced {

diff --git a/pkg/helm_resources_manager/resources_monitor.go b/pkg/helm_resources_manager/resources_monitor.go
@@ -11,12 +11,12 @@ import (
 	log "github.com/sirupsen/logrus"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	cr_cache "sigs.k8s.io/controller-runtime/pkg/cache"
+	cr_client "sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/flant/addon-operator/pkg/utils"
 	klient "github.com/flant/kube-client/client"
 	"github.com/flant/kube-client/manifest"
-	cr_cache "sigs.k8s.io/controller-runtime/pkg/cache"
-	cr_client "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 const monitorDelayBase = time.Minute*4 + time.Second*30