revert duplicate slice conditions

Signed-off-by: Justen Stall <39888103+justenstall@users.noreply.github.com>
pull/13460/head
Justen Stall 10 months ago
parent 8549a257d9
commit 7df69020d8
No known key found for this signature in database

@ -43,7 +43,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
for _, h := range executingHooks { for _, h := range executingHooks {
// Set default delete policy to before-hook-creation // 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 // TODO(jlegrone): Only apply before-hook-creation delete policy to run to completion
// resources. For all other resource types update in place if a // resources. For all other resource types update in place if a
// resource with the same name already exists and is owned by the // resource with the same name already exists and is owned by the

@ -152,7 +152,7 @@ func SelectorsForObject(object runtime.Object) (selector labels.Selector, err er
case *batchv1.Job: case *batchv1.Job:
selector, err = metav1.LabelSelectorAsSelector(t.Spec.Selector) selector, err = metav1.LabelSelectorAsSelector(t.Spec.Selector)
case *corev1.Service: 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) return nil, fmt.Errorf("invalid service '%s': Service is defined without a selector", t.Name)
} }
selector = labels.SelectorFromSet(t.Spec.Selector) selector = labels.SelectorFromSet(t.Spec.Selector)

@ -207,7 +207,7 @@ func generateChartOCIAnnotations(meta *chart.Metadata, creationTime string) map[
chartOCIAnnotations = addToMap(chartOCIAnnotations, ocispec.AnnotationSource, meta.Sources[0]) 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 var maintainerSb strings.Builder
for maintainerIdx, maintainer := range meta.Maintainers { for maintainerIdx, maintainer := range meta.Maintainers {

Loading…
Cancel
Save