From d72b47db827ec089d4ead8358a1b6298c7172f9c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 10 一月 2024 21:31:28 +0800
Subject: [PATCH] 数据库host使用配置中的
---
src/k8s/create.go | 13 +++---
src/k8s/create_wms.go | 27 +------------
src/k8s/create_crm.go | 23 +----------
src/k8s/create_srm.go | 23 +----------
4 files changed, 13 insertions(+), 73 deletions(-)
diff --git a/src/k8s/create.go b/src/k8s/create.go
index 6388990..5fb6a40 100644
--- a/src/k8s/create.go
+++ b/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",
diff --git a/src/k8s/create_crm.go b/src/k8s/create_crm.go
index c3d4c24..b2e3425 100644
--- a/src/k8s/create_crm.go
+++ b/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 {
diff --git a/src/k8s/create_srm.go b/src/k8s/create_srm.go
index 851b27e..f742035 100644
--- a/src/k8s/create_srm.go
+++ b/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 {
diff --git a/src/k8s/create_wms.go b/src/k8s/create_wms.go
index 710acf5..d7c81cc 100644
--- a/src/k8s/create_wms.go
+++ b/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 {
--
Gitblit v1.8.0