From fa3c3b03aba8f67d9dfa81556d86e9e14e6bbe44 Mon Sep 17 00:00:00 2001
From: Chris Berry <bez625@gmail.com>
Date: Wed, 28 Aug 2024 21:12:50 +0100
Subject: [PATCH] Fix lint

---
 pkg/action/hooks.go                |  6 +++---
 pkg/kube/fake/printer.go           |  2 ++
 pkg/kube/wait.go                   |  2 +-
 pkg/registry/util.go               |  2 +-
 pkg/releaseutil/manifest_sorter.go | 21 +++++++++++----------
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go
index 9068f40d92d..cb5f917bf80 100644
--- a/pkg/action/hooks.go
+++ b/pkg/action/hooks.go
@@ -51,7 +51,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
 
 	for _, h := range executingHooks {
 		// Set default delete policy to before-hook-creation
-		if h.DeletePolicies == nil || len(h.DeletePolicies) == 0 {
+		if len(h.DeletePolicies) == 0 {
 			// TODO(jlegrone): Only apply before-hook-creation delete policy to run to completion
 			//                 resources. For all other resource types update in place if a
 			//                 resource with the same name already exists and is owned by the
@@ -156,7 +156,7 @@ func (cfg *Configuration) deleteHookByPolicy(h *release.Hook, policy release.Hoo
 			return errors.New(joinErrors(errs))
 		}
 
-		//wait for resources until they are deleted to avoid conflicts
+		// wait for resources until they are deleted to avoid conflicts
 		if kubeClient, ok := cfg.KubeClient.(kube.InterfaceExt); ok {
 			if err := kubeClient.WaitForDelete(resources, timeout); err != nil {
 				return err
@@ -197,7 +197,7 @@ func (cfg *Configuration) outputLogsByPolicy(h *release.Hook, releaseNamespace s
 }
 
 func (cfg *Configuration) outputContainerLogsForListOptions(namespace string, listOptions metav1.ListOptions) error {
-	//TODO Helm 4: Remove this check when GetPodList and OutputContainerLogsForPodList are moved from InterfaceExt to Interface
+	// TODO Helm 4: Remove this check when GetPodList and OutputContainerLogsForPodList are moved from InterfaceExt to Interface
 	if kubeClient, ok := cfg.KubeClient.(kube.InterfaceExt); ok {
 		podList, err := kubeClient.GetPodList(namespace, listOptions)
 		if err != nil {
diff --git a/pkg/kube/fake/printer.go b/pkg/kube/fake/printer.go
index ea36842a2ae..0c28c7f6fa8 100644
--- a/pkg/kube/fake/printer.go
+++ b/pkg/kube/fake/printer.go
@@ -23,6 +23,8 @@ import (
 	"time"
 
 	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/cli-runtime/pkg/resource"
 
 	"helm.sh/helm/v3/pkg/kube"
diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go
index 36110d0de34..bdafc825564 100644
--- a/pkg/kube/wait.go
+++ b/pkg/kube/wait.go
@@ -153,7 +153,7 @@ func SelectorsForObject(object runtime.Object) (selector labels.Selector, err er
 	case *batchv1.Job:
 		selector, err = metav1.LabelSelectorAsSelector(t.Spec.Selector)
 	case *corev1.Service:
-		if t.Spec.Selector == nil || len(t.Spec.Selector) == 0 {
+		if len(t.Spec.Selector) == 0 {
 			return nil, fmt.Errorf("invalid service '%s': Service is defined without a selector", t.Name)
 		}
 		selector = labels.SelectorFromSet(t.Spec.Selector)
diff --git a/pkg/registry/util.go b/pkg/registry/util.go
index 45fbdd0b51f..d09e452ce7f 100644
--- a/pkg/registry/util.go
+++ b/pkg/registry/util.go
@@ -209,7 +209,7 @@ func generateChartOCIAnnotations(meta *chart.Metadata, creationTime string) map[
 		chartOCIAnnotations = addToMap(chartOCIAnnotations, ocispec.AnnotationSource, meta.Sources[0])
 	}
 
-	if meta.Maintainers != nil && len(meta.Maintainers) > 0 {
+	if len(meta.Maintainers) > 0 {
 		var maintainerSb strings.Builder
 
 		for maintainerIdx, maintainer := range meta.Maintainers {
diff --git a/pkg/releaseutil/manifest_sorter.go b/pkg/releaseutil/manifest_sorter.go
index d45d24bc007..cf851baa818 100644
--- a/pkg/releaseutil/manifest_sorter.go
+++ b/pkg/releaseutil/manifest_sorter.go
@@ -123,18 +123,19 @@ func SortManifests(files map[string]string, _ chartutil.VersionSet, ordering Kin
 //
 // To determine the policy to delete the hook, it looks for a YAML structure like this:
 //
-//   kind: SomeKind
-//   apiVersion: v1
-//   metadata:
-//  		annotations:
-//  			helm.sh/hook-delete-policy: hook-succeeded
+//	 kind: SomeKind
+//	 apiVersion: v1
+//	 metadata:
+//			annotations:
+//				helm.sh/hook-delete-policy: hook-succeeded
+//
 // To determine the policy to output logs of the hook (for Pod and Job only), it looks for a YAML structure like this:
 //
-//  kind: Pod
-//  apiVersion: v1
-//  metadata:
-// 		annotations:
-// 			helm.sh/hook-output-log-policy: hook-succeeded,hook-failed
+//	 kind: Pod
+//	 apiVersion: v1
+//	 metadata:
+//			annotations:
+//				helm.sh/hook-output-log-policy: hook-succeeded,hook-failed
 func (file *manifestFile) sort(result *result) error {
 	// Go through manifests in order found in file (function `SplitManifests` creates integer-sortable keys)
 	var sortedEntryKeys []string