From c2c89d8f241fcdcd3b05454126b02daeac387694 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 11 一月 2024 14:13:29 +0800
Subject: [PATCH] env完善
---
src/k8s/create.go | 30 ++++++++----------------------
src/k8s/create_wms.go | 8 --------
src/k8s/create_crm.go | 8 --------
src/k8s/create_srm.go | 8 --------
4 files changed, 8 insertions(+), 46 deletions(-)
diff --git a/src/k8s/create.go b/src/k8s/create.go
index 2b11816..488c600 100644
--- a/src/k8s/create.go
+++ b/src/k8s/create.go
@@ -345,6 +345,14 @@
},
},
{
+ Name: "AL_HOST",
+ Value: config.ALHost,
+ },
+ {
+ Name: "GRPC_NODE_PORT",
+ Value: strconv.Itoa(int(config.RpcPort)),
+ },
+ {
Name: "NODE_ID",
Value: config.NodeID,
},
@@ -366,28 +374,6 @@
},
}
- 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 {
- for name, value := range pairs {
- envs = append(envs, apiv1.EnvVar{
- Name: name,
- Value: value,
- })
- }
- }
for name, value := range pairs {
envs = append(envs, apiv1.EnvVar{
Name: name,
diff --git a/src/k8s/create_crm.go b/src/k8s/create_crm.go
index b2e3425..46c967c 100644
--- a/src/k8s/create_crm.go
+++ b/src/k8s/create_crm.go
@@ -68,14 +68,6 @@
},
}
- if len(pairs) > 0 {
- for name, value := range pairs {
- envs = append(envs, apiv1.EnvVar{
- Name: name,
- Value: value,
- })
- }
- }
for name, value := range pairs {
envs = append(envs, apiv1.EnvVar{
Name: name,
diff --git a/src/k8s/create_srm.go b/src/k8s/create_srm.go
index f742035..a9c9dce 100644
--- a/src/k8s/create_srm.go
+++ b/src/k8s/create_srm.go
@@ -68,14 +68,6 @@
},
}
- if len(pairs) > 0 {
- for name, value := range pairs {
- envs = append(envs, apiv1.EnvVar{
- Name: name,
- Value: value,
- })
- }
- }
for name, value := range pairs {
envs = append(envs, apiv1.EnvVar{
Name: name,
diff --git a/src/k8s/create_wms.go b/src/k8s/create_wms.go
index d7c81cc..14abb26 100644
--- a/src/k8s/create_wms.go
+++ b/src/k8s/create_wms.go
@@ -68,14 +68,6 @@
},
}
- if len(pairs) > 0 {
- for name, value := range pairs {
- envs = append(envs, apiv1.EnvVar{
- Name: name,
- Value: value,
- })
- }
- }
for name, value := range pairs {
envs = append(envs, apiv1.EnvVar{
Name: name,
--
Gitblit v1.8.0