refactor: use pod ip instead of service name to make it consistent

Signed-off-by: zyy17 <[email protected]>

Author: zyy17

cmd/initializer/internal/config_generator.go

@@ -124,8 +124,7 @@ func (c *ConfigGenerator) generateDatanodeConfig(initConfig []byte) ([]byte, err
 		return nil, fmt.Errorf("empty pod name")
 	}
 
-	datanodeCfg.RPCServerAddr = ptr.To(fmt.Sprintf("%s.%s.%s:%d", podName,
-		c.DatanodeServiceName, c.Namespace, c.DatanodeRPCPort))
+	datanodeCfg.RPCServerAddr = ptr.To(fmt.Sprintf("%s:%d", podIP, c.DatanodeRPCPort))
 
 	configData, err := dbconfig.Marshal(cfg, v1alpha1.ConfigMergeStrategyOperatorFirst)
 	if err != nil {
@@ -167,8 +166,7 @@ func (c *ConfigGenerator) generateFlownodeConfig(initConfig []byte) ([]byte, err
 		return nil, fmt.Errorf("empty pod name")
 	}
 
-	flownodeCfg.RPCServerAddr = ptr.To(fmt.Sprintf("%s.%s.%s:%d", podName,
-		c.ServiceName, c.Namespace, c.RPCPort))
+	flownodeCfg.RPCServerAddr = ptr.To(fmt.Sprintf("%s:%d", podIP, c.RPCPort))
 
 	configData, err := dbconfig.Marshal(cfg, v1alpha1.ConfigMergeStrategyOperatorFirst)
 	if err != nil {

cmd/initializer/internal/config_generator_test.go

@@ -93,7 +93,7 @@ func TestDatanodeConfigGenerator(t *testing.T) {
 	if !ok {
 		t.Fatalf("grpc server_addr is not string")
 	}
-	wantRPCServerAddr := fmt.Sprintf("%s.%s.%s:%d", testDatanodePodName, testClusterService, testClusterNamespace, testRPCPort)
+	wantRPCServerAddr := fmt.Sprintf("%s:%d", testPodIP, testRPCPort)
 	if !reflect.DeepEqual(wantRPCServerAddr, rpcServerAddr) {
 		t.Fatalf("RPCServerAddr is not equal, want: '%s', got: '%s'", wantRPCServerAddr, rpcServerAddr)
 	}
@@ -154,7 +154,7 @@ func TestFlownodeConfigGenerator(t *testing.T) {
 	if !ok {
 		t.Fatalf("grpc server_addr is not string")
 	}
-	wantRPCServerAddr := fmt.Sprintf("%s.%s.%s:%d", testFlownodePodName, testClusterService, testClusterNamespace, testRPCPort)
+	wantRPCServerAddr := fmt.Sprintf("%s:%d", testPodIP, testRPCPort)
 	if !reflect.DeepEqual(wantRPCServerAddr, rpcServerAddr) {
 		t.Fatalf("RPCServerAddr is not equal, want: '%s', got: '%s'", wantRPCServerAddr, rpcServerAddr)
 	}