merge
This commit is contained in:
@@ -3,7 +3,7 @@ apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: mysql
|
||||
namespace: dad-group-x
|
||||
namespace: dad-group-46
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
@@ -37,7 +37,7 @@ apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: mysql
|
||||
namespace: dad-group-x
|
||||
namespace: dad-group-46
|
||||
spec:
|
||||
ports:
|
||||
- port: 3306
|
||||
|
||||
@@ -3,10 +3,10 @@ apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: app-ingress
|
||||
namespace: dad-group-x
|
||||
namespace: dad-group-46
|
||||
spec:
|
||||
rules:
|
||||
- host: web-dad-group-x-172.22.21.253.sslip.io
|
||||
- host: web-dad-group-46-172.22.21.253.sslip.io
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
@@ -16,7 +16,7 @@ spec:
|
||||
name: vue-app
|
||||
port:
|
||||
number: 80
|
||||
- host: api-dad-group-x-172.22.21.253.sslip.io
|
||||
- host: api-dad-group-46-172.22.21.253.sslip.io
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
@@ -26,7 +26,7 @@ spec:
|
||||
name: laravel-app
|
||||
port:
|
||||
number: 80
|
||||
- host: ws-dad-group-x-172.22.21.253.sslip.io
|
||||
- host: ws-dad-group-46-172.22.21.253.sslip.io
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
|
||||
@@ -3,7 +3,7 @@ apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: laravel-app
|
||||
namespace: dad-group-x
|
||||
namespace: dad-group-46
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
@@ -17,7 +17,7 @@ spec:
|
||||
priorityClassName: high-priority
|
||||
containers:
|
||||
- name: api
|
||||
image: registry-172.22.21.115.sslip.io/dad-group-x/api:v1.0.0
|
||||
image: registry-172.22.21.115.sslip.io/dad-group-46/api:v2.0.2
|
||||
resources:
|
||||
requests:
|
||||
memory: "256Mi"
|
||||
@@ -31,7 +31,7 @@ apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: laravel-app
|
||||
namespace: dad-group-x
|
||||
namespace: dad-group-46
|
||||
spec:
|
||||
ports:
|
||||
- port: 80
|
||||
|
||||
@@ -3,7 +3,7 @@ apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: vue-app
|
||||
namespace: dad-group-x
|
||||
namespace: dad-group-46
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
@@ -17,7 +17,7 @@ spec:
|
||||
priorityClassName: low-priority
|
||||
containers:
|
||||
- name: web
|
||||
image: registry-172.22.21.115.sslip.io/dad-group-46/web:v1.0.1
|
||||
image: registry-172.22.21.115.sslip.io/dad-group-46/web:v2.0.4
|
||||
resources:
|
||||
requests:
|
||||
memory: "64Mi"
|
||||
@@ -31,7 +31,7 @@ apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: vue-app
|
||||
namespace: dad-group-x
|
||||
namespace: dad-group-46
|
||||
spec:
|
||||
ports:
|
||||
- port: 80
|
||||
|
||||
@@ -3,7 +3,7 @@ apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: websocket-server
|
||||
namespace: dad-group-x
|
||||
namespace: dad-group-46
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
@@ -17,7 +17,7 @@ spec:
|
||||
priorityClassName: low-priority
|
||||
containers:
|
||||
- name: web
|
||||
image: registry-172.22.21.115.sslip.io/dad-group-x/ws:v1.0.0
|
||||
image: registry-172.22.21.115.sslip.io/dad-group-46/ws:v2.0.6
|
||||
resources:
|
||||
requests:
|
||||
memory: "128Mi"
|
||||
@@ -31,7 +31,7 @@ apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: websocket-server
|
||||
namespace: dad-group-x
|
||||
namespace: dad-group-46
|
||||
spec:
|
||||
ports:
|
||||
- port: 3000
|
||||
|
||||
Reference in New Issue
Block a user