diff --git a/cmd/deploy_test.go b/cmd/deploy_test.go index 4758da6a9f159807aa4823c965194d316f3f54de..c65c1dacd1237db92dfa1c80ce353ed3e5317411 100644 --- a/cmd/deploy_test.go +++ b/cmd/deploy_test.go @@ -72,7 +72,7 @@ func TestDeploy(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -83,7 +83,7 @@ func TestDeploy(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -95,12 +95,12 @@ func TestDeploy(t *testing.T) { Kubernetes: asset.Kubernetes{ KubernetesVersion: "v1.29.1", KubernetesAPIVersion: "v1beta3", - ApiServerEndpoint: "", + ApiServerEndpoint: "127.0.0.1:6443", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ - ServiceSubnet: "", - PodSubnet: "", + ServiceSubnet: "127.0.0.1/16", + PodSubnet: "127.0.0.1/16", }, }, } diff --git a/cmd/extend_test.go b/cmd/extend_test.go index ec94c256982ea91609e355dadeacb8c94a34cf3a..9e5492c7d7ecdd411fe2d3063da6f374c748a445 100644 --- a/cmd/extend_test.go +++ b/cmd/extend_test.go @@ -63,7 +63,7 @@ func TestExtend(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -74,7 +74,7 @@ func TestExtend(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -86,12 +86,12 @@ func TestExtend(t *testing.T) { Kubernetes: asset.Kubernetes{ KubernetesVersion: "v1.29.1", KubernetesAPIVersion: "v1beta3", - ApiServerEndpoint: "", + ApiServerEndpoint: "127.0.0.1:6443", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ - ServiceSubnet: "", - PodSubnet: "", + ServiceSubnet: "127.0.0.1/16", + PodSubnet: "127.0.0.1/16", }, }, } diff --git a/pkg/cert/GenerateAllFiles_test.go b/pkg/cert/GenerateAllFiles_test.go index 2ed598ff61f93ef551cefc60fcf55f0e1b1e9d73..d78877f07ac0d9bef850c057298ad02089c6d618 100644 --- a/pkg/cert/GenerateAllFiles_test.go +++ b/pkg/cert/GenerateAllFiles_test.go @@ -33,7 +33,7 @@ func TestOsmanager(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -44,8 +44,8 @@ func TestOsmanager(t *testing.T) { Runtime: "crio", Kubernetes: asset.Kubernetes{ Network: asset.Network{ - ServiceSubnet: "", - PodSubnet: "", + ServiceSubnet: "127.0.0.1/16", + PodSubnet: "127.0.0.1/16", }, }, } diff --git a/pkg/configmanager/asset/clusterasset_test.go b/pkg/configmanager/asset/clusterasset_test.go index f81f082529db2df7cac6b0a55712c16cc9dba2ad..5c227532e727df3a45239e9501ab122cad76a3d4 100644 --- a/pkg/configmanager/asset/clusterasset_test.go +++ b/pkg/configmanager/asset/clusterasset_test.go @@ -27,8 +27,8 @@ func TestClusterasset(t *testing.T) { Libvirt: opts.Libvirt{ URI: "qemu:///system", OSPath: "/etc/qcow2.qcow2", - CIDR: "", - Gateway: "", + CIDR: "127.0.0.1/24", + Gateway: "127.0.0.1", }, }, } @@ -44,7 +44,7 @@ func TestClusterasset(t *testing.T) { Master: []NodeAsset{ { Hostname: "k8s-master01", - IP: "", + IP: "127.0.0.1", HardwareInfo: HardwareInfo{ CPU: 2, RAM: 2048, @@ -55,7 +55,7 @@ func TestClusterasset(t *testing.T) { Worker: []NodeAsset{ { Hostname: "k8s-worker01", - IP: "", + IP: "127.0.0.1", HardwareInfo: HardwareInfo{ CPU: 2, RAM: 2048, @@ -67,12 +67,12 @@ func TestClusterasset(t *testing.T) { Kubernetes: Kubernetes{ KubernetesVersion: "v1.29.1", KubernetesAPIVersion: "v1beta3", - ApiServerEndpoint: "", + ApiServerEndpoint: "127.0.0.1:6443", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: Network{ - ServiceSubnet: "", - PodSubnet: "", + ServiceSubnet: "127.0.0.1/16", + PodSubnet: "127.0.0.1/16", }, }, HookConf: HookConf{ diff --git a/pkg/configmanager/asset/infraasset/infraasset_test.go b/pkg/configmanager/asset/infraasset/infraasset_test.go index 8127106a96066fef55025f7051a1a0e953d54d41..8c223e74fba4828484cb2aa4137ee281472f16ef 100644 --- a/pkg/configmanager/asset/infraasset/infraasset_test.go +++ b/pkg/configmanager/asset/infraasset/infraasset_test.go @@ -28,8 +28,8 @@ func TestInfra(t *testing.T) { Libvirt: opts.Libvirt{ URI: "qemu:///system", OSPath: "/etc/qcow2.qcow2", - CIDR: "", - Gateway: "", + CIDR: "127.0.0.1/24", + Gateway: "127.0.0.1", }, }, } @@ -45,7 +45,7 @@ func TestInfra(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -56,7 +56,7 @@ func TestInfra(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -68,12 +68,12 @@ func TestInfra(t *testing.T) { Kubernetes: asset.Kubernetes{ KubernetesVersion: "v1.29.1", KubernetesAPIVersion: "v1beta3", - ApiServerEndpoint: "", + ApiServerEndpoint: "127.0.0.1:6443", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ - ServiceSubnet: "", - PodSubnet: "", + ServiceSubnet: "127.0.0.1/16", + PodSubnet: "127.0.0.1/16", }, }, HookConf: asset.HookConf{ diff --git a/pkg/configmanager/asset/infraasset/libvirtasset_test.go b/pkg/configmanager/asset/infraasset/libvirtasset_test.go index be562d845708a49fbf0a21fcff6db5b509d0329e..6660e9710da972cb4f521e6d16b819337054639f 100644 --- a/pkg/configmanager/asset/infraasset/libvirtasset_test.go +++ b/pkg/configmanager/asset/infraasset/libvirtasset_test.go @@ -27,8 +27,8 @@ func TestLibvirt(t *testing.T) { Libvirt: opts.Libvirt{ URI: "qemu:///system", OSPath: "/etc/qcow2.qcow2", - CIDR: "", - Gateway: "", + CIDR: "127.0.0.1/24", + Gateway: "127.0.0.1", }, }, } diff --git a/pkg/configmanager/manager_test.go b/pkg/configmanager/manager_test.go index 0c5100bff9828ba64ab410e7fdb9173b8a32f1dc..dbc8311926f18d506db51ce6810696a31db737a5 100644 --- a/pkg/configmanager/manager_test.go +++ b/pkg/configmanager/manager_test.go @@ -16,12 +16,13 @@ limitations under the License. package configmanager import ( - "github.com/agiledragon/gomonkey/v2" "nestos-kubernetes-deployer/cmd/command/opts" "nestos-kubernetes-deployer/pkg/configmanager/asset" "nestos-kubernetes-deployer/pkg/configmanager/globalconfig" "os" "testing" + + "github.com/agiledragon/gomonkey/v2" ) func TestConfigmanager(t *testing.T) { @@ -32,8 +33,8 @@ func TestConfigmanager(t *testing.T) { Libvirt: opts.Libvirt{ URI: "qemu:///system", OSPath: "/etc/qcow2.qcow2", - CIDR: "", - Gateway: "", + CIDR: "127.0.0.1/24", + Gateway: "127.0.0.1", }, }, } @@ -49,7 +50,7 @@ func TestConfigmanager(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -60,7 +61,7 @@ func TestConfigmanager(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -76,8 +77,8 @@ func TestConfigmanager(t *testing.T) { ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ - ServiceSubnet: "", - PodSubnet: "", + ServiceSubnet: "127.0.0.1/16", + PodSubnet: "127.0.0.1/16", }, }, HookConf: asset.HookConf{ diff --git a/pkg/osmanager/bootconfig/ignition/ignition_test.go b/pkg/osmanager/bootconfig/ignition/ignition_test.go index 8c767c8d8af97af5c79b6cf7f5f0e531e44f3c52..6d01a7927bf952b2e52c5973f65db825dfe75017 100644 --- a/pkg/osmanager/bootconfig/ignition/ignition_test.go +++ b/pkg/osmanager/bootconfig/ignition/ignition_test.go @@ -33,11 +33,11 @@ func TestIgnition(t *testing.T) { ClusterID: "cluster", Platform: "libvirt", Master: []asset.NodeAsset{ - {Hostname: "k8s-master01", IP: ""}, - {Hostname: "k8s-master02", IP: ""}, + {Hostname: "k8s-master01", IP: "127.0.0.1"}, + {Hostname: "k8s-master02", IP: "127.0.0.1"}, }, Worker: []asset.NodeAsset{ - {Hostname: "k8s-worker01", IP: ""}, + {Hostname: "k8s-worker01", IP: "127.0.0.1"}, }, SSHKey: "./assets.go", HookConf: asset.HookConf{ diff --git a/pkg/osmanager/bootconfig/kickstart/kickstart_test.go b/pkg/osmanager/bootconfig/kickstart/kickstart_test.go index 5847b4bdd60af5688be0c48da1cd1c9aa5ff5d5e..4cf010e58a198b18335b20e0cd834e51040f11b7 100644 --- a/pkg/osmanager/bootconfig/kickstart/kickstart_test.go +++ b/pkg/osmanager/bootconfig/kickstart/kickstart_test.go @@ -33,11 +33,11 @@ func TestKickstart(t *testing.T) { ClusterID: "cluster", Platform: "libvirt", Master: []asset.NodeAsset{ - {Hostname: "k8s-master01", IP: ""}, - {Hostname: "k8s-master02", IP: ""}, + {Hostname: "k8s-master01", IP: "127.0.0.1"}, + {Hostname: "k8s-master02", IP: "127.0.0.1"}, }, Worker: []asset.NodeAsset{ - {Hostname: "k8s-worker01", IP: ""}, + {Hostname: "k8s-worker01", IP: "127.0.0.1"}, }, SSHKey: "./assets.go", HookConf: asset.HookConf{ diff --git a/pkg/osmanager/bootconfig/tools_test.go b/pkg/osmanager/bootconfig/tools_test.go index fda361a3107525ae514476a6a0d83b72a9039b0e..3112455af7a30f60af681113ff557447103eca96 100644 --- a/pkg/osmanager/bootconfig/tools_test.go +++ b/pkg/osmanager/bootconfig/tools_test.go @@ -32,11 +32,11 @@ func TestTool(t *testing.T) { clusterAsset := &asset.ClusterAsset{ ClusterID: "cluster", Master: []asset.NodeAsset{ - {Hostname: "k8s-master01", IP: ""}, - {Hostname: "k8s-master02", IP: ""}, + {Hostname: "k8s-master01", IP: "127.0.0.1"}, + {Hostname: "k8s-master02", IP: "127.0.0.1"}, }, Worker: []asset.NodeAsset{ - {Hostname: "k8s-worker01", IP: ""}, + {Hostname: "k8s-worker01", IP: "127.0.0.1"}, }, SSHKey: "./assets.go", HookConf: asset.HookConf{ diff --git a/pkg/osmanager/generalos/generalos_test.go b/pkg/osmanager/generalos/generalos_test.go index fd23c4c33c7fb9ef6c39785883a89a96038a8a5a..00325464c2c2e04681771cf2c168b1d3009b1313 100644 --- a/pkg/osmanager/generalos/generalos_test.go +++ b/pkg/osmanager/generalos/generalos_test.go @@ -37,8 +37,8 @@ func TestGeneralos(t *testing.T) { InfraPlatform: &infraasset.LibvirtAsset{ URI: "qemu:///system", OSPath: "/etc/qcow2.qcow2", - CIDR: "", - Gateway: "", + CIDR: "127.0.0.1/24", + Gateway: "127.0.0.1", }, OSImage: asset.OSImage{Type: "nestos"}, UserName: "root", @@ -47,7 +47,7 @@ func TestGeneralos(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -58,7 +58,7 @@ func TestGeneralos(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -70,7 +70,7 @@ func TestGeneralos(t *testing.T) { Kubernetes: asset.Kubernetes{ KubernetesVersion: "v1.29.1", KubernetesAPIVersion: "v1beta3", - ApiServerEndpoint: "", + ApiServerEndpoint: "127.0.0.1:6443", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ diff --git a/pkg/osmanager/nestos/nestos_test.go b/pkg/osmanager/nestos/nestos_test.go index a4ad1357896893f1bcf459d4b3d80edcdf9ea057..f9a79f767593e87aceb673799a5a71a8de2ff34c 100644 --- a/pkg/osmanager/nestos/nestos_test.go +++ b/pkg/osmanager/nestos/nestos_test.go @@ -37,8 +37,8 @@ func TestNestOS(t *testing.T) { InfraPlatform: &infraasset.LibvirtAsset{ URI: "qemu:///system", OSPath: "/etc/qcow2.qcow2", - CIDR: "", - Gateway: "", + CIDR: "127.0.0.1/24", + Gateway: "127.0.0.1", }, OSImage: asset.OSImage{Type: "nestos"}, UserName: "root", @@ -47,7 +47,7 @@ func TestNestOS(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -58,7 +58,7 @@ func TestNestOS(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -70,12 +70,12 @@ func TestNestOS(t *testing.T) { Kubernetes: asset.Kubernetes{ KubernetesVersion: "v1.29.1", KubernetesAPIVersion: "v1beta3", - ApiServerEndpoint: "", + ApiServerEndpoint: "127.0.0.1:6443", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ - ServiceSubnet: "", - PodSubnet: "", + ServiceSubnet: "127.0.0.1/16", + PodSubnet: "127.0.0.1/16", }, }, HookConf: asset.HookConf{ diff --git a/pkg/osmanager/osmanager_test.go b/pkg/osmanager/osmanager_test.go index f7c6a9b58e6dc1593e859328663219562a7ae228..d614d6173315848d50fb32596ff10bb88fae5f00 100644 --- a/pkg/osmanager/osmanager_test.go +++ b/pkg/osmanager/osmanager_test.go @@ -37,8 +37,8 @@ func TestOsmanager(t *testing.T) { InfraPlatform: &infraasset.LibvirtAsset{ URI: "qemu:///system", OSPath: "/etc/qcow2.qcow2", - CIDR: "", - Gateway: "", + CIDR: "127.0.0.1/24", + Gateway: "127.0.0.1", }, OSImage: asset.OSImage{Type: "nestos"}, UserName: "root", @@ -47,7 +47,7 @@ func TestOsmanager(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -58,7 +58,7 @@ func TestOsmanager(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "", + IP: "127.0.0.1", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -70,12 +70,12 @@ func TestOsmanager(t *testing.T) { Kubernetes: asset.Kubernetes{ KubernetesVersion: "v1.29.1", KubernetesAPIVersion: "v1beta3", - ApiServerEndpoint: "", + ApiServerEndpoint: "127.0.0.1:6443", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ - ServiceSubnet: "", - PodSubnet: "", + ServiceSubnet: "127.0.0.1/16", + PodSubnet: "127.0.0.1/16", }, }, HookConf: asset.HookConf{