Merge remote-tracking branch 'origin/main'

base/mysql-nodeport/mysql-service-nodeport.yaml

@@ -9,4 +9,4 @@ spec:
   ports:
     - port: 3306
       targetPort: 3306
-      nodePort: 30000  # 可选，如果不指定，Kubernetes 会自动分配
+      nodePort: 32000  # 可选，如果不指定，Kubernetes 会自动分配

base/redis-nodeport/redis-service-nodeport.yaml

@@ -7,6 +7,6 @@ spec:
   ports:
     - port: 6379
       targetPort: 6379
-      nodePort: 30001  # 可选，如果不指定，Kubernetes 会自动分配
+      nodePort: 32001  # 可选，如果不指定，Kubernetes 会自动分配
   selector:
     app: redis

gp2501/api2-service.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: stock2-java-api2-service
-spec:
-  ports:
-    - port: 80
-      targetPort: 8080
-      name: stock2-java-api2
-  selector:
-    app: stock2-java-api2

gp2501/api2.yaml

@@ -1,38 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: stock2-java-api2
-  labels:
-    app: stock2-java-api2
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: stock2-java-api2
-  template:
-    metadata:
-      labels:
-        app: stock2-java-api2
-    spec:
-      containers:
-        - name: stock2-java-api2
-          image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:latest
-          imagePullPolicy: Always
-          env:
-            - name: MARKET_HOST
-              value: "http://stock2-java-market-service:31099"
-            - name: IS_SCHEDULED
-              value: "false"
-            - name: TZ
-              value: "Asia/Shanghai"
-          envFrom:
-            - configMapRef:
-                name: mysql-configmap
-            - configMapRef:
-                name: redis-configmap
-            - configMapRef:
-                name: storage-configmap
-          ports:
-            - containerPort: 8080
-      imagePullSecrets:
-        - name: juyou-docker-tcr-secret

gp2501/env/mysql.env

@@ -1,6 +0,0 @@
-MYSQL_HOST=lb-rn1fbq8c-agzvf2cjsbhykor5.clb.ap-guangzhou.tencentclb.com
-MYSQL_PORT=52501
-MYSQL_USER=root
-MYSQL_PASSWORD=zw!qmdR8T6KXhRfhwjd
-MYSQL_DB=stock2-api
-MARKET_MYSQL_DB=stock-market

gp2501/env/redis.env

@@ -1,3 +0,0 @@
-REDIS_HOST=redis-service
-REDIS_PORT=6379
-REDIS_PASSWORD=a5v8b86P4mVzFlUqJV

gp2501/env/storage.env

@@ -1,6 +0,0 @@
-CLOUD_ID=IKIDPhniOp11pOh6IFwQgiV5RatMo48yi8OR
-CLOUD_KEY=tdAUZP2Scw52oOn360iEVZR9fy62mJfr
-CLOUD_DOMAIN=cos.ap-guangzhou.myqcloud.com
-CLOUD_APP_ID=1321231020
-CLOUD_BUCKET=g2501-1321231020
-CLOUD_REGION=ap-guangzhou

gp2501/ingress.yaml

@@ -1,120 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: gp-ingress
-  annotations:
-    kubernetes.io/ingress.class: "nginx"
-    nginx.ingress.kubernetes.io/proxy-body-size: "10m"
-    nginx.ingress.kubernetes.io/use-forwarded-headers: "true"
-spec:
-  rules:
-    - host: api.g2501.qq.com
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-api-service
-                port:
-                  number: 80
-          - path: /api/market
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-market-service
-                port:
-                  number: 80
-    - host: h5.g2501.qq.com
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-web-h5-service
-                port:
-                  number: 80
-          - path: /api
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-api-service
-                port:
-                  number: 80
-          - path: /api/market
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-market-service
-                port:
-                  number: 80
-    - host: admin.g2501.qq.com
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-web-admin-service
-                port:
-                  number: 80
-          - path: /admin
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-api2-service
-                port:
-                  number: 80
-          - path: /api
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-api2-service
-                port:
-                  number: 80
-          - path: /api/market
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-market-service
-                port:
-                  number: 80
-    - host: agent.g2501.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-api2-service
-                port:
-                  number: 80
-          - path: /admin
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-api2-service
-                port:
-                  number: 80
-          - path: /agent
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-api2-service
-                port:
-                  number: 80
-          - path: /api/market
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-market-service
-                port:
-                  number: 80

gp2501/kustomization.yaml

@@ -1,29 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: gp2501
-
-resources:
-  - api2.yaml
-  - api2-service.yaml
-  - ../base/projects/stock2
-  - ../base/redis
-  - ingress.yaml
-
-configMapGenerator:
-  - name: mysql-configmap
-    envs:
-      - env/mysql.env
-  - name: redis-configmap
-    envs:
-      - env/redis.env
-  - name: storage-configmap
-    envs:
-      - env/storage.env
-
-patches:
-  - path: patch/api-deployment_patch.yaml
-  - path: patch/market-deployment_patch.yaml
-  - path: patch/task-deployment_patch.yaml
-  - path: patch/agent-deployment_patch.yaml
-  - path: patch/h5-deployment_patch.yaml
-  - path: patch/admin-deployment_patch.yaml

gp2501/patch/admin-deployment_patch.yaml

@@ -1,11 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: stock2-web-admin
-spec:
-  template:
-    spec:
-      containers:
-        - name: stock2-web-admin
-          image: juyou.tencentcloudcr.com/juyoutech/stock2_web_admin:main
-          imagePullPolicy: Always

gp2501/patch/agent-deployment_patch.yaml

@@ -1,13 +0,0 @@
-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
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 80

gp2501/patch/api-deployment_patch.yaml

@@ -1,28 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: stock2-java-api
-spec:
-  template:
-    spec:
-      containers:
-        - name: stock2-java-api
-          image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:main
-          imagePullPolicy: Always
-          envFrom:
-            - configMapRef:
-                name: mysql-configmap
-            - configMapRef:
-                name: redis-configmap
-            - configMapRef:
-                name: storage-configmap
-          env:
-            - name: TZ
-              value: "Asia/Shanghai"
-          # resources:
-          #   requests:
-          #     cpu: "0.5"
-          #     memory: "4Gi"
-          #   limits:
-          #     cpu: "1"
-          #     memory: "8Gi"

gp2501/patch/h5-deployment_patch.yaml

@@ -1,18 +0,0 @@
-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_h5red2501:latest
-          imagePullPolicy: Always

gp2501/patch/market-deployment_patch.yaml

@@ -1,21 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: stock2-java-market
-spec:
-  template:
-    spec:
-      containers:
-        - name: stock2-java-market
-          image: juyou.tencentcloudcr.com/juyoutech/stock2_java_market:main
-          imagePullPolicy: Always
-          envFrom:
-            - configMapRef:
-                name: mysql-configmap
-            - configMapRef:
-                name: redis-configmap
-            - configMapRef:
-                name: storage-configmap
-          env:
-            - name: TZ
-              value: "Asia/Shanghai"

gp2501/patch/task-deployment_patch.yaml

@@ -1,26 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: stock2-java-task
-spec:
-  template:
-    spec:
-      containers:
-        - name: stock2-java-task
-          image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:main
-          imagePullPolicy: Always
-          envFrom:
-            - configMapRef:
-                name: mysql-configmap
-            - configMapRef:
-                name: redis-configmap
-          env:
-            - name: TZ
-              value: "Asia/Shanghai"
-          resources:
-            requests:
-              cpu: "0.5"
-              memory: "4Gi"
-            limits:
-              cpu: "1"
-              memory: "8Gi"

gp2502/api2-service.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: stock2-java-api2-service
-spec:
-  ports:
-    - port: 80
-      targetPort: 8080
-      name: stock2-java-api2
-  selector:
-    app: stock2-java-api2

gp2502/api2.yaml

@@ -1,38 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: stock2-java-api2
-  labels:
-    app: stock2-java-api2
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: stock2-java-api2
-  template:
-    metadata:
-      labels:
-        app: stock2-java-api2
-    spec:
-      containers:
-        - name: stock2-java-api2
-          image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:latest
-          imagePullPolicy: Always
-          env:
-            - name: MARKET_HOST
-              value: "http://stock2-java-market-service:31099"
-            - name: IS_SCHEDULED
-              value: "false"
-            - name: TZ
-              value: "Asia/Shanghai"
-          envFrom:
-            - configMapRef:
-                name: mysql-configmap
-            - configMapRef:
-                name: redis-configmap
-            - configMapRef:
-                name: storage-configmap
-          ports:
-            - containerPort: 8080
-      imagePullSecrets:
-        - name: juyou-docker-tcr-secret

gp2502/env/mysql.env

@@ -1,6 +0,0 @@
-MYSQL_HOST=lb-rn1fbq8c-agzvf2cjsbhykor5.clb.ap-guangzhou.tencentclb.com
-MYSQL_PORT=52502
-MYSQL_USER=root
-MYSQL_PASSWORD=6Z0dBhHTgtmCTjYXW8
-MYSQL_DB=stock2-api
-MARKET_MYSQL_DB=stock-market

gp2502/env/redis.env

@@ -1,3 +0,0 @@
-REDIS_HOST=redis-service
-REDIS_PORT=6379
-REDIS_PASSWORD=a5v8b86P4mVzFlUqJV

gp2502/env/storage.env

@@ -1,6 +0,0 @@
-CLOUD_ID=IKIDPhniOp11pOh6IFwQgiV5RatMo48yi8OR
-CLOUD_KEY=tdAUZP2Scw52oOn360iEVZR9fy62mJfr
-CLOUD_DOMAIN=cos.ap-guangzhou.myqcloud.com
-CLOUD_APP_ID=1321231020
-CLOUD_BUCKET=g2502-1321231020
-CLOUD_REGION=ap-guangzhou

gp2502/ingress.yaml

@@ -1,121 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: gp-ingress
-  annotations:
-    kubernetes.io/ingress.class: "nginx"
-    nginx.ingress.kubernetes.io/proxy-body-size: "10m"
-    nginx.ingress.kubernetes.io/use-forwarded-headers: "true"
-    nginx.ingress.kubernetes.io/rewrite-target: /
-spec:
-  rules:
-    - host: api.g2502.qq.com
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-api-service
-                port:
-                  number: 80
-          - path: /api/market
-            pathType: Prefix
-            backend:
-              service:
-                name: external-service
-                port:
-                  number: 80
-    - host: h5.g2502.qq.com
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-web-h5-service
-                port:
-                  number: 80
-          - path: /api
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-api-service
-                port:
-                  number: 80
-          - path: /api/market
-            pathType: Prefix
-            backend:
-              service:
-                name: external-service
-                port:
-                  number: 80
-    - host: admin.g2502.qq.com
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-web-admin-service
-                port:
-                  number: 80
-          - path: /admin
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-api2-service
-                port:
-                  number: 80
-          - path: /api
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-api2-service
-                port:
-                  number: 80
-          - path: /api/market
-            pathType: Prefix
-            backend:
-              service:
-                name: external-service
-                port:
-                  number: 80
-    - host: agent.g2502.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-api2-service
-                port:
-                  number: 80
-          - path: /admin
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-api2-service
-                port:
-                  number: 80
-          - path: /agent
-            pathType: Prefix
-            backend:
-              service:
-                name: stock2-java-api2-service
-                port:
-                  number: 80
-          - path: /api/market
-            pathType: Prefix
-            backend:
-              service:
-                name: external-service
-                port:
-                  number: 80

gp2502/kustomization.yaml

@@ -1,33 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: gp2502
-
-resources:
-  - api2.yaml
-  - api2-service.yaml
-  - market-endpoints.yaml
-  - market-service.yaml
-  - ../base/projects/stock2
-  - ../base/redis
-  - ../base/redis-nodeport
-  - ingress.yaml
-
-configMapGenerator:
-  - name: mysql-configmap
-    envs:
-      - env/mysql.env
-  - name: redis-configmap
-    envs:
-      - env/redis.env
-  - name: storage-configmap
-    envs:
-      - env/storage.env
-
-patches:
-  - path: patch/api-deployment_patch.yaml
-  - path: patch/market-deployment_patch.yaml
-  - path: patch/task-deployment_patch.yaml
-  - path: patch/agent-deployment_patch.yaml
-  - path: patch/h5-deployment_patch.yaml
-  - path: patch/admin-deployment_patch.yaml
-  - path: patch/redis-service-nodeport_patch.yaml

gp2502/market-endpoints.yaml

@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: Endpoints
-metadata:
-  name: external-service
-subsets:
-  - addresses:
-      - ip: 43.139.60.86  # 你的外部服务器 IP
-    ports:
-      - port: 8188  # 目标服务器端口

gp2502/market-service.yaml

@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: external-service
-spec:
-  ports:
-    - protocol: TCP
-      port: 80
-      targetPort: 8188

gp2502/patch/admin-deployment_patch.yaml

@@ -1,11 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: stock2-web-admin
-spec:
-  template:
-    spec:
-      containers:
-        - name: stock2-web-admin
-          image: juyou.tencentcloudcr.com/juyoutech/stock2_web_admin:main
-          imagePullPolicy: Always

gp2502/patch/agent-deployment_patch.yaml

@@ -1,13 +0,0 @@
-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
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 80

gp2502/patch/api-deployment_patch.yaml

@@ -1,28 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: stock2-java-api
-spec:
-  template:
-    spec:
-      containers:
-        - name: stock2-java-api
-          image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:main
-          imagePullPolicy: Always
-          envFrom:
-            - configMapRef:
-                name: mysql-configmap
-            - configMapRef:
-                name: redis-configmap
-            - configMapRef:
-                name: storage-configmap
-          env:
-            - name: TZ
-              value: "Asia/Shanghai"
-          # resources:
-          #   requests:
-          #     cpu: "0.5"
-          #     memory: "4Gi"
-          #   limits:
-          #     cpu: "1"
-          #     memory: "8Gi"

gp2502/patch/h5-deployment_patch.yaml

@@ -1,18 +0,0 @@
-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_h5blue2502:latest
-          imagePullPolicy: Always

gp2502/patch/market-deployment_patch.yaml

@@ -1,21 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: stock2-java-market
-spec:
-  template:
-    spec:
-      containers:
-        - name: stock2-java-market
-          image: juyou.tencentcloudcr.com/juyoutech/stock2_java_market:main
-          imagePullPolicy: Always
-          envFrom:
-            - configMapRef:
-                name: mysql-configmap
-            - configMapRef:
-                name: redis-configmap
-            - configMapRef:
-                name: storage-configmap
-          env:
-            - name: TZ
-              value: "Asia/Shanghai"

gp2502/patch/redis-service-nodeport_patch.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis-service-nodeport
-spec:
-  type: NodePort  # 或者 NodePort
-  ports:
-    - port: 6379
-      targetPort: 6379
-      nodePort: 32502  # 可选，如果不指定，Kubernetes 会自动分配
-  selector:
-    app: redis

gp2502/patch/task-deployment_patch.yaml

@@ -1,26 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: stock2-java-task
-spec:
-  template:
-    spec:
-      containers:
-        - name: stock2-java-task
-          image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:main
-          imagePullPolicy: Always
-          envFrom:
-            - configMapRef:
-                name: mysql-configmap
-            - configMapRef:
-                name: redis-configmap
-          env:
-            - name: TZ
-              value: "Asia/Shanghai"
-          resources:
-            requests:
-              cpu: "0.5"
-              memory: "4Gi"
-            limits:
-              cpu: "1"
-              memory: "8Gi"

gpdev/ingress.yaml

@@ -3,10 +3,9 @@ kind: Ingress
 metadata:
   name: gpdev-ingress
   annotations:
-    kubernetes.io/ingress.class: "nginx"
+    kubernetes.io/ingress.class: "nginx-ingress"
     nginx.ingress.kubernetes.io/proxy-body-size: "10m"
     nginx.ingress.kubernetes.io/use-forwarded-headers: "true"
-    nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
   rules:
     - host: updater.gpdev.qq.com

gpdev/patch/h5blue-deployment_patch.yaml

@@ -14,5 +14,5 @@ spec:
     spec:
       containers:
         - name: stock2-web-h5blue
-          image: juyou.tencentcloudcr.com/juyoutech/stock2_web_h5blue2502:latest
+          image: juyou.tencentcloudcr.com/juyoutech/stock2_web_h5blue2504:latest
           imagePullPolicy: Always