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