diff --git a/gp054/env/mysql.env b/gp054/env/mysql.env index 2821ab5..ca17939 100644 --- a/gp054/env/mysql.env +++ b/gp054/env/mysql.env @@ -1,5 +1,5 @@ -MYSQL_HOST=mysql-service -MYSQL_PORT=3306 +MYSQL_HOST=lb-rn1fbq8c-agzvf2cjsbhykor5.clb.ap-guangzhou.tencentclb.com +MYSQL_PORT=50054 MYSQL_USER=root -MYSQL_PASSWORD=uNejHIFQGJOUtYTmE -MYSQL_DB=vip_huananyong_c \ No newline at end of file +MYSQL_PASSWORD=QmrlRp7K0HWZ2Cxdsc +MYSQL_DB=vip_huananyong_c diff --git a/gp054/env/redis.env b/gp054/env/redis.env index 876cffc..f5de1f6 100644 --- a/gp054/env/redis.env +++ b/gp054/env/redis.env @@ -1,3 +1,3 @@ -REDIS_HOST=redis-service -REDIS_PORT=6379 -REDIS_PASSWORD=a5v8b86P4mVzFlUqJV \ No newline at end of file +REDIS_HOST=172.16.0.15 +REDIS_PORT=56379 +REDIS_PASSWORD=7Gix7gzmm_KOWrqOiy diff --git a/gp054/env/storage.env b/gp054/env/storage.env index 8d703f0..2b35476 100644 --- a/gp054/env/storage.env +++ b/gp054/env/storage.env @@ -1,6 +1,6 @@ CLOUD_ID=IKIDPhniOp11pOh6IFwQgiV5RatMo48yi8OR CLOUD_KEY=tdAUZP2Scw52oOn360iEVZR9fy62mJfr -CLOUD_DOMAIN=cos.ap-singapore.myqcloud.com +CLOUD_DOMAIN=cos.ap-guangzhou.myqcloud.com CLOUD_APP_ID=1321231020 -CLOUD_BUCKET=hgdev-1321231020 -CLOUD_REGION=ap-singapore \ No newline at end of file +CLOUD_BUCKET=g54-1321231020 +CLOUD_REGION=ap-guangzhou \ No newline at end of file diff --git a/gp054/ingress.yaml b/gp054/ingress.yaml index c012d4a..cd28c50 100644 --- a/gp054/ingress.yaml +++ b/gp054/ingress.yaml @@ -18,6 +18,13 @@ spec: name: stock2-java-api-service port: number: 80 + - path: /market + pathType: Prefix + backend: + service: + name: stock2-java-market-service + port: + number: 80 - host: h5.g54.qq.com http: paths: @@ -25,6 +32,82 @@ spec: pathType: Prefix backend: service: - name: stock2-web-h5-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: admin.g54.qq.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: stock2-web-admin-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: agent.g54.qq.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: stock2-web-agent-service + port: + number: 80 + - path: /api + pathType: Prefix + backend: + service: + name: stock2-java-api-service + port: + number: 80 + - path: /admin + pathType: Prefix + backend: + service: + name: stock2-java-api-service + port: + number: 80 + - path: /agent + 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 \ No newline at end of file diff --git a/gp054/kustomization.yaml b/gp054/kustomization.yaml index 48352b9..0aef087 100644 --- a/gp054/kustomization.yaml +++ b/gp054/kustomization.yaml @@ -4,9 +4,10 @@ namespace: gp054 resources: - ../base/projects/stock2 + - ../base/projects/stock2/h5 + - ../base/mysql - ../base/redis - - ../base/tls - - ../base/updater + - ../base/redis-lb - ingress.yaml configMapGenerator: @@ -24,4 +25,6 @@ patches: - path: patch/api-deployment_patch.yaml - path: patch/market-deployment_patch.yaml - path: patch/task-deployment_patch.yaml - - path: patch/updater-deployment_patch.yaml \ No newline at end of file + - path: patch/updater-deployment_patch.yaml + - path: patch/agent-deployment_patch.yaml + - path: patch/h5blue-deployment_patch.yaml \ No newline at end of file diff --git a/gp054/patch/agent-deployment_patch.yaml b/gp054/patch/agent-deployment_patch.yaml new file mode 100644 index 0000000..f376d0c --- /dev/null +++ b/gp054/patch/agent-deployment_patch.yaml @@ -0,0 +1,10 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: stock2-web-agent +spec: + template: + spec: + containers: + - name: stock2-web-agent + image: juyou.tencentcloudcr.com/juyoutech/stock2_web_agent:master \ No newline at end of file diff --git a/gp054/patch/api-deployment_patch.yaml b/gp054/patch/api-deployment_patch.yaml index 33ba2f1..d6d866d 100644 --- a/gp054/patch/api-deployment_patch.yaml +++ b/gp054/patch/api-deployment_patch.yaml @@ -7,6 +7,7 @@ spec: spec: containers: - name: stock2-java-api + image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:master envFrom: - configMapRef: name: mysql-configmap diff --git a/gp054/patch/h5blue-deployment_patch.yaml b/gp054/patch/h5blue-deployment_patch.yaml new file mode 100644 index 0000000..c21388d --- /dev/null +++ b/gp054/patch/h5blue-deployment_patch.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_h5blue54: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/gp054/patch/market-deployment_patch.yaml b/gp054/patch/market-deployment_patch.yaml index cd6dfe4..73a7516 100644 --- a/gp054/patch/market-deployment_patch.yaml +++ b/gp054/patch/market-deployment_patch.yaml @@ -7,6 +7,7 @@ spec: spec: containers: - name: stock2-java-market + image: juyou.tencentcloudcr.com/juyoutech/stock2_java_market:master envFrom: - configMapRef: name: mysql-configmap diff --git a/gp054/patch/task-deployment_patch.yaml b/gp054/patch/task-deployment_patch.yaml index 06853cc..6a87fb8 100644 --- a/gp054/patch/task-deployment_patch.yaml +++ b/gp054/patch/task-deployment_patch.yaml @@ -7,6 +7,7 @@ spec: spec: containers: - name: stock2-java-task + image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:master envFrom: - configMapRef: name: mysql-configmap diff --git a/gpdev/patch/agent-deployment_patch.yaml b/gpdev/patch/agent-deployment_patch.yaml new file mode 100644 index 0000000..bf3d996 --- /dev/null +++ b/gpdev/patch/agent-deployment_patch.yaml @@ -0,0 +1,10 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: stock2-web-agent +spec: + template: + spec: + containers: + - name: stock2-web-agent + image: juyou.tencentcloudcr.com/juyoutech/stock2_web_agent:latest \ No newline at end of file diff --git a/gpdev/patch/api-deployment_patch.yaml b/gpdev/patch/api-deployment_patch.yaml index 33ba2f1..d005456 100644 --- a/gpdev/patch/api-deployment_patch.yaml +++ b/gpdev/patch/api-deployment_patch.yaml @@ -7,6 +7,7 @@ spec: spec: containers: - name: stock2-java-api + image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:latest envFrom: - configMapRef: name: mysql-configmap diff --git a/gpdev/patch/market-deployment_patch.yaml b/gpdev/patch/market-deployment_patch.yaml index cd6dfe4..5949797 100644 --- a/gpdev/patch/market-deployment_patch.yaml +++ b/gpdev/patch/market-deployment_patch.yaml @@ -7,6 +7,7 @@ spec: spec: containers: - name: stock2-java-market + image: juyou.tencentcloudcr.com/juyoutech/stock2_java_market:latest envFrom: - configMapRef: name: mysql-configmap diff --git a/gpdev/patch/task-deployment_patch.yaml b/gpdev/patch/task-deployment_patch.yaml index 06853cc..05e0a8b 100644 --- a/gpdev/patch/task-deployment_patch.yaml +++ b/gpdev/patch/task-deployment_patch.yaml @@ -7,6 +7,7 @@ spec: spec: containers: - name: stock2-java-task + image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:latest envFrom: - configMapRef: name: mysql-configmap