From 6307fbc2eaa6f492d503daa39427390253bbb689 Mon Sep 17 00:00:00 2001 From: owen Date: Thu, 11 Jul 2024 20:16:08 +0800 Subject: [PATCH] 1 --- .../projects/stock2/h5-deployment.yaml | 12 ++++---- base/projects/stock2/h5-service.yaml | 11 +++++++ base/projects/stock2/h5/h5red-deployment.yaml | 2 +- base/projects/stock2/kustomization.yaml | 4 ++- gp057/ingress.yaml | 2 +- gp057/kustomization.yaml | 3 +- gp057/patch/h5-deployment_patch.yaml | 18 ++++++++++++ gp059/ingress.yaml | 2 +- gp059/kustomization.yaml | 3 +- gp059/patch/h5-deployment_patch.yaml | 18 ++++++++++++ gp059/patch/h5blue-deployment_patch.yaml | 29 ------------------- 11 files changed, 60 insertions(+), 44 deletions(-) rename gp057/patch/h5blue-deployment_patch.yaml => base/projects/stock2/h5-deployment.yaml (74%) create mode 100644 base/projects/stock2/h5-service.yaml create mode 100644 gp057/patch/h5-deployment_patch.yaml create mode 100644 gp059/patch/h5-deployment_patch.yaml delete mode 100644 gp059/patch/h5blue-deployment_patch.yaml diff --git a/gp057/patch/h5blue-deployment_patch.yaml b/base/projects/stock2/h5-deployment.yaml similarity index 74% rename from gp057/patch/h5blue-deployment_patch.yaml rename to base/projects/stock2/h5-deployment.yaml index 6edc1d9..970cc9d 100644 --- a/gp057/patch/h5blue-deployment_patch.yaml +++ b/base/projects/stock2/h5-deployment.yaml @@ -1,21 +1,19 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: stock2-web-h5blue -spec: + name: stock2-web-h5 replicas: 1 selector: matchLabels: - app: stock2-web-h5blue + app: stock2-web-h5 template: metadata: labels: - app: stock2-web-h5blue + app: stock2-web-h5 spec: containers: - - name: stock2-web-h5blue - image: juyou.tencentcloudcr.com/juyoutech/stock2_web_h5blue57:latest - imagePullPolicy: Always + - name: stock2-web-h5 + image: juyou.tencentcloudcr.com/juyoutech/stock2_web_h5blue:latest ports: - containerPort: 80 resources: diff --git a/base/projects/stock2/h5-service.yaml b/base/projects/stock2/h5-service.yaml new file mode 100644 index 0000000..85f461e --- /dev/null +++ b/base/projects/stock2/h5-service.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: stock2-web-h5-service +spec: + ports: + - port: 80 + targetPort: 80 + name: stock2-web-h5 + selector: + app: stock2-web-h5 \ No newline at end of file diff --git a/base/projects/stock2/h5/h5red-deployment.yaml b/base/projects/stock2/h5/h5red-deployment.yaml index 3eae5b9..61de1a0 100644 --- a/base/projects/stock2/h5/h5red-deployment.yaml +++ b/base/projects/stock2/h5/h5red-deployment.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: stock2-web-h5redred + name: stock2-web-h5red spec: replicas: 1 selector: diff --git a/base/projects/stock2/kustomization.yaml b/base/projects/stock2/kustomization.yaml index 4757792..d14caa2 100644 --- a/base/projects/stock2/kustomization.yaml +++ b/base/projects/stock2/kustomization.yaml @@ -9,4 +9,6 @@ resources: - market-deployment.yaml - market-service.yaml - task-deployment.yaml - - task-service.yaml \ No newline at end of file + - task-service.yaml + - h5-deployment.yaml + - h5-service.yaml \ No newline at end of file diff --git a/gp057/ingress.yaml b/gp057/ingress.yaml index 681a10b..f0c7b51 100644 --- a/gp057/ingress.yaml +++ b/gp057/ingress.yaml @@ -32,7 +32,7 @@ spec: pathType: Prefix backend: service: - name: stock2-web-h5blue-service + name: stock2-web-h5-service port: number: 80 - path: /api diff --git a/gp057/kustomization.yaml b/gp057/kustomization.yaml index 48c66a5..f9bfece 100644 --- a/gp057/kustomization.yaml +++ b/gp057/kustomization.yaml @@ -4,7 +4,6 @@ namespace: gp057 resources: - ../base/projects/stock2 - - ../base/projects/stock2/h5 - ../base/redis - ingress.yaml @@ -24,4 +23,4 @@ patches: - path: patch/market-deployment_patch.yaml - path: patch/task-deployment_patch.yaml - path: patch/agent-deployment_patch.yaml - - path: patch/h5blue-deployment_patch.yaml \ No newline at end of file + - path: patch/h5-deployment_patch.yaml \ No newline at end of file diff --git a/gp057/patch/h5-deployment_patch.yaml b/gp057/patch/h5-deployment_patch.yaml new file mode 100644 index 0000000..71617b8 --- /dev/null +++ b/gp057/patch/h5-deployment_patch.yaml @@ -0,0 +1,18 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: stock2-web-h5 +spec: + replicas: 1 + selector: + matchLabels: + app: stock2-web-h5 + template: + metadata: + labels: + app: stock2-web-h5 + spec: + containers: + - name: stock2-web-h5 + image: juyou.tencentcloudcr.com/juyoutech/stock2_web_h5blue57:latest + imagePullPolicy: Always \ No newline at end of file diff --git a/gp059/ingress.yaml b/gp059/ingress.yaml index 0c82d6b..5e0f34a 100644 --- a/gp059/ingress.yaml +++ b/gp059/ingress.yaml @@ -32,7 +32,7 @@ spec: pathType: Prefix backend: service: - name: stock2-web-h5blue-service + name: stock2-web-h5-service port: number: 80 - path: /api diff --git a/gp059/kustomization.yaml b/gp059/kustomization.yaml index 2890131..c786364 100644 --- a/gp059/kustomization.yaml +++ b/gp059/kustomization.yaml @@ -4,7 +4,6 @@ namespace: gp059 resources: - ../base/projects/stock2 - - ../base/projects/stock2/h5 - ../base/redis - ingress.yaml @@ -24,4 +23,4 @@ patches: - path: patch/market-deployment_patch.yaml - path: patch/task-deployment_patch.yaml - path: patch/agent-deployment_patch.yaml - - path: patch/h5blue-deployment_patch.yaml \ No newline at end of file + - path: patch/h5-deployment_patch.yaml \ No newline at end of file diff --git a/gp059/patch/h5-deployment_patch.yaml b/gp059/patch/h5-deployment_patch.yaml new file mode 100644 index 0000000..5fe85b6 --- /dev/null +++ b/gp059/patch/h5-deployment_patch.yaml @@ -0,0 +1,18 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: stock2-web-h +spec: + replicas: 1 + selector: + matchLabels: + app: stock2-web-h5 + template: + metadata: + labels: + app: stock2-web-h5 + spec: + containers: + - name: stock2-web-h5 + image: juyou.tencentcloudcr.com/juyoutech/stock2_web_h5blue59:latest + imagePullPolicy: Always \ No newline at end of file diff --git a/gp059/patch/h5blue-deployment_patch.yaml b/gp059/patch/h5blue-deployment_patch.yaml deleted file mode 100644 index b4db8d6..0000000 --- a/gp059/patch/h5blue-deployment_patch.yaml +++ /dev/null @@ -1,29 +0,0 @@ -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_h5blue59:latest - imagePullPolicy: Always - 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