zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "1. 临时切换集群配合测试"

Browse Source 
This reverts commit 26e5952252.
This commit is contained in:
chenbowen
2025-12-27 13:12:22 +08:00
parent 4d4912db5e
commit c88fdad7ac
2 changed files with 150 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

289
deployment.yaml
View File

@@ -1,57 +1,57 @@
# zt-gateway ## zt-gateway
apiVersion: apps/v1 #apiVersion: apps/v1
kind: Deployment #kind: Deployment
metadata: #metadata:
namespace: ns-766b45fbd7464ccb86d5fd046054cf0a # namespace: ns-d6a0e78ebd674c279614498e4c57b133
name: zt-gateway # name: zt-gateway
labels: # labels:
app: zt-gateway # app: zt-gateway
spec: #spec:
replicas: 1 # replicas: 1
selector: # selector:
matchLabels: # matchLabels:
app: zt-gateway # app: zt-gateway
template: # template:
metadata: # metadata:
labels: # labels:
app: zt-gateway # app: zt-gateway
spec: # spec:
containers: # containers:
- name: zt-gateway # - name: zt-gateway
image: 172.17.19.16:10043/zt-jygk/zt-gateway:VERSION_PLACEHOLDER # image: 172.16.46.66:10043/zt/zt-gateway:VERSION_PLACEHOLDER
imagePullPolicy: Always # imagePullPolicy: Always
env: # env:
- name: TZ # - name: TZ
value: Asia/Shanghai # value: Asia/Shanghai
ports: # ports:
- containerPort: 48080 # - containerPort: 48080
readinessProbe: # readinessProbe:
httpGet: # httpGet:
path: /actuator/health # path: /actuator/health
port: 48080 # port: 48080
initialDelaySeconds: 100 # initialDelaySeconds: 50
periodSeconds: 5 # periodSeconds: 5
failureThreshold: 3 # failureThreshold: 3
livenessProbe: # livenessProbe:
httpGet: # httpGet:
path: /actuator/health # path: /actuator/health
port: 48080 # port: 48080
initialDelaySeconds: 100 # initialDelaySeconds: 50
periodSeconds: 10 # periodSeconds: 10
failureThreshold: 5 # failureThreshold: 5
resources: # resources:
requests: # requests:
cpu: "500m" # cpu: "500m"
memory: "1024Mi" # memory: "1024Mi"
limits: # limits:
cpu: "1024m" # cpu: "1024m"
memory: "2048Mi" # memory: "2048Mi"
terminationGracePeriodSeconds: 30 # terminationGracePeriodSeconds: 30
--- #---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
namespace: ns-766b45fbd7464ccb86d5fd046054cf0a namespace: ns-d6a0e78ebd674c279614498e4c57b133
name: zt-gateway name: zt-gateway
spec: spec:
type: NodePort type: NodePort
@@ -67,7 +67,7 @@ spec:
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
namespace: ns-766b45fbd7464ccb86d5fd046054cf0a namespace: ns-d6a0e78ebd674c279614498e4c57b133
name: zt-module-infra name: zt-module-infra
labels: labels:
app: zt-module-infra app: zt-module-infra
@@ -92,7 +92,7 @@ spec:
- "172.16.36.220" - "172.16.36.220"
containers: containers:
- name: zt-module-infra - name: zt-module-infra
image: 172.17.19.16:10043/zt-jygk/zt-module-infra:VERSION_PLACEHOLDER image: 172.16.46.66:10043/zt/zt-module-infra:VERSION_PLACEHOLDER
imagePullPolicy: Always imagePullPolicy: Always
env: env:
- name: TZ - name: TZ
@@ -101,14 +101,14 @@ spec:
httpGet: httpGet:
path: /actuator/health path: /actuator/health
port: 48082 port: 48082
initialDelaySeconds: 100 initialDelaySeconds: 50
periodSeconds: 5 periodSeconds: 5
failureThreshold: 3 failureThreshold: 3
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /actuator/health path: /actuator/health
port: 48082 port: 48082
initialDelaySeconds: 100 initialDelaySeconds: 50
periodSeconds: 10 periodSeconds: 10
failureThreshold: 5 failureThreshold: 5
resources: resources:
@@ -125,26 +125,26 @@ spec:
maxSurge: 1 maxSurge: 1
maxUnavailable: 0 maxUnavailable: 0
--- ---
#apiVersion: v1 apiVersion: v1
#kind: Service kind: Service
#metadata: metadata:
# namespace: ns-766b45fbd7464ccb86d5fd046054cf0a namespace: ns-d6a0e78ebd674c279614498e4c57b133
# name: zt-module-infra name: zt-module-infra
#spec: spec:
# type: NodePort type: NodePort
# selector: selector:
# app: zt-module-infra app: zt-module-infra
# ports: ports:
# - protocol: TCP - protocol: TCP
# port: 48082 port: 48082
# targetPort: 48082 targetPort: 48082
# nodePort: 30092 nodePort: 30092
#--- ---
# zt-module-system # zt-module-system
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
namespace: ns-766b45fbd7464ccb86d5fd046054cf0a namespace: ns-d6a0e78ebd674c279614498e4c57b133
name: zt-module-system name: zt-module-system
labels: labels:
app: zt-module-system app: zt-module-system
@@ -170,7 +170,7 @@ spec:
- key: kubernetes.io/hostname - key: kubernetes.io/hostname
operator: In operator: In
values: values:
- worker04 - node-3
dnsPolicy: None dnsPolicy: None
dnsConfig: dnsConfig:
nameservers: nameservers:
@@ -178,7 +178,7 @@ spec:
- "172.16.36.220" - "172.16.36.220"
containers: containers:
- name: zt-module-system - name: zt-module-system
image: 172.17.19.16:10043/zt-jygk/zt-module-system:VERSION_PLACEHOLDER image: 172.16.46.66:10043/zt/zt-module-system:VERSION_PLACEHOLDER
imagePullPolicy: Always imagePullPolicy: Always
env: env:
- name: TZ - name: TZ
@@ -187,14 +187,14 @@ spec:
httpGet: httpGet:
path: /actuator/health path: /actuator/health
port: 48081 port: 48081
initialDelaySeconds: 100 initialDelaySeconds: 50
periodSeconds: 5 periodSeconds: 5
failureThreshold: 3 failureThreshold: 3
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /actuator/health path: /actuator/health
port: 48081 port: 48081
initialDelaySeconds: 100 initialDelaySeconds: 50
periodSeconds: 10 periodSeconds: 10
failureThreshold: 5 failureThreshold: 5
resources: resources:
@@ -211,26 +211,26 @@ spec:
maxSurge: 1 maxSurge: 1
maxUnavailable: 0 maxUnavailable: 0
--- ---
#apiVersion: v1 apiVersion: v1
#kind: Service kind: Service
#metadata: metadata:
# namespace: ns-766b45fbd7464ccb86d5fd046054cf0a namespace: ns-d6a0e78ebd674c279614498e4c57b133
# name: zt-module-system name: zt-module-system
#spec: spec:
# type: NodePort type: NodePort
# selector: selector:
# app: zt-module-system app: zt-module-system
# ports: ports:
# - protocol: TCP - protocol: TCP
# port: 48081 port: 48081
# targetPort: 48081 targetPort: 48081
# nodePort: 30091 nodePort: 30091
#--- ---
# zt-module-bpm # zt-module-bpm
#apiVersion: apps/v1 #apiVersion: apps/v1
#kind: Deployment #kind: Deployment
#metadata: #metadata:
# namespace: ns-766b45fbd7464ccb86d5fd046054cf0a # namespace: ns-d6a0e78ebd674c279614498e4c57b133
# name: zt-module-bpm # name: zt-module-bpm
# labels: # labels:
# app: zt-module-bpm # app: zt-module-bpm
@@ -250,7 +250,7 @@ spec:
# spec: # spec:
# containers: # containers:
# - name: zt-module-bpm # - name: zt-module-bpm
# image: 172.17.19.16:10043/zt-jygk/zt-module-bpm:VERSION_PLACEHOLDER # image: 172.16.46.66:10043/zt/zt-module-bpm:VERSION_PLACEHOLDER
# imagePullPolicy: Always # imagePullPolicy: Always
# env: # env:
# - name: TZ # - name: TZ
@@ -259,14 +259,14 @@ spec:
# httpGet: # httpGet:
# path: /actuator/health # path: /actuator/health
# port: 48083 # port: 48083
# initialDelaySeconds: 100 # initialDelaySeconds: 50
# periodSeconds: 5 # periodSeconds: 5
# failureThreshold: 3 # failureThreshold: 3
# livenessProbe: # livenessProbe:
# httpGet: # httpGet:
# path: /actuator/health # path: /actuator/health
# port: 48083 # port: 48083
# initialDelaySeconds: 100 # initialDelaySeconds: 50
# periodSeconds: 10 # periodSeconds: 10
# failureThreshold: 5 # failureThreshold: 5
# resources: # resources:
@@ -286,7 +286,7 @@ spec:
#apiVersion: v1 #apiVersion: v1
#kind: Service #kind: Service
#metadata: #metadata:
# namespace: ns-766b45fbd7464ccb86d5fd046054cf0a # namespace: ns-d6a0e78ebd674c279614498e4c57b133
# name: zt-module-bpm # name: zt-module-bpm
#spec: #spec:
# type: NodePort # type: NodePort
@@ -302,7 +302,7 @@ spec:
#apiVersion: apps/v1 #apiVersion: apps/v1
#kind: Deployment #kind: Deployment
#metadata: #metadata:
# namespace: ns-766b45fbd7464ccb86d5fd046054cf0a # namespace: ns-d6a0e78ebd674c279614498e4c57b133
# name: zt-module-report # name: zt-module-report
# labels: # labels:
# app: zt-module-report # app: zt-module-report
@@ -322,7 +322,7 @@ spec:
# spec: # spec:
# containers: # containers:
# - name: zt-module-report # - name: zt-module-report
# image: 172.17.19.16:10043/zt-jygk/zt-module-report:VERSION_PLACEHOLDER # image: 172.16.46.66:10043/zt/zt-module-report:VERSION_PLACEHOLDER
# imagePullPolicy: Always # imagePullPolicy: Always
# env: # env:
# - name: TZ # - name: TZ
@@ -331,14 +331,14 @@ spec:
# httpGet: # httpGet:
# path: /actuator/health # path: /actuator/health
# port: 48084 # port: 48084
# initialDelaySeconds: 100 # initialDelaySeconds: 50
# periodSeconds: 5 # periodSeconds: 5
# failureThreshold: 3 # failureThreshold: 3
# livenessProbe: # livenessProbe:
# httpGet: # httpGet:
# path: /actuator/health # path: /actuator/health
# port: 48084 # port: 48084
# initialDelaySeconds: 100 # initialDelaySeconds: 50
# periodSeconds: 10 # periodSeconds: 10
# failureThreshold: 5 # failureThreshold: 5
# resources: # resources:
@@ -358,7 +358,7 @@ spec:
#apiVersion: v1 #apiVersion: v1
#kind: Service #kind: Service
#metadata: #metadata:
# namespace: ns-766b45fbd7464ccb86d5fd046054cf0a # namespace: ns-d6a0e78ebd674c279614498e4c57b133
# name: zt-module-report # name: zt-module-report
#spec: #spec:
# type: NodePort # type: NodePort
@@ -374,7 +374,7 @@ spec:
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
namespace: ns-766b45fbd7464ccb86d5fd046054cf0a namespace: ns-d6a0e78ebd674c279614498e4c57b133
name: zt-module-databus name: zt-module-databus
labels: labels:
app: zt-module-databus app: zt-module-databus
@@ -392,6 +392,15 @@ spec:
labels: labels:
app: zt-module-databus app: zt-module-databus
spec: spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- node-3
dnsPolicy: None dnsPolicy: None
dnsConfig: dnsConfig:
nameservers: nameservers:
@@ -399,7 +408,7 @@ spec:
- "172.16.36.220" - "172.16.36.220"
containers: containers:
- name: zt-module-databus - name: zt-module-databus
image: 172.17.19.16:10043/zt-jygk/zt-module-databus:VERSION_PLACEHOLDER image: 172.16.46.66:10043/zt/zt-module-databus:VERSION_PLACEHOLDER
imagePullPolicy: Always imagePullPolicy: Always
env: env:
- name: TZ - name: TZ
@@ -408,14 +417,14 @@ spec:
httpGet: httpGet:
path: /actuator/health path: /actuator/health
port: 48100 port: 48100
initialDelaySeconds: 100 initialDelaySeconds: 50
periodSeconds: 5 periodSeconds: 5
failureThreshold: 3 failureThreshold: 3
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /actuator/health path: /actuator/health
port: 48100 port: 48100
initialDelaySeconds: 100 initialDelaySeconds: 50
periodSeconds: 10 periodSeconds: 10
failureThreshold: 5 failureThreshold: 5
resources: resources:
@@ -432,28 +441,28 @@ spec:
maxSurge: 1 maxSurge: 1
maxUnavailable: 0 maxUnavailable: 0
--- ---
#apiVersion: v1 apiVersion: v1
#kind: Service kind: Service
#metadata: metadata:
# namespace: ns-766b45fbd7464ccb86d5fd046054cf0a namespace: ns-d6a0e78ebd674c279614498e4c57b133
# name: zt-module-databus name: zt-module-databus
#spec: spec:
# type: NodePort type: NodePort
# selector: selector:
# app: zt-module-databus app: zt-module-databus
# ports: ports:
# - protocol: TCP - protocol: TCP
# port: 48100 port: 48100
# targetPort: 48100 targetPort: 48100
# nodePort: 30090 nodePort: 30090
#
#
#--- ---
# zt-module-template # zt-module-template
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
namespace: ns-766b45fbd7464ccb86d5fd046054cf0a namespace: ns-d6a0e78ebd674c279614498e4c57b133
name: zt-module-template name: zt-module-template
labels: labels:
app: zt-module-template app: zt-module-template
@@ -478,7 +487,7 @@ spec:
- "172.16.36.220" - "172.16.36.220"
containers: containers:
- name: zt-module-template - name: zt-module-template
image: 172.17.19.16:10043/zt-jygk/zt-module-template:VERSION_PLACEHOLDER image: 172.16.46.66:10043/zt/zt-module-template:VERSION_PLACEHOLDER
imagePullPolicy: Always imagePullPolicy: Always
env: env:
- name: TZ - name: TZ
@@ -487,14 +496,14 @@ spec:
httpGet: httpGet:
path: /actuator/health path: /actuator/health
port: 49100 port: 49100
initialDelaySeconds: 100 initialDelaySeconds: 50
periodSeconds: 5 periodSeconds: 5
failureThreshold: 3 failureThreshold: 3
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /actuator/health path: /actuator/health
port: 49100 port: 49100
initialDelaySeconds: 100 initialDelaySeconds: 50
periodSeconds: 10 periodSeconds: 10
failureThreshold: 5 failureThreshold: 5
resources: resources:
@@ -510,18 +519,18 @@ spec:
rollingUpdate: rollingUpdate:
maxSurge: 1 maxSurge: 1
maxUnavailable: 0 maxUnavailable: 0
#--- ---
#apiVersion: v1 apiVersion: v1
#kind: Service kind: Service
#metadata: metadata:
# namespace: ns-766b45fbd7464ccb86d5fd046054cf0a namespace: ns-d6a0e78ebd674c279614498e4c57b133
# name: zt-module-template name: zt-module-template
#spec: spec:
# type: NodePort type: NodePort
# selector: selector:
# app: zt-module-template app: zt-module-template
# ports: ports:
# - protocol: TCP - protocol: TCP
# port: 49100 port: 49100
# targetPort: 49100 targetPort: 49100
# nodePort: 30889 nodePort: 30889

2
zt-gateway/Dockerfile
View File

@@ -1,6 +1,6 @@
## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性 ## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性
FROM 172.17.19.16:10043/zt-cloud-base-service/eclipse-temurin:21-jre FROM 172.16.46.66:10043/base-service/eclipse-temurin:21-jre
## 创建目录，并使用它作为工作目录 ## 创建目录，并使用它作为工作目录
RUN mkdir -p /zt-gateway RUN mkdir -p /zt-gateway