From 1cd6c2842a94cd8b06bc4a6a0896f1e4caa3626a Mon Sep 17 00:00:00 2001
From: Ratnopam Chakrabarti <ratnopam.chakrabarti@ericsson.com>
Date: Tue, 4 May 2021 21:52:22 +0000
Subject: [PATCH] Update Validation Logic for Clusterctl Move

Removed the namespace condition check from the validation of 'Move'.
This is to allow validation of docker and cloud provider test site
manifests that do not use namespace.

Relates-To: #503
Change-Id: I39544ba9c9c13ff5a6519b7afd8844629e60087e
---
 pkg/phase/executors/clusterctl.go      |  3 ---
 pkg/phase/executors/clusterctl_test.go | 11 -----------
 2 files changed, 14 deletions(-)

diff --git a/pkg/phase/executors/clusterctl.go b/pkg/phase/executors/clusterctl.go
index 88cb0c6f8..c85446422 100755
--- a/pkg/phase/executors/clusterctl.go
+++ b/pkg/phase/executors/clusterctl.go
@@ -181,9 +181,6 @@ func (c *ClusterctlExecutor) Validate() error {
 			return phaseerrors.ErrInvalidPhase{Reason: "ClusterctlExecutor.InitOptions.CoreProvider is empty"}
 		}
 	case airshipv1.Move:
-		if c.options.MoveOptions.Namespace == "" {
-			return phaseerrors.ErrInvalidPhase{Reason: "ClusterctlExecutor.MoveOptions.Namespace is empty"}
-		}
 	default:
 		return errors.ErrUnknownExecutorAction{Action: string(c.options.Action)}
 	}
diff --git a/pkg/phase/executors/clusterctl_test.go b/pkg/phase/executors/clusterctl_test.go
index 692a55eea..eba19260f 100755
--- a/pkg/phase/executors/clusterctl_test.go
+++ b/pkg/phase/executors/clusterctl_test.go
@@ -234,11 +234,6 @@ func TestClusterctlExecutorValidate(t *testing.T) {
 			actionType:         "init",
 			executorConfigTmpl: executorConfigTmplGood,
 		},
-		{
-			name:               "Success move action",
-			actionType:         "move",
-			executorConfigTmpl: executorConfigTmplGood,
-		},
 		{
 			name:               "Error any other action",
 			actionType:         "any",
@@ -257,12 +252,6 @@ func TestClusterctlExecutorValidate(t *testing.T) {
 			executorConfigTmpl: executorConfigTmplBad,
 			expectedErrString:  "invalid phase: ClusterctlExecutor.InitOptions.CoreProvider is empty",
 		},
-		{
-			name:               "Error empty move option",
-			actionType:         "move",
-			executorConfigTmpl: executorConfigTmplBad,
-			expectedErrString:  "invalid phase: ClusterctlExecutor.MoveOptions.Namespace is empty",
-		},
 	}
 	for _, test := range testCases {
 		tt := test