新增autodl-core,seetaas-backend 组件中nginx微服务引用configmap

seetaas_deploy_yaml/autodl-core/collector-deployment.yaml

@@ -29,6 +29,14 @@ spec:
           mountPath: /adl/bin/conf/app.yaml
           subPath: app.yaml
         command: ["core--collector"]
+        ports:
+          - containerPort: 8080
+            name: ccport-8080
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: ccport-8080
+            scheme: HTTP
         resources:
           requests:
             cpu: "500m"

seetaas_deploy_yaml/autodl-core/monitor-deployment.yaml

@@ -30,6 +30,14 @@ spec:
           mountPath: /adl/bin/conf/app.yaml
           subPath: app.yaml
         command: ["core--monitor"]
+        ports:
+          - containerPort: 8080
+            name: cmport-8080
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: cmport-8080
+            scheme: HTTP
         resources:
           requests:
             cpu: "500m"

seetaas_deploy_yaml/autodl-core/nginx.yaml

@@ -16,13 +16,33 @@ spec:
       - name: core--nginx
         image: DOCKER_REGISTRY/core--nginx:latest
         imagePullPolicy: Always
+        volumeMounts:
+        - name: config
+          mountPath: /etc/nginx/nginx.conf
+          subPath: nginx.conf
+        - name: config
+          mountPath: /etc/nginx/conf.d/default.conf
+          subPath: default.conf
         ports:
           - containerPort: 80
             name: port-80
+        livenessProbe:
+          tcpSocket:
+            port: port-80
         resources:
           requests:
             cpu: "500m"
             memory: "512Mi"
           limits:
             cpu: "500m"
-            memory: "1024Mi"
\ No newline at end of file
+            memory: "1024Mi"
+      volumes:
+      - name: config
+        configMap:
+          name: cfg-core-nginx
+          items:
+          - key: apiserver.conf
+            path: default.conf
+          - key: nginx.conf
+            path: nginx.conf
+ 

seetaas_deploy_yaml/autodl-core/server-deployment.yaml

@@ -30,6 +30,12 @@ spec:
           mountPath: /adl/bin/conf/app.yaml
           subPath: app.yaml
         command: ["core--server"]
+        ports:
+          - containerPort: 30100
+            name: port-30100
+        livenessProbe:
+          tcpSocket:
+            port: port-30100
         resources:
           requests:
             cpu: "500m"

seetaas_deploy_yaml/autodl-core/worker-deployment.yaml

@@ -30,6 +30,14 @@ spec:
           mountPath: /adl/bin/conf/app.yaml
           subPath: app.yaml
         command: ["core--worker"]
+        ports:
+          - containerPort: 8080
+            name: cwport-8080
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: cwport-8080
+            scheme: HTTP
         resources:
           requests:
             cpu: "500m"

seetaas_deploy_yaml/seetaas-backend/deploy-deployment.yaml

@@ -32,6 +32,11 @@ spec:
         ports:
           - containerPort: 8921
             name: port-8921
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: port-8921
+            scheme: HTTP
         resources:
           requests:
             cpu: "500m"

seetaas_deploy_yaml/seetaas-backend/image-proxy-deployment.yaml

@@ -34,6 +34,9 @@ spec:
         ports:
           - containerPort: 8922
             name: port-8922
+        livenessProbe:
+          tcpSocket:
+            port: port-8922
         resources:
           requests:
             cpu: "500m"

seetaas_deploy_yaml/seetaas-backend/monitor-deployment.yaml

@@ -34,6 +34,11 @@ spec:
         ports:
           - containerPort: 8920
             name: port-8920
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: port-8920
+            scheme: HTTP
         resources:
           requests:
             cpu: "500m"

seetaas_deploy_yaml/seetaas-backend/nginx.yaml

@@ -19,6 +19,19 @@ spec:
       - name: seetaas--nginx
         image: DOCKER_REGISTRY/seetaas--nginx:latest
         imagePullPolicy: Always
+        volumeMounts:
+        - name: config
+          mountPath: /etc/nginx/nginx.conf
+          subPath: nginx.conf
+        - name: config
+          mountPath: /etc/nginx/conf.d/default.conf
+          subPath: default.conf
+        - name: config
+          mountPath: /etc/nginx/conf.d/deploy.conf
+          subPath: deploy.conf
+        - name: config
+          mountPath: /etc/nginx/conf.d/imageproxy.conf
+          subPath: imageproxy.conf
         ports:
           - containerPort: 80
             name: port-80
@@ -28,6 +41,9 @@ spec:
             name: port-82
           - containerPort: 443
             name: port-443
+        livenessProbe:
+          tcpSocket:
+            port: port-80
         resources:
           requests:
             cpu: "500m"
@@ -35,3 +51,17 @@ spec:
           limits:
             cpu: "500m"
             memory: "1024Mi"
+      volumes:
+      - name: config
+        configMap:
+          name: cfg-seetaas-nginx
+          items:
+          - key: apiserver.conf
+            path: default.conf
+          - key: deployproxy.conf
+            path: deploy.conf
+          - key: imageproxy.conf
+            path: imageproxy.conf
+          - key: nginx.conf
+            path: nginx.conf
+

seetaas_deploy_yaml/seetaas-backend/server-deployment.yaml

@@ -33,6 +33,11 @@ spec:
         ports:
           - containerPort: 8919
             name: port-8919
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: port-8919
+            scheme: HTTP
         resources:
           requests:
             cpu: "1000m"

seetaas_deploy_yaml/seetaas-backend/worker-deployment.yaml

@@ -30,6 +30,14 @@ spec:
           mountPath: /adl/bin/conf/app.yaml
           subPath: app.yaml
         command: ["bash", "-c"]
+        ports:
+          - containerPort: 8080
+            name: wport-8080
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: wport-8080
+            scheme: HTTP
         args: ["seetaas--script && seetaas--worker"]
         resources:
           requests:

seetaas_deploy_yaml/seetaas-backend/workspace-worker-deployment.yaml

@@ -30,6 +30,14 @@ spec:
           mountPath: /adl/bin/conf/app.yaml
           subPath: app.yaml
         command: ["seetaas--workspace-worker"]
+        ports:
+          - containerPort: 8080
+            name: wwport-8080
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: wwport-8080
+            scheme: HTTP
         resources:
           requests:
             cpu: "500m"

seetaas_deploy_yaml/seetaas-frontend/seetaas-frontend.yaml

@@ -27,6 +27,9 @@ spec:
             name: port-80
           - containerPort: 81
             name: port-81
+        livenessProbe:
+          tcpSocket:
+            port: port-80
         resources:
           requests:
             cpu: "500m"

seetaas_deploy_yaml/user-center-backend/nginx.yaml

@@ -23,6 +23,9 @@ spec:
             name: port-30300
           - containerPort: 30302
             name: port-30302
+        livenessProbe:
+          tcpSocket:
+            port: port-30300
         resources:
           requests:
             cpu: "500m"

seetaas_deploy_yaml/user-center-backend/rpc-server-deployment.yaml

@@ -34,6 +34,9 @@ spec:
             name: port-10000
           - containerPort: 10001
             name: port-10001
+        livenessProbe:
+          tcpSocket:
+            port: port-10001
         resources:
           requests:
             cpu: "500m"

seetaas_deploy_yaml/user-center-backend/server-deployment.yaml

@@ -32,6 +32,11 @@ spec:
         ports:
           - containerPort: 10000
             name: port-10000
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: port-10000
+            scheme: HTTP
         resources:
           requests:
             cpu: "500m"

seetaas_deploy_yaml/user-center-frontend/seetaas-frontend.yaml

@@ -25,6 +25,9 @@ spec:
         ports:
           - containerPort: 80
             name: port-80
+        livenessProbe:
+          tcpSocket:
+            port: port-80
         resources:
           requests:
             cpu: "500m"