Commit 502e33ea by wangtingwei

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

1 parent 1b4cfe42
...@@ -29,6 +29,14 @@ spec: ...@@ -29,6 +29,14 @@ spec:
mountPath: /adl/bin/conf/app.yaml mountPath: /adl/bin/conf/app.yaml
subPath: app.yaml subPath: app.yaml
command: ["core--collector"] command: ["core--collector"]
ports:
- containerPort: 8080
name: ccport-8080
livenessProbe:
httpGet:
path: /health
port: ccport-8080
scheme: HTTP
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
...@@ -30,6 +30,14 @@ spec: ...@@ -30,6 +30,14 @@ spec:
mountPath: /adl/bin/conf/app.yaml mountPath: /adl/bin/conf/app.yaml
subPath: app.yaml subPath: app.yaml
command: ["core--monitor"] command: ["core--monitor"]
ports:
- containerPort: 8080
name: cmport-8080
livenessProbe:
httpGet:
path: /health
port: cmport-8080
scheme: HTTP
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
...@@ -16,13 +16,33 @@ spec: ...@@ -16,13 +16,33 @@ spec:
- name: core--nginx - name: core--nginx
image: DOCKER_REGISTRY/core--nginx:latest image: DOCKER_REGISTRY/core--nginx:latest
imagePullPolicy: Always 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: ports:
- containerPort: 80 - containerPort: 80
name: port-80 name: port-80
livenessProbe:
tcpSocket:
port: port-80
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
memory: "512Mi" memory: "512Mi"
limits: limits:
cpu: "500m" cpu: "500m"
memory: "1024Mi" memory: "1024Mi"
\ No newline at end of file volumes:
- name: config
configMap:
name: cfg-core-nginx
items:
- key: apiserver.conf
path: default.conf
- key: nginx.conf
path: nginx.conf
...@@ -30,6 +30,12 @@ spec: ...@@ -30,6 +30,12 @@ spec:
mountPath: /adl/bin/conf/app.yaml mountPath: /adl/bin/conf/app.yaml
subPath: app.yaml subPath: app.yaml
command: ["core--server"] command: ["core--server"]
ports:
- containerPort: 30100
name: port-30100
livenessProbe:
tcpSocket:
port: port-30100
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
...@@ -30,6 +30,14 @@ spec: ...@@ -30,6 +30,14 @@ spec:
mountPath: /adl/bin/conf/app.yaml mountPath: /adl/bin/conf/app.yaml
subPath: app.yaml subPath: app.yaml
command: ["core--worker"] command: ["core--worker"]
ports:
- containerPort: 8080
name: cwport-8080
livenessProbe:
httpGet:
path: /health
port: cwport-8080
scheme: HTTP
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
...@@ -32,6 +32,11 @@ spec: ...@@ -32,6 +32,11 @@ spec:
ports: ports:
- containerPort: 8921 - containerPort: 8921
name: port-8921 name: port-8921
livenessProbe:
httpGet:
path: /health
port: port-8921
scheme: HTTP
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
...@@ -34,6 +34,9 @@ spec: ...@@ -34,6 +34,9 @@ spec:
ports: ports:
- containerPort: 8922 - containerPort: 8922
name: port-8922 name: port-8922
livenessProbe:
tcpSocket:
port: port-8922
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
...@@ -34,6 +34,11 @@ spec: ...@@ -34,6 +34,11 @@ spec:
ports: ports:
- containerPort: 8920 - containerPort: 8920
name: port-8920 name: port-8920
livenessProbe:
httpGet:
path: /health
port: port-8920
scheme: HTTP
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
...@@ -19,6 +19,19 @@ spec: ...@@ -19,6 +19,19 @@ spec:
- name: seetaas--nginx - name: seetaas--nginx
image: DOCKER_REGISTRY/seetaas--nginx:latest image: DOCKER_REGISTRY/seetaas--nginx:latest
imagePullPolicy: Always 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: ports:
- containerPort: 80 - containerPort: 80
name: port-80 name: port-80
...@@ -28,6 +41,9 @@ spec: ...@@ -28,6 +41,9 @@ spec:
name: port-82 name: port-82
- containerPort: 443 - containerPort: 443
name: port-443 name: port-443
livenessProbe:
tcpSocket:
port: port-80
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
...@@ -35,3 +51,17 @@ spec: ...@@ -35,3 +51,17 @@ spec:
limits: limits:
cpu: "500m" cpu: "500m"
memory: "1024Mi" 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
...@@ -33,6 +33,11 @@ spec: ...@@ -33,6 +33,11 @@ spec:
ports: ports:
- containerPort: 8919 - containerPort: 8919
name: port-8919 name: port-8919
livenessProbe:
httpGet:
path: /health
port: port-8919
scheme: HTTP
resources: resources:
requests: requests:
cpu: "1000m" cpu: "1000m"
......
...@@ -30,6 +30,14 @@ spec: ...@@ -30,6 +30,14 @@ spec:
mountPath: /adl/bin/conf/app.yaml mountPath: /adl/bin/conf/app.yaml
subPath: app.yaml subPath: app.yaml
command: ["bash", "-c"] command: ["bash", "-c"]
ports:
- containerPort: 8080
name: wport-8080
livenessProbe:
httpGet:
path: /health
port: wport-8080
scheme: HTTP
args: ["seetaas--script && seetaas--worker"] args: ["seetaas--script && seetaas--worker"]
resources: resources:
requests: requests:
......
...@@ -30,6 +30,14 @@ spec: ...@@ -30,6 +30,14 @@ spec:
mountPath: /adl/bin/conf/app.yaml mountPath: /adl/bin/conf/app.yaml
subPath: app.yaml subPath: app.yaml
command: ["seetaas--workspace-worker"] command: ["seetaas--workspace-worker"]
ports:
- containerPort: 8080
name: wwport-8080
livenessProbe:
httpGet:
path: /health
port: wwport-8080
scheme: HTTP
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
...@@ -27,6 +27,9 @@ spec: ...@@ -27,6 +27,9 @@ spec:
name: port-80 name: port-80
- containerPort: 81 - containerPort: 81
name: port-81 name: port-81
livenessProbe:
tcpSocket:
port: port-80
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
...@@ -23,6 +23,9 @@ spec: ...@@ -23,6 +23,9 @@ spec:
name: port-30300 name: port-30300
- containerPort: 30302 - containerPort: 30302
name: port-30302 name: port-30302
livenessProbe:
tcpSocket:
port: port-30300
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
...@@ -34,6 +34,9 @@ spec: ...@@ -34,6 +34,9 @@ spec:
name: port-10000 name: port-10000
- containerPort: 10001 - containerPort: 10001
name: port-10001 name: port-10001
livenessProbe:
tcpSocket:
port: port-10001
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
...@@ -32,6 +32,11 @@ spec: ...@@ -32,6 +32,11 @@ spec:
ports: ports:
- containerPort: 10000 - containerPort: 10000
name: port-10000 name: port-10000
livenessProbe:
httpGet:
path: /health
port: port-10000
scheme: HTTP
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
...@@ -25,6 +25,9 @@ spec: ...@@ -25,6 +25,9 @@ spec:
ports: ports:
- containerPort: 80 - containerPort: 80
name: port-80 name: port-80
livenessProbe:
tcpSocket:
port: port-80
resources: resources:
requests: requests:
cpu: "500m" cpu: "500m"
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!