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
This commit is contained in:
parent
c8d9160fe2
commit
1cd6c2842a
@ -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)}
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user