From 263749874cb21ba31ebca17fe6c19fb3d0379417 Mon Sep 17 00:00:00 2001
From: Mujib Ahasan <ahasanmujib8@gmail.com>
Date: Sat, 20 Dec 2025 21:49:25 +0530
Subject: [PATCH] fix: error handled correctly

Signed-off-by: Mujib Ahasan <ahasanmujib8@gmail.com>
(cherry picked from commit 94860626ce9c83a9227b5bce02a5c03a050816ac)
---
 pkg/action/validate.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/action/validate.go b/pkg/action/validate.go
index bb0e5289d..1de003a00 100644
--- a/pkg/action/validate.go
+++ b/pkg/action/validate.go
@@ -47,7 +47,7 @@ func requireAdoption(resources kube.ResourceList) (kube.ResourceList, error) {
 		}
 
 		isGenerateName, err := validateNameAndgenerateName(info)
-		if isGenerateName {
+		if isGenerateName || err != nil {
 			return err
 		}
 
@@ -77,7 +77,7 @@ func existingResourceConflict(resources kube.ResourceList, releaseName, releaseN
 		}
 
 		isGenerateName, err := validateNameAndgenerateName(info)
-		if isGenerateName {
+		if isGenerateName || err != nil {
 			return err
 		}
 
@@ -218,7 +218,7 @@ func mergeStrStrMaps(current, desired map[string]string) map[string]string {
 func validateNameAndgenerateName(info *resource.Info) (bool, error) {
 	accessor, err := meta.Accessor(info.Object)
 	if err != nil {
-		return true, err
+		return false, err
 	}
 
 	if info.Name == "" && accessor.GetGenerateName() != "" {