diff --git a/base/projects/stock2/h5/h5blue-deployment.yaml b/base/projects/stock2/h5/h5blue-deployment.yaml new file mode 100644 index 0000000..c440969 --- /dev/null +++ b/base/projects/stock2/h5/h5blue-deployment.yaml @@ -0,0 +1,28 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: stock2-web-h5blue +spec: + replicas: 1 + selector: + matchLabels: + app: stock2-web-h5blue + template: + metadata: + labels: + app: stock2-web-h5blue + spec: + containers: + - name: stock2-web-h5blue + image: juyou.tencentcloudcr.com/juyoutech/stock2_web_h5blue:latest + ports: + - containerPort: 80 + resources: + requests: + cpu: "0.125" + memory: "125Mi" + limits: + cpu: "0.25" + memory: "250Mi" + imagePullSecrets: + - name: juyou-docker-tcr-secret \ No newline at end of file diff --git a/base/projects/stock2/h5/h5blue-service.yaml b/base/projects/stock2/h5/h5blue-service.yaml new file mode 100644 index 0000000..a52369e --- /dev/null +++ b/base/projects/stock2/h5/h5blue-service.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: stock2-web-h5blue-service +spec: + ports: + - port: 80 + targetPort: 80 + name: stock2-web-h5blue + selector: + app: stock2-web-h5blue \ No newline at end of file diff --git a/base/projects/stock2/h5/h5gold-deployment.yaml b/base/projects/stock2/h5/h5gold-deployment.yaml new file mode 100644 index 0000000..a5b404d --- /dev/null +++ b/base/projects/stock2/h5/h5gold-deployment.yaml @@ -0,0 +1,28 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: stock2-web-h5goldgold +spec: + replicas: 1 + selector: + matchLabels: + app: stock2-web-h5goldgold + template: + metadata: + labels: + app: stock2-web-h5gold + spec: + containers: + - name: stock2-web-h5gold + image: juyou.tencentcloudcr.com/juyoutech/stock2_web_h5gold:latest + ports: + - containerPort: 80 + resources: + requests: + cpu: "0.125" + memory: "125Mi" + limits: + cpu: "0.25" + memory: "250Mi" + imagePullSecrets: + - name: juyou-docker-tcr-secret \ No newline at end of file diff --git a/base/projects/stock2/h5/h5gold-service.yaml b/base/projects/stock2/h5/h5gold-service.yaml new file mode 100644 index 0000000..aca0061 --- /dev/null +++ b/base/projects/stock2/h5/h5gold-service.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: stock2-web-h5gold-service +spec: + ports: + - port: 80 + targetPort: 80 + name: stock2-web-h5gold + selector: + app: stock2-web-h5gold \ No newline at end of file diff --git a/base/projects/stock2/h5-deployment.yaml b/base/projects/stock2/h5/h5red-deployment.yaml similarity index 81% rename from base/projects/stock2/h5-deployment.yaml rename to base/projects/stock2/h5/h5red-deployment.yaml index 1188134..3eae5b9 100644 --- a/base/projects/stock2/h5-deployment.yaml +++ b/base/projects/stock2/h5/h5red-deployment.yaml @@ -1,19 +1,19 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: stock2-web-h5 + name: stock2-web-h5redred spec: replicas: 1 selector: matchLabels: - app: stock2-web-h5 + app: stock2-web-h5red template: metadata: labels: - app: stock2-web-h5 + app: stock2-web-h5red spec: containers: - - name: stock2-web-h5 + - name: stock2-web-h5red image: juyou.tencentcloudcr.com/juyoutech/stock2_web_h5red:latest ports: - containerPort: 80 diff --git a/base/projects/stock2/h5-service.yaml b/base/projects/stock2/h5/h5red-service.yaml similarity index 53% rename from base/projects/stock2/h5-service.yaml rename to base/projects/stock2/h5/h5red-service.yaml index 85f461e..acafad6 100644 --- a/base/projects/stock2/h5-service.yaml +++ b/base/projects/stock2/h5/h5red-service.yaml @@ -1,11 +1,11 @@ apiVersion: v1 kind: Service metadata: - name: stock2-web-h5-service + name: stock2-web-h5red-service spec: ports: - port: 80 targetPort: 80 - name: stock2-web-h5 + name: stock2-web-h5red selector: - app: stock2-web-h5 \ No newline at end of file + app: stock2-web-h5red \ No newline at end of file diff --git a/base/projects/stock2/h5/kustomization.yaml b/base/projects/stock2/h5/kustomization.yaml new file mode 100644 index 0000000..d042aaf --- /dev/null +++ b/base/projects/stock2/h5/kustomization.yaml @@ -0,0 +1,9 @@ +resources: + - h5red-deployment.yaml + - h5red-service.yaml + - h5gold-deployment.yaml + - h5gold-service.yaml + - h5blue-deployment.yaml + - h5blue-service.yaml + - h5gold-deployment.yaml + - h5gold-service.yaml \ No newline at end of file diff --git a/base/projects/stock2/kustomization.yaml b/base/projects/stock2/kustomization.yaml index 2a717f4..4757792 100644 --- a/base/projects/stock2/kustomization.yaml +++ b/base/projects/stock2/kustomization.yaml @@ -6,8 +6,6 @@ resources: - agent-service.yaml - api-deployment.yaml - api-service.yaml - - h5-deployment.yaml - - h5-service.yaml - market-deployment.yaml - market-service.yaml - task-deployment.yaml diff --git a/gpdev/ingress.yaml b/gpdev/ingress.yaml index 8871d9e..62d347f 100644 --- a/gpdev/ingress.yaml +++ b/gpdev/ingress.yaml @@ -35,14 +35,62 @@ spec: name: stock2-java-market-service port: number: 80 - - host: h5.gpdev.qq.com + - host: h5red.gpdev.qq.com http: paths: - path: / pathType: Prefix backend: service: - name: stock2-web-h5-service + name: stock2-web-h5red-service + port: + number: 80 + - path: /api + pathType: Prefix + backend: + service: + name: stock2-java-api-service + port: + number: 80 + - path: /market + pathType: Prefix + backend: + service: + name: stock2-java-market-service + port: + number: 80 + - host: h5blue.gpdev.qq.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: stock2-web-h5blue-service + port: + number: 80 + - path: /api + pathType: Prefix + backend: + service: + name: stock2-java-api-service + port: + number: 80 + - path: /market + pathType: Prefix + backend: + service: + name: stock2-java-market-service + port: + number: 80 + - host: h5gold.gpdev.qq.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: stock2-web-h5gold-service port: number: 80 - path: /api diff --git a/gpdev/kustomization.yaml b/gpdev/kustomization.yaml index 1aaea05..5a69f5b 100644 --- a/gpdev/kustomization.yaml +++ b/gpdev/kustomization.yaml @@ -4,6 +4,7 @@ namespace: gpdev resources: - ../base/projects/stock2 + - ../base/projects/stock2/h5 - ../base/mysql - ../base/redis - ../base/redis-lb