From 7df69020d86b45e8ac28eb591d580c8ce1e14108 Mon Sep 17 00:00:00 2001 From: Justen Stall <39888103+justenstall@users.noreply.github.com> Date: Mon, 18 Nov 2024 22:50:17 -0500 Subject: [PATCH] revert duplicate slice conditions Signed-off-by: Justen Stall <39888103+justenstall@users.noreply.github.com> --- pkg/action/hooks.go | 2 +- pkg/kube/wait.go | 2 +- pkg/registry/util.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go index 9aeb46a47..bb6977990 100644 --- a/pkg/action/hooks.go +++ b/pkg/action/hooks.go @@ -43,7 +43,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent, for _, h := range executingHooks { // Set default delete policy to before-hook-creation - if len(h.DeletePolicies) == 0 { + if h.DeletePolicies == nil || 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 diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go index b3985d84c..74799edea 100644 --- a/pkg/kube/wait.go +++ b/pkg/kube/wait.go @@ -152,7 +152,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 len(t.Spec.Selector) == 0 { + if t.Spec.Selector == nil || 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 4ef09567a..f9ee6b58d 100644 --- a/pkg/registry/util.go +++ b/pkg/registry/util.go @@ -207,7 +207,7 @@ func generateChartOCIAnnotations(meta *chart.Metadata, creationTime string) map[ chartOCIAnnotations = addToMap(chartOCIAnnotations, ocispec.AnnotationSource, meta.Sources[0]) } - if len(meta.Maintainers) > 0 { + if meta.Maintainers != nil && len(meta.Maintainers) > 0 { var maintainerSb strings.Builder for maintainerIdx, maintainer := range meta.Maintainers {