Fix to deploy TektonHub in custom namespace

This commit handles target namespace deletion erlier it was deleting operator installation target namespace when Hub component target namespace was different Signed-off-by: Shiv Verma <[email protected]>
tektoncd · Jan 22, 2024 · 4632397 · 4632397
1 parent 8112cf2
commit 4632397
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/pkg/reconciler/common/targetnamespace.go b/pkg/reconciler/common/targetnamespace.go
@@ -52,25 +52,15 @@ func ReconcileTargetNamespace(ctx context.Context, labels map[string]string, tek
 
 	var targetNamespace *corev1.Namespace
 	namespaceDeletionInProgress := false
+
 	for _, namespace := range nsList.Items {
 		if namespace.Name == tektonComponent.GetSpec().GetTargetNamespace() && namespace.DeletionTimestamp == nil {
 			_targetNamespace := namespace.DeepCopy()
 			targetNamespace = _targetNamespace
-		} else {
-			// delete irrelevant namespaces
-			// if deletionTimestamp is not nil, that indicates, the namespace is in deletion state
-			if namespace.DeletionTimestamp == nil {
-				if err := kubeClientSet.CoreV1().Namespaces().Delete(ctx, namespace.Name, metav1.DeleteOptions{}); err != nil {
-					logger.Errorw("error on deleting a namespace",
-						"namespace", namespace.Name,
-						err,
-					)
-					return err
-				}
-			} else {
-				logger.Infof("'%v' namespace is in deletion state", namespace.Name)
-				namespaceDeletionInProgress = true
-			}
+		}
+		if namespace.DeletionTimestamp != nil {
+			logger.Infof("'%v' namespace is in deletion state", namespace.Name)
+			namespaceDeletionInProgress = true
 		}
 	}
 

diff --git a/pkg/reconciler/common/targetnamespace_test.go b/pkg/reconciler/common/targetnamespace_test.go
@@ -25,7 +25,6 @@ import (
 	"github.com/tektoncd/operator/pkg/reconciler/shared/hash"
 	"gotest.tools/v3/assert"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
 )
@@ -117,7 +116,7 @@ func TestReconcileTargetNamespace(t *testing.T) {
 			postFunc: func(t *testing.T, fakeClientset *fake.Clientset, namespace *corev1.Namespace) {
 				// verify "custom-ns" is removed
 				_, err := fakeClientset.CoreV1().Namespaces().Get(context.TODO(), "custom-ns", metav1.GetOptions{})
-				assert.Equal(t, true, errors.IsNotFound(err), "'custom-ns' namespace should be deleted, but still found")
+				assert.Equal(t, err, nil)
 			},
 			err: nil,
 		},