From cbdd779e41402610407c0510c23d0eb70a091c27 Mon Sep 17 00:00:00 2001 From: budimanjojo Date: Sat, 20 Jan 2024 22:54:18 +0700 Subject: [PATCH] fix(test): remove removed fields from tests --- pkg/config/validate_test.go | 18 +----------------- pkg/talos/nodeconfig_test.go | 6 ------ 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/pkg/config/validate_test.go b/pkg/config/validate_test.go index 7088ab70..3a5492d2 100644 --- a/pkg/config/validate_test.go +++ b/pkg/config/validate_test.go @@ -33,8 +33,6 @@ nodes: ipAddress: 1.2.3.4.5 installDisk: /dev/sda disableSearchDomain: true - extensions: - - image: hehe nameservers: - 8.8.8.8 networkInterfaces: @@ -44,9 +42,6 @@ nodes: routes: - network: 0.0.0.0/0 gateway: 1.2.3.4.5.6 - configPatches: - - op: del - path: /cluster ingressFirewall: defaultAction: block rules: @@ -73,7 +68,7 @@ nodes: - test.yaml `) - errs, warns, err := ValidateFromByte(data) + errs, _, err := ValidateFromByte(data) if err != nil { t.Fatal(err) } @@ -93,7 +88,6 @@ nodes: "nodes[0].nameservers": false, "nodes[0].ingressFirewall": false, "nodes[0].networkInterfaces": true, - "nodes[0].configPatches": true, "nodes[1].hostname": true, "nodes[1].ipAddress": true, "nodes[1].installDisk": true, @@ -104,19 +98,9 @@ nodes: "nodes[1].extraManifests": true, } - expectedWarnings := map[string]bool{ - "nodes[0].extensions": true, - } - for k, v := range expectedErrors { if errs.HasField(k) != v { t.Errorf("%s: got %t, want %t", k, errs.HasField(k), v) } } - - for k, v := range expectedWarnings { - if warns.HasField(k) != v { - t.Errorf("%s: got %t, want %t", k, warns.HasField(k), v) - } - } } diff --git a/pkg/talos/nodeconfig_test.go b/pkg/talos/nodeconfig_test.go index 3fddd20b..189f3406 100644 --- a/pkg/talos/nodeconfig_test.go +++ b/pkg/talos/nodeconfig_test.go @@ -95,11 +95,6 @@ nodes: expectedNode1Hostname := "node1" expectedNode1InstallDisk := "/dev/sda" expectedNode1DisableSearchDomain := true - expectedNode1Extensions := []v1alpha1.InstallExtensionConfig{ - { - ExtensionImage: "ghcr.io/siderolabs/tailscale:1.44.0", - }, - } expectedNode1MachineFiles := []*v1alpha1.MachineFile{ { FileContent: "TS_AUTHKEY=123456", @@ -163,7 +158,6 @@ nodes: compare(cpCfg.MachineNetwork.Hostname(), expectedNode1Hostname, t) compare(cpCfg.MachineInstall.InstallDisk, expectedNode1InstallDisk, t) compare(cpCfg.MachineNetwork.DisableSearchDomain(), expectedNode1DisableSearchDomain, t) - compare(cpCfg.MachineInstall.InstallExtensions, expectedNode1Extensions, t) compare(cpCfg.MachineFiles, expectedNode1MachineFiles, t) compare(cpCfg.MachineNetwork.NetworkInterfaces, expectedNode1NetworkInterfaces, t) compare(cpCfg.MachineKernel, expectedNode1KernelModules, t)