clusterDeployment: adjust delete() returns

openshift-kni · Oct 21, 2024 · 56d7883 · 56d7883
1 parent 5d2afce
commit 56d7883
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/hive/clusterdeployment.go b/pkg/hive/clusterdeployment.go
@@ -330,7 +330,10 @@ func (builder *ClusterDeploymentBuilder) Delete() error {
 		builder.Definition.Name, builder.Definition.Namespace)
 
 	if !builder.Exists() {
-		glog.V(100).Infof("clusterdeployment cannot be deleted because it does not exist")
+		glog.V(100).Infof("clusterdeployment %s in namespace %s does not exist",
+			builder.Definition.Name, builder.Definition.Namespace)
+
+		builder.Object = nil
 
 		return nil
 	}

diff --git a/pkg/pod/pod_test.go b/pkg/pod/pod_test.go
@@ -245,7 +245,7 @@ func TestPodDelete(t *testing.T) {
 
 func TestPodDeleteAndWait(t *testing.T) {
 	testPodDeleteHelper(t, func(builder *Builder) (*Builder, error) {
-		return builder.DeleteAndWait(time.Second)
+		return builder.DeleteAndWait(5 * time.Second)
 	})
 }