diff --git a/cmd/deploy_test.go b/cmd/deploy_test.go index 2585113d0e795d54a84892694f2b2da845b23d69..6a4b41b820dfae99b34ed8dab6550f2720b36794 100644 --- a/cmd/deploy_test.go +++ b/cmd/deploy_test.go @@ -70,7 +70,7 @@ func TestDeploy(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "192.168.132.11", + IP: "", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -81,7 +81,7 @@ func TestDeploy(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "192.168.132.12", + IP: "", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -93,12 +93,12 @@ func TestDeploy(t *testing.T) { Kubernetes: asset.Kubernetes{ KubernetesVersion: "v1.29.1", KubernetesAPIVersion: "v1beta3", - ApiServerEndpoint: "192.168.132.11:6443", + ApiServerEndpoint: "", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ - ServiceSubnet: "10.96.0.0/16", - PodSubnet: "10.244.0.0/16", + ServiceSubnet: "", + PodSubnet: "", }, }, } diff --git a/cmd/extend_test.go b/cmd/extend_test.go index d9a812592b99dd00961a97b15356dc60281edbc0..02fb5997a1cd2e76d247be8e1c5571b7380cb0fd 100644 --- a/cmd/extend_test.go +++ b/cmd/extend_test.go @@ -53,7 +53,7 @@ func TestExtend(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "192.168.132.11", + IP: "", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -64,7 +64,7 @@ func TestExtend(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "192.168.132.12", + IP: "", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -76,12 +76,12 @@ func TestExtend(t *testing.T) { Kubernetes: asset.Kubernetes{ KubernetesVersion: "v1.29.1", KubernetesAPIVersion: "v1beta3", - ApiServerEndpoint: "192.168.132.11:6443", + ApiServerEndpoint: "", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ - ServiceSubnet: "10.96.0.0/16", - PodSubnet: "10.244.0.0/16", + ServiceSubnet: "", + PodSubnet: "", }, }, } diff --git a/pkg/cert/GenerateAllFiles_test.go b/pkg/cert/GenerateAllFiles_test.go index 05170c8598aa76e84264c9bc9f6825c1afbf52cf..2ed598ff61f93ef551cefc60fcf55f0e1b1e9d73 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: "192.168.132.11", + IP: "", 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: "10.96.0.0/16", - PodSubnet: "10.244.0.0/16", + ServiceSubnet: "", + PodSubnet: "", }, }, } diff --git a/pkg/configmanager/asset/clusterasset_test.go b/pkg/configmanager/asset/clusterasset_test.go index ba6918407e84ca17b3f7e90573f70c2e430bb2e1..f81f082529db2df7cac6b0a55712c16cc9dba2ad 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: "192.168.132.0/24", - Gateway: "192.168.132.1", + CIDR: "", + Gateway: "", }, }, } @@ -44,7 +44,7 @@ func TestClusterasset(t *testing.T) { Master: []NodeAsset{ { Hostname: "k8s-master01", - IP: "192.168.132.11", + IP: "", HardwareInfo: HardwareInfo{ CPU: 2, RAM: 2048, @@ -55,7 +55,7 @@ func TestClusterasset(t *testing.T) { Worker: []NodeAsset{ { Hostname: "k8s-worker01", - IP: "192.168.132.12", + IP: "", HardwareInfo: HardwareInfo{ CPU: 2, RAM: 2048, @@ -67,12 +67,12 @@ func TestClusterasset(t *testing.T) { Kubernetes: Kubernetes{ KubernetesVersion: "v1.29.1", KubernetesAPIVersion: "v1beta3", - ApiServerEndpoint: "192.168.132.11:6443", + ApiServerEndpoint: "", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: Network{ - ServiceSubnet: "10.96.0.0/16", - PodSubnet: "10.244.0.0/16", + ServiceSubnet: "", + PodSubnet: "", }, }, HookConf: HookConf{ diff --git a/pkg/configmanager/asset/infraasset/infraasset_test.go b/pkg/configmanager/asset/infraasset/infraasset_test.go index 9181d1ddc040eba44641ee822bbdc77aedc206ae..c368c2c9292379dbad8f68e1ca58689e45ee2569 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: "192.168.132.0/24", - Gateway: "192.168.132.1", + CIDR: "", + Gateway: "", }, }, } @@ -45,7 +45,7 @@ func TestInfra(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "192.168.132.11", + IP: "", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -56,7 +56,7 @@ func TestInfra(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "192.168.132.12", + IP: "", 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: "192.168.132.11:6443", + ApiServerEndpoint: "", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ - ServiceSubnet: "10.96.0.0/16", - PodSubnet: "10.244.0.0/16", + ServiceSubnet: "", + PodSubnet: "", }, }, HookConf: asset.HookConf{ diff --git a/pkg/configmanager/asset/infraasset/libvirtasset_test.go b/pkg/configmanager/asset/infraasset/libvirtasset_test.go index b39859c99c259cc17895d9c02770facf43af288f..be562d845708a49fbf0a21fcff6db5b509d0329e 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: "192.168.132.0/24", - Gateway: "192.168.132.1", + CIDR: "", + Gateway: "", }, }, } diff --git a/pkg/configmanager/manager_test.go b/pkg/configmanager/manager_test.go index 33339e791b824ee922f2c12573e799e2b509bc7d..ee0f2e9c91bca320e6f26f190493235c2dfbb843 100644 --- a/pkg/configmanager/manager_test.go +++ b/pkg/configmanager/manager_test.go @@ -30,8 +30,8 @@ func TestConfigmanager(t *testing.T) { Libvirt: opts.Libvirt{ URI: "qemu:///system", OSPath: "/etc/qcow2.qcow2", - CIDR: "192.168.132.0/24", - Gateway: "192.168.132.1", + CIDR: "", + Gateway: "", }, }, } @@ -47,7 +47,7 @@ func TestConfigmanager(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "192.168.132.11", + IP: "", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -58,7 +58,7 @@ func TestConfigmanager(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "192.168.132.12", + IP: "", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -70,12 +70,12 @@ func TestConfigmanager(t *testing.T) { Kubernetes: asset.Kubernetes{ KubernetesVersion: "v1.29.1", KubernetesAPIVersion: "v1beta3", - ApiServerEndpoint: "192.168.132.11:6443", + ApiServerEndpoint: "", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ - ServiceSubnet: "10.96.0.0/16", - PodSubnet: "10.244.0.0/16", + ServiceSubnet: "", + PodSubnet: "", }, }, HookConf: asset.HookConf{ diff --git a/pkg/osmanager/bootconfig/ignition/ignition_test.go b/pkg/osmanager/bootconfig/ignition/ignition_test.go index fe02fe112507638f29a34d3f9d670990342cdcde..8c767c8d8af97af5c79b6cf7f5f0e531e44f3c52 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: "192.168.1.1"}, - {Hostname: "k8s-master02", IP: "192.168.1.2"}, + {Hostname: "k8s-master01", IP: ""}, + {Hostname: "k8s-master02", IP: ""}, }, Worker: []asset.NodeAsset{ - {Hostname: "k8s-worker01", IP: "192.168.1.6"}, + {Hostname: "k8s-worker01", IP: ""}, }, 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 d271ad100e8c0502fdd121f7b3df90023375cd28..5847b4bdd60af5688be0c48da1cd1c9aa5ff5d5e 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: "192.168.1.1"}, - {Hostname: "k8s-master02", IP: "192.168.1.2"}, + {Hostname: "k8s-master01", IP: ""}, + {Hostname: "k8s-master02", IP: ""}, }, Worker: []asset.NodeAsset{ - {Hostname: "k8s-worker01", IP: "192.168.1.6"}, + {Hostname: "k8s-worker01", IP: ""}, }, SSHKey: "./assets.go", HookConf: asset.HookConf{ diff --git a/pkg/osmanager/bootconfig/tools_test.go b/pkg/osmanager/bootconfig/tools_test.go index f91f6834d748da3efa425723b730aea92ef49fa4..fda361a3107525ae514476a6a0d83b72a9039b0e 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: "192.168.1.1"}, - {Hostname: "k8s-master02", IP: "192.168.1.2"}, + {Hostname: "k8s-master01", IP: ""}, + {Hostname: "k8s-master02", IP: ""}, }, Worker: []asset.NodeAsset{ - {Hostname: "k8s-worker01", IP: "192.168.1.6"}, + {Hostname: "k8s-worker01", IP: ""}, }, SSHKey: "./assets.go", HookConf: asset.HookConf{ diff --git a/pkg/osmanager/generalos/generalos_test.go b/pkg/osmanager/generalos/generalos_test.go index 4ff2a7b92339f86a6191ed11cce7b6939a9bd183..fd23c4c33c7fb9ef6c39785883a89a96038a8a5a 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: "192.168.132.0/24", - Gateway: "192.168.132.1", + CIDR: "", + Gateway: "", }, OSImage: asset.OSImage{Type: "nestos"}, UserName: "root", @@ -47,7 +47,7 @@ func TestGeneralos(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "192.168.132.11", + IP: "", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -58,7 +58,7 @@ func TestGeneralos(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "192.168.132.12", + IP: "", 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: "192.168.132.11:6443", + ApiServerEndpoint: "", 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 25c687d01fb94160f6fdc8fdc0565036c59352cc..a4ad1357896893f1bcf459d4b3d80edcdf9ea057 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: "192.168.132.0/24", - Gateway: "192.168.132.1", + CIDR: "", + Gateway: "", }, OSImage: asset.OSImage{Type: "nestos"}, UserName: "root", @@ -47,7 +47,7 @@ func TestNestOS(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "192.168.132.11", + IP: "", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -58,7 +58,7 @@ func TestNestOS(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "192.168.132.12", + IP: "", 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: "192.168.132.11:6443", + ApiServerEndpoint: "", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ - ServiceSubnet: "10.96.0.0/16", - PodSubnet: "10.244.0.0/16", + ServiceSubnet: "", + PodSubnet: "", }, }, HookConf: asset.HookConf{ diff --git a/pkg/osmanager/osmanager_test.go b/pkg/osmanager/osmanager_test.go index 8879e5668971f29eaa5ec7e91fd6bb8f7d518e55..f7c6a9b58e6dc1593e859328663219562a7ae228 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: "192.168.132.0/24", - Gateway: "192.168.132.1", + CIDR: "", + Gateway: "", }, OSImage: asset.OSImage{Type: "nestos"}, UserName: "root", @@ -47,7 +47,7 @@ func TestOsmanager(t *testing.T) { Master: []asset.NodeAsset{ { Hostname: "k8s-master01", - IP: "192.168.132.11", + IP: "", HardwareInfo: asset.HardwareInfo{ CPU: 2, RAM: 2048, @@ -58,7 +58,7 @@ func TestOsmanager(t *testing.T) { Worker: []asset.NodeAsset{ { Hostname: "k8s-worker01", - IP: "192.168.132.12", + IP: "", 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: "192.168.132.11:6443", + ApiServerEndpoint: "", ImageRegistry: "registry.k8s.io", PauseImage: "pause:3.9", Network: asset.Network{ - ServiceSubnet: "10.96.0.0/16", - PodSubnet: "10.244.0.0/16", + ServiceSubnet: "", + PodSubnet: "", }, }, HookConf: asset.HookConf{