fix validation bug

suse-edge · Oct 18, 2024 · cdca128 · cdca128
1 parent 38dc6b7
commit cdca128
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/pkg/image/validation/kubernetes.go b/pkg/image/validation/kubernetes.go
@@ -117,9 +117,12 @@ func validateNetwork(k8s *image.Kubernetes) []FailedValidation {
 	var failures []FailedValidation
 
 	if k8s.Network.APIVIP == "" {
-		failures = append(failures, FailedValidation{
-			UserMessage: "The 'apiVIP' field is required in the 'network' section when defining entries under 'nodes'.",
-		})
+		if len(k8s.Nodes) >= 1 {
+			failures = append(failures, FailedValidation{
+				UserMessage: "The 'apiVIP' field is required in the 'network' section when defining entries under 'nodes'.",
+			})
+			return failures
+		}
 
 		return failures
 	}

diff --git a/pkg/image/validation/kubernetes_test.go b/pkg/image/validation/kubernetes_test.go
@@ -1071,10 +1071,22 @@ func TestValidateNetwork(t *testing.T) {
 		K8s                    image.Kubernetes
 		ExpectedFailedMessages []string
 	}{
-		`no network defined`: {
+		`no network defined, no nodes defined`: {
 			K8s: image.Kubernetes{
 				Network: image.Network{},
 			},
+		},
+		`no network defined, nodes defined`: {
+			K8s: image.Kubernetes{
+				Network: image.Network{},
+				Nodes: []image.Node{
+					{
+						Hostname:    "node1",
+						Type:        "server",
+						Initialiser: false,
+					},
+				},
+			},
 			ExpectedFailedMessages: []string{
 				"The 'apiVIP' field is required in the 'network' section when defining entries under 'nodes'.",
 			},