Skip to content

C
commander-deploy
Commit 6eb30df1 by 李辉02
Options

feat(完善启动参数): 完善启动参数

parent 25a2bed3
Showing with 44 additions and 72 deletions
charts/commander-dataprocess-service/templates/configmap.yaml
...@@ -10,8 +10,6 @@ data: ...@@ -10,8 +10,6 @@ data:
{{ $key }}: {{ $val | quote }} {{ $key }}: {{ $val | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
SLB_IP: {{ .Values.global.nacos.ip | quote }} {{- $db := (index .Values.global .Chart.Name "database") }}
SLB_PORT: {{ .Values.global.nacos.port | quote }} ConnectionStrings__Conn: "server={{ $db.server }};database={{ $db.database }};uid={{ $db.uid }};pwd={{ $db.pwd }};charset={{ $db.charset }};sslmode={{ $db.sslmode }};allow user variables={{ $db.allowUserVariables }};"
NACOS_PASS: {{ .Values.global.nacos.pass | quote }}
SPRING_PROFILES_ACTIVE: {{ .Values.global.profiles_active | quote }}
charts/commander-dataprocess-service/templates/deployment.yaml
...@@ -23,9 +23,6 @@ spec: ...@@ -23,9 +23,6 @@ spec:
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ .Chart.Name }}-config name: {{ .Chart.Name }}-config
env:
- name: TARGET
value: "{{ .Chart.Name }}"
ports: ports:
- containerPort: {{ index .Values.global .Chart.Name "port" }} - containerPort: {{ index .Values.global .Chart.Name "port" }}
protocol: TCP protocol: TCP
......
charts/commander-dataprocess-service/values.yaml
...@@ -13,18 +13,16 @@ global: ...@@ -13,18 +13,16 @@ global:
namespace: commander-standard-dev namespace: commander-standard-dev
replicas: 1 replicas: 1
imageUrl: k8s-t0.tencentcloudcr.com/commander/ imageUrl: k8s-t0.tencentcloudcr.com/commander/
apiHost: commander-api.aipark.com
nacos:
ip: "nacos-headless.nacos.svc.cluster.local"
port: "8848"
pass: "zhht2023"
profiles_active: "prod" profiles_active: "prod"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
commander-dataprocess-service: commander-dataprocess-service:
imageVersion: "2.1.2" imageVersion: "2.1.2"
port: 5610 port: 10080
env: database:
rocketmq_log_level: "ERROR" server: "10.100.16.66"
rocketmq_log_file_maxIndex: "1" database: "db_data_change"
SWAGGER_ENABLE: "false" uid: "admin"
AIOT_AO_CAPTCHA_ENABLE: "true" pwd: "superadmin"
charset: "utf8"
sslmode: "none"
allowUserVariables: "true"
charts/commander-dsi-service/templates/configmap.yaml
...@@ -10,8 +10,6 @@ data: ...@@ -10,8 +10,6 @@ data:
{{ $key }}: {{ $val | quote }} {{ $key }}: {{ $val | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
SLB_IP: {{ .Values.global.nacos.ip | quote }} {{- $db := (index .Values.global .Chart.Name "database") }}
SLB_PORT: {{ .Values.global.nacos.port | quote }} ConnectionStrings__Conn: "server={{ $db.server }};database={{ $db.database }};uid={{ $db.uid }};pwd={{ $db.pwd }};charset={{ $db.charset }};sslmode={{ $db.sslmode }};allow user variables={{ $db.allowUserVariables }};"
NACOS_PASS: {{ .Values.global.nacos.pass | quote }}
SPRING_PROFILES_ACTIVE: {{ .Values.global.profiles_active | quote }}
charts/commander-dsi-service/templates/deployment.yaml
...@@ -23,9 +23,6 @@ spec: ...@@ -23,9 +23,6 @@ spec:
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ .Chart.Name }}-config name: {{ .Chart.Name }}-config
env:
- name: TARGET
value: "{{ .Chart.Name }}"
ports: ports:
- containerPort: {{ index .Values.global .Chart.Name "port" }} - containerPort: {{ index .Values.global .Chart.Name "port" }}
protocol: TCP protocol: TCP
......
charts/commander-dsi-service/values.yaml
...@@ -13,18 +13,16 @@ global: ...@@ -13,18 +13,16 @@ global:
namespace: commander-standard-dev namespace: commander-standard-dev
replicas: 1 replicas: 1
imageUrl: k8s-t0.tencentcloudcr.com/commander/ imageUrl: k8s-t0.tencentcloudcr.com/commander/
apiHost: commander-api.aipark.com
nacos:
ip: "nacos-headless.nacos.svc.cluster.local"
port: "8848"
pass: "zhht2023"
profiles_active: "prod" profiles_active: "prod"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
commander-dsi-service: commander-dsi-service:
imageVersion: "2.1.2" imageVersion: "2.1.2"
port: 5610 port: 10080
env: database:
rocketmq_log_level: "ERROR" server: "10.100.16.66"
rocketmq_log_file_maxIndex: "1" database: "db_data_change"
SWAGGER_ENABLE: "false" uid: "admin"
AIOT_AO_CAPTCHA_ENABLE: "true" pwd: "superadmin"
charset: "utf8"
sslmode: "none"
allowUserVariables: "true"
charts/commander-ifs-service/templates/configmap.yaml
...@@ -10,8 +10,6 @@ data: ...@@ -10,8 +10,6 @@ data:
{{ $key }}: {{ $val | quote }} {{ $key }}: {{ $val | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
SLB_IP: {{ .Values.global.nacos.ip | quote }} {{- $db := (index .Values.global .Chart.Name "database") }}
SLB_PORT: {{ .Values.global.nacos.port | quote }} ConnectionStrings__Conn: "server={{ $db.server }};database={{ $db.database }};uid={{ $db.uid }};pwd={{ $db.pwd }};charset={{ $db.charset }};sslmode={{ $db.sslmode }};allow user variables={{ $db.allowUserVariables }};"
NACOS_PASS: {{ .Values.global.nacos.pass | quote }}
SPRING_PROFILES_ACTIVE: {{ .Values.global.profiles_active | quote }}
charts/commander-ifs-service/templates/deployment.yaml
...@@ -23,9 +23,6 @@ spec: ...@@ -23,9 +23,6 @@ spec:
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ .Chart.Name }}-config name: {{ .Chart.Name }}-config
env:
- name: TARGET
value: "{{ .Chart.Name }}"
ports: ports:
- containerPort: {{ index .Values.global .Chart.Name "port" }} - containerPort: {{ index .Values.global .Chart.Name "port" }}
protocol: TCP protocol: TCP
......
charts/commander-ifs-service/values.yaml
...@@ -13,18 +13,16 @@ global: ...@@ -13,18 +13,16 @@ global:
namespace: commander-standard-dev namespace: commander-standard-dev
replicas: 1 replicas: 1
imageUrl: k8s-t0.tencentcloudcr.com/commander/ imageUrl: k8s-t0.tencentcloudcr.com/commander/
apiHost: commander-api.aipark.com
nacos:
ip: "nacos-headless.nacos.svc.cluster.local"
port: "8848"
pass: "zhht2023"
profiles_active: "prod" profiles_active: "prod"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
commander-ifs-service: commander-ifs-service:
imageVersion: "2.1.2" imageVersion: "2.1.2"
port: 5610 port: 8090
env: database:
rocketmq_log_level: "ERROR" server: "10.100.16.66"
rocketmq_log_file_maxIndex: "1" database: "db_commander_2.0.8"
SWAGGER_ENABLE: "false" uid: "admin"
AIOT_AO_CAPTCHA_ENABLE: "true" pwd: "superadmin"
charset: "utf8"
sslmode: "none"
allowUserVariables: "true"
charts/commander-plateform-api/templates/configmap.yaml
...@@ -10,8 +10,6 @@ data: ...@@ -10,8 +10,6 @@ data:
{{ $key }}: {{ $val | quote }} {{ $key }}: {{ $val | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
SLB_IP: {{ .Values.global.nacos.ip | quote }} {{- $db := (index .Values.global .Chart.Name "database") }}
SLB_PORT: {{ .Values.global.nacos.port | quote }} ConnectionStrings__Conn: "server={{ $db.server }};database={{ $db.database }};uid={{ $db.uid }};pwd={{ $db.pwd }};charset={{ $db.charset }};sslmode={{ $db.sslmode }};allow user variables={{ $db.allowUserVariables }};"
NACOS_PASS: {{ .Values.global.nacos.pass | quote }}
SPRING_PROFILES_ACTIVE: {{ .Values.global.profiles_active | quote }}
charts/commander-plateform-api/templates/deployment.yaml
...@@ -23,9 +23,6 @@ spec: ...@@ -23,9 +23,6 @@ spec:
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ .Chart.Name }}-config name: {{ .Chart.Name }}-config
env:
- name: TARGET
value: "{{ .Chart.Name }}"
ports: ports:
- containerPort: {{ index .Values.global .Chart.Name "port" }} - containerPort: {{ index .Values.global .Chart.Name "port" }}
protocol: TCP protocol: TCP
......
charts/commander-plateform-api/values.yaml
...@@ -13,18 +13,16 @@ global: ...@@ -13,18 +13,16 @@ global:
namespace: commander-standard-dev namespace: commander-standard-dev
replicas: 1 replicas: 1
imageUrl: k8s-t0.tencentcloudcr.com/commander/ imageUrl: k8s-t0.tencentcloudcr.com/commander/
apiHost: commander-api.aipark.com
nacos:
ip: "nacos-headless.nacos.svc.cluster.local"
port: "8848"
pass: "zhht2023"
profiles_active: "prod" profiles_active: "prod"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
commander-plateform-api: commander-plateform-api:
imageVersion: "2.1.2" imageVersion: "2.1.2"
port: 5610 port: 8084
env: database:
rocketmq_log_level: "ERROR" server: "10.100.16.66"
rocketmq_log_file_maxIndex: "1" database: "db_commander_2.0.8"
SWAGGER_ENABLE: "false" uid: "admin"
AIOT_AO_CAPTCHA_ENABLE: "true" pwd: "superadmin"
charset: "utf8"
sslmode: "none"
allowUserVariables: "true"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment