add g55

gp055/env/mysql.env

@@ -1,5 +1,5 @@
-MYSQL_HOST=mysql-service
+MYSQL_HOST=lb-rn1fbq8c-agzvf2cjsbhykor5.clb.ap-guangzhou.tencentclb.com
-MYSQL_PORT=3306
+MYSQL_PORT=50055
 MYSQL_USER=root
-MYSQL_PASSWORD=uNejHIFQGJOUtYTmE
+MYSQL_PASSWORD=XmD!Wj8gl6wYG7P
 MYSQL_DB=vip_huananyong_c

gp055/env/redis.env

@@ -1,3 +1,3 @@
-REDIS_HOST=redis-service
+REDIS_HOST=172.16.0.2
-REDIS_PORT=6379
+REDIS_PORT=56379
-REDIS_PASSWORD=a5v8b86P4mVzFlUqJV
+REDIS_PASSWORD=7Gix7gzmm_KOWrqOiy

gp055/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_BUCKET=g55-1321231020
-CLOUD_REGION=ap-singapore
+CLOUD_REGION=ap-guangzhou

gp055/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.g55.qq.com
       http:
         paths:
@@ -25,6 +32,82 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: stock2-web-h5-service
+                name: stock2-web-h5gold-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.g55.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.g55.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

gp055/kustomization.yaml

@@ -4,9 +4,10 @@ namespace: gp055
 
 resources:
   - ../base/projects/stock2
+  - ../base/projects/stock2/h5
+  - ../base/mysql
   - ../base/redis
-  - ../base/tls
+  - ../base/redis-lb
-  - ../base/updater
   - ingress.yaml
 
 configMapGenerator:
@@ -24,4 +25,5 @@ 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
+  - path: patch/agent-deployment_patch.yaml
+  - path: patch/h5gold-deployment_patch.yaml

gp055/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:main

gp055/patch/api-deployment_patch.yaml

@@ -7,6 +7,7 @@ spec:
     spec:
       containers:
         - name: stock2-java-api
+          image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:main
           envFrom:
             - configMapRef:
                 name: mysql-configmap

gp055/patch/h5gold-deployment_patch.yaml

@@ -0,0 +1,28 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: stock2-web-h5gold
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: stock2-web-h5gold
+  template:
+    metadata:
+      labels:
+        app: stock2-web-h5gold
+    spec:
+      containers:
+        - name: stock2-web-h5gold
+          image: juyou.tencentcloudcr.com/juyoutech/stock2_web_h5gold55:latest
+          ports:
+            - containerPort: 80
+          resources:
+            requests:
+              cpu: "0.125"
+              memory: "125Mi"
+            limits:
+              cpu: "0.25"
+              memory: "250Mi"
+      imagePullSecrets:
+        - name: juyou-docker-tcr-secret

gp055/patch/market-deployment_patch.yaml

@@ -7,6 +7,7 @@ spec:
     spec:
       containers:
         - name: stock2-java-market
+          image: juyou.tencentcloudcr.com/juyoutech/stock2_java_market:main
           envFrom:
             - configMapRef:
                 name: mysql-configmap

gp055/patch/task-deployment_patch.yaml

@@ -7,6 +7,7 @@ spec:
     spec:
       containers:
         - name: stock2-java-task
+          image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:main
           envFrom:
             - configMapRef:
                 name: mysql-configmap

gp055/patch/updater-deployment_patch.yaml

@@ -1,12 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: k8s-updater
-spec:
-  template:
-    spec:
-      containers:
-        - name: k8s-updater
-          image: juyou.tencentcloudcr.com/juyoutech/k8s_updater:latest
-      imagePullSecrets:
-        - name: juyou-docker-tcr-secret