From 4f22eb770301cbb68b56925ee98ef6309ea517e7 Mon Sep 17 00:00:00 2001 From: lauk Date: Mon, 2 Sep 2024 11:19:26 +0800 Subject: [PATCH] fix hardcoded ip address --- cmd/deploy_test.go | 10 +++++----- cmd/extend_test.go | 10 +++++----- pkg/cert/GenerateAllFiles_test.go | 6 +++--- pkg/configmanager/asset/clusterasset_test.go | 14 +++++++------- .../asset/infraasset/infraasset_test.go | 14 +++++++------- .../asset/infraasset/libvirtasset_test.go | 4 ++-- pkg/configmanager/manager_test.go | 14 +++++++------- pkg/osmanager/bootconfig/ignition/ignition_test.go | 6 +++--- .../bootconfig/kickstart/kickstart_test.go | 6 +++--- pkg/osmanager/bootconfig/tools_test.go | 6 +++--- pkg/osmanager/generalos/generalos_test.go | 10 +++++----- pkg/osmanager/nestos/nestos_test.go | 14 +++++++------- pkg/osmanager/osmanager_test.go | 14 +++++++------- 13 files changed, 64 insertions(+), 64 deletions(-) diff --git a/cmd/deploy_test.go b/cmd/deploy_test.go index 2585113d..6a4b41b8 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 d9a81259..02fb5997 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 05170c85..2ed598ff 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 ba691840..f81f0825 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 9181d1dd..c368c2c9 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 b39859c9..be562d84 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 33339e79..ee0f2e9c 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 fe02fe11..8c767c8d 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 d271ad10..5847b4bd 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 f91f6834..fda361a3 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 4ff2a7b9..fd23c4c3 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 25c687d0..a4ad1357 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 8879e566..f7c6a9b5 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{ -- Gitee