数据库host使用配置中的

zhangqian

2024-01-10 d72b47db827ec089d4ead8358a1b6298c7172f9c

数据库host使用配置中的

 src/k8s/create.go

@@ -327,12 +327,13 @@
        },
        {
            Name: "DB_HOST",
            ValueFrom: &apiv1.EnvVarSource{
                FieldRef: &apiv1.ObjectFieldSelector{
                    APIVersion: "v1",
                    FieldPath:  "status.hostIP",
                },
            },
            //ValueFrom: &apiv1.EnvVarSource{
            //    FieldRef: &apiv1.ObjectFieldSelector{
            //        APIVersion: "v1",
            //        FieldPath:  "status.hostIP",
            //    },
            //},
            Value: config.DBHost,
        },
        {
            Name: "HOST",

 src/k8s/create_crm.go

@@ -47,13 +47,8 @@
func (c *CrmCreate) CreateEnv(config Config, pairs map[string]string) []apiv1.EnvVar {
    envs := []apiv1.EnvVar{
        {
            Name: "DB_HOST",
            ValueFrom: &apiv1.EnvVarSource{
                FieldRef: &apiv1.ObjectFieldSelector{
                    APIVersion: "v1",
                    FieldPath:  "status.hostIP",
                },
            },
            Name:  "DB_HOST",
            Value: config.DBHost,
        },
        {
            Name:  "DB_PORT",
@@ -71,20 +66,6 @@
            Name:  "DB_PASSWD",
            Value: config.NameSpace + "@Basic2023",
        },
    }

    if config.ALHost != "" {
        envs = append(envs, apiv1.EnvVar{
            Name:  "AL_HOST",
            Value: config.ALHost,
        })
    }

    if config.NodeID != "" {
        envs = append(envs, apiv1.EnvVar{
            Name:  "NODE_ID",
            Value: config.NodeID,
        })
    }

    if len(pairs) > 0 {

 src/k8s/create_srm.go

@@ -47,13 +47,8 @@
func (c *SrmCreate) CreateEnv(config Config, pairs map[string]string) []apiv1.EnvVar {
    envs := []apiv1.EnvVar{
        {
            Name: "DB_HOST",
            ValueFrom: &apiv1.EnvVarSource{
                FieldRef: &apiv1.ObjectFieldSelector{
                    APIVersion: "v1",
                    FieldPath:  "status.hostIP",
                },
            },
            Name:  "DB_HOST",
            Value: config.DBHost,
        },
        {
            Name:  "DB_NAME",
@@ -71,20 +66,6 @@
            Name:  "DB_PASSWD",
            Value: config.NameSpace + "@Basic2023",
        },
    }

    if config.ALHost != "" {
        envs = append(envs, apiv1.EnvVar{
            Name:  "AL_HOST",
            Value: config.ALHost,
        })
    }

    if config.NodeID != "" {
        envs = append(envs, apiv1.EnvVar{
            Name:  "NODE_ID",
            Value: config.NodeID,
        })
    }

    if len(pairs) > 0 {

 src/k8s/create_wms.go

@@ -47,17 +47,8 @@
func (c *WmsCreate) CreateEnv(config Config, pairs map[string]string) []apiv1.EnvVar {
    envs := []apiv1.EnvVar{
        {
            Name:  "GRPC_PORT",
            Value: fmt.Sprint(config.RpcPort),
        },
        {
            Name: "DB_HOST",
            ValueFrom: &apiv1.EnvVarSource{
                FieldRef: &apiv1.ObjectFieldSelector{
                    APIVersion: "v1",
                    FieldPath:  "status.hostIP",
                },
            },
            Name:  "DB_HOST",
            Value: config.DBHost,
        },
        {
            Name:  "DB_NAME",
@@ -75,20 +66,6 @@
            Name:  "DB_PASSWD",
            Value: config.NameSpace + "@Basic2023",
        },
    }

    if config.ALHost != "" {
        envs = append(envs, apiv1.EnvVar{
            Name:  "AL_HOST",
            Value: config.ALHost,
        })
    }

    if config.NodeID != "" {
        envs = append(envs, apiv1.EnvVar{
            Name:  "NODE_ID",
            Value: config.NodeID,
        })
    }

    if len(pairs) > 0 {