From a0e3b043799e540dbd3e8598d5bce3c776a0f6b4 Mon Sep 17 00:00:00 2001 From: owen Date: Mon, 21 Apr 2025 13:59:54 +0800 Subject: [PATCH 1/4] 1 --- .../mysql-service-nodeport.yaml | 2 +- .../redis-service-nodeport.yaml | 2 +- gp2501/api2-service.yaml | 11 -- gp2501/api2.yaml | 38 ------ gp2501/env/mysql.env | 6 - gp2501/env/redis.env | 3 - gp2501/env/storage.env | 6 - gp2501/ingress.yaml | 120 ----------------- gp2501/kustomization.yaml | 29 ----- gp2501/patch/admin-deployment_patch.yaml | 11 -- gp2501/patch/agent-deployment_patch.yaml | 13 -- gp2501/patch/api-deployment_patch.yaml | 28 ---- gp2501/patch/h5-deployment_patch.yaml | 18 --- gp2501/patch/market-deployment_patch.yaml | 21 --- gp2501/patch/task-deployment_patch.yaml | 26 ---- gp2502/api2-service.yaml | 11 -- gp2502/api2.yaml | 38 ------ gp2502/env/mysql.env | 6 - gp2502/env/redis.env | 3 - gp2502/env/storage.env | 6 - gp2502/ingress.yaml | 121 ------------------ gp2502/kustomization.yaml | 33 ----- gp2502/market-endpoints.yaml | 9 -- gp2502/market-service.yaml | 9 -- gp2502/patch/admin-deployment_patch.yaml | 11 -- gp2502/patch/agent-deployment_patch.yaml | 13 -- gp2502/patch/api-deployment_patch.yaml | 28 ---- gp2502/patch/h5-deployment_patch.yaml | 18 --- gp2502/patch/market-deployment_patch.yaml | 21 --- .../patch/redis-service-nodeport_patch.yaml | 12 -- gp2502/patch/task-deployment_patch.yaml | 26 ---- gpdev/ingress.yaml | 2 +- 32 files changed, 3 insertions(+), 698 deletions(-) delete mode 100644 gp2501/api2-service.yaml delete mode 100644 gp2501/api2.yaml delete mode 100644 gp2501/env/mysql.env delete mode 100644 gp2501/env/redis.env delete mode 100644 gp2501/env/storage.env delete mode 100644 gp2501/ingress.yaml delete mode 100644 gp2501/kustomization.yaml delete mode 100644 gp2501/patch/admin-deployment_patch.yaml delete mode 100644 gp2501/patch/agent-deployment_patch.yaml delete mode 100644 gp2501/patch/api-deployment_patch.yaml delete mode 100644 gp2501/patch/h5-deployment_patch.yaml delete mode 100644 gp2501/patch/market-deployment_patch.yaml delete mode 100644 gp2501/patch/task-deployment_patch.yaml delete mode 100644 gp2502/api2-service.yaml delete mode 100644 gp2502/api2.yaml delete mode 100644 gp2502/env/mysql.env delete mode 100644 gp2502/env/redis.env delete mode 100644 gp2502/env/storage.env delete mode 100644 gp2502/ingress.yaml delete mode 100644 gp2502/kustomization.yaml delete mode 100644 gp2502/market-endpoints.yaml delete mode 100644 gp2502/market-service.yaml delete mode 100644 gp2502/patch/admin-deployment_patch.yaml delete mode 100644 gp2502/patch/agent-deployment_patch.yaml delete mode 100644 gp2502/patch/api-deployment_patch.yaml delete mode 100644 gp2502/patch/h5-deployment_patch.yaml delete mode 100644 gp2502/patch/market-deployment_patch.yaml delete mode 100644 gp2502/patch/redis-service-nodeport_patch.yaml delete mode 100644 gp2502/patch/task-deployment_patch.yaml diff --git a/base/mysql-nodeport/mysql-service-nodeport.yaml b/base/mysql-nodeport/mysql-service-nodeport.yaml index c9ec215..e9f34b9 100644 --- a/base/mysql-nodeport/mysql-service-nodeport.yaml +++ b/base/mysql-nodeport/mysql-service-nodeport.yaml @@ -9,4 +9,4 @@ spec: ports: - port: 3306 targetPort: 3306 - nodePort: 30000 # 可选，如果不指定，Kubernetes 会自动分配 \ No newline at end of file + nodePort: 31000 # 可选，如果不指定，Kubernetes 会自动分配 \ No newline at end of file diff --git a/base/redis-nodeport/redis-service-nodeport.yaml b/base/redis-nodeport/redis-service-nodeport.yaml index a1b4462..9d0c830 100644 --- a/base/redis-nodeport/redis-service-nodeport.yaml +++ b/base/redis-nodeport/redis-service-nodeport.yaml @@ -7,6 +7,6 @@ spec: ports: - port: 6379 targetPort: 6379 - nodePort: 30001 # 可选，如果不指定，Kubernetes 会自动分配 + nodePort: 31001 # 可选，如果不指定，Kubernetes 会自动分配 selector: app: redis \ No newline at end of file diff --git a/gp2501/api2-service.yaml b/gp2501/api2-service.yaml deleted file mode 100644 index 3761246..0000000 --- a/gp2501/api2-service.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2501/api2.yaml b/gp2501/api2.yaml deleted file mode 100644 index 69e06cf..0000000 --- a/gp2501/api2.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2501/env/mysql.env b/gp2501/env/mysql.env deleted file mode 100644 index d095c89..0000000 --- a/gp2501/env/mysql.env +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2501/env/redis.env b/gp2501/env/redis.env deleted file mode 100644 index 876cffc..0000000 --- a/gp2501/env/redis.env +++ /dev/null @@ -1,3 +0,0 @@ -REDIS_HOST=redis-service -REDIS_PORT=6379 -REDIS_PASSWORD=a5v8b86P4mVzFlUqJV \ No newline at end of file diff --git a/gp2501/env/storage.env b/gp2501/env/storage.env deleted file mode 100644 index 704244f..0000000 --- a/gp2501/env/storage.env +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2501/ingress.yaml b/gp2501/ingress.yaml deleted file mode 100644 index 0f1ba99..0000000 --- a/gp2501/ingress.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2501/kustomization.yaml b/gp2501/kustomization.yaml deleted file mode 100644 index 292cbe0..0000000 --- a/gp2501/kustomization.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2501/patch/admin-deployment_patch.yaml b/gp2501/patch/admin-deployment_patch.yaml deleted file mode 100644 index 4c9089e..0000000 --- a/gp2501/patch/admin-deployment_patch.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2501/patch/agent-deployment_patch.yaml b/gp2501/patch/agent-deployment_patch.yaml deleted file mode 100644 index 6b174f5..0000000 --- a/gp2501/patch/agent-deployment_patch.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2501/patch/api-deployment_patch.yaml b/gp2501/patch/api-deployment_patch.yaml deleted file mode 100644 index 1ee3a78..0000000 --- a/gp2501/patch/api-deployment_patch.yaml +++ /dev/null @@ -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" \ No newline at end of file diff --git a/gp2501/patch/h5-deployment_patch.yaml b/gp2501/patch/h5-deployment_patch.yaml deleted file mode 100644 index 5ffd0ce..0000000 --- a/gp2501/patch/h5-deployment_patch.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2501/patch/market-deployment_patch.yaml b/gp2501/patch/market-deployment_patch.yaml deleted file mode 100644 index 1db6cfa..0000000 --- a/gp2501/patch/market-deployment_patch.yaml +++ /dev/null @@ -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" \ No newline at end of file diff --git a/gp2501/patch/task-deployment_patch.yaml b/gp2501/patch/task-deployment_patch.yaml deleted file mode 100644 index 4347b09..0000000 --- a/gp2501/patch/task-deployment_patch.yaml +++ /dev/null @@ -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" \ No newline at end of file diff --git a/gp2502/api2-service.yaml b/gp2502/api2-service.yaml deleted file mode 100644 index 3761246..0000000 --- a/gp2502/api2-service.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2502/api2.yaml b/gp2502/api2.yaml deleted file mode 100644 index 69e06cf..0000000 --- a/gp2502/api2.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2502/env/mysql.env b/gp2502/env/mysql.env deleted file mode 100644 index 0976268..0000000 --- a/gp2502/env/mysql.env +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2502/env/redis.env b/gp2502/env/redis.env deleted file mode 100644 index 876cffc..0000000 --- a/gp2502/env/redis.env +++ /dev/null @@ -1,3 +0,0 @@ -REDIS_HOST=redis-service -REDIS_PORT=6379 -REDIS_PASSWORD=a5v8b86P4mVzFlUqJV \ No newline at end of file diff --git a/gp2502/env/storage.env b/gp2502/env/storage.env deleted file mode 100644 index 06be6fb..0000000 --- a/gp2502/env/storage.env +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2502/ingress.yaml b/gp2502/ingress.yaml deleted file mode 100644 index 3c1647f..0000000 --- a/gp2502/ingress.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2502/kustomization.yaml b/gp2502/kustomization.yaml deleted file mode 100644 index 34a44c7..0000000 --- a/gp2502/kustomization.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2502/market-endpoints.yaml b/gp2502/market-endpoints.yaml deleted file mode 100644 index f0c3cc2..0000000 --- a/gp2502/market-endpoints.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Endpoints -metadata: - name: external-service -subsets: - - addresses: - - ip: 43.139.60.86 # 你的外部服务器 IP - ports: - - port: 8188 # 目标服务器端口 \ No newline at end of file diff --git a/gp2502/market-service.yaml b/gp2502/market-service.yaml deleted file mode 100644 index 347211e..0000000 --- a/gp2502/market-service.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: external-service -spec: - ports: - - protocol: TCP - port: 80 - targetPort: 8188 \ No newline at end of file diff --git a/gp2502/patch/admin-deployment_patch.yaml b/gp2502/patch/admin-deployment_patch.yaml deleted file mode 100644 index 4c9089e..0000000 --- a/gp2502/patch/admin-deployment_patch.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2502/patch/agent-deployment_patch.yaml b/gp2502/patch/agent-deployment_patch.yaml deleted file mode 100644 index 65b4c66..0000000 --- a/gp2502/patch/agent-deployment_patch.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2502/patch/api-deployment_patch.yaml b/gp2502/patch/api-deployment_patch.yaml deleted file mode 100644 index 1ee3a78..0000000 --- a/gp2502/patch/api-deployment_patch.yaml +++ /dev/null @@ -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" \ No newline at end of file diff --git a/gp2502/patch/h5-deployment_patch.yaml b/gp2502/patch/h5-deployment_patch.yaml deleted file mode 100644 index f3c5238..0000000 --- a/gp2502/patch/h5-deployment_patch.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2502/patch/market-deployment_patch.yaml b/gp2502/patch/market-deployment_patch.yaml deleted file mode 100644 index 1db6cfa..0000000 --- a/gp2502/patch/market-deployment_patch.yaml +++ /dev/null @@ -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" \ No newline at end of file diff --git a/gp2502/patch/redis-service-nodeport_patch.yaml b/gp2502/patch/redis-service-nodeport_patch.yaml deleted file mode 100644 index 7ea27cf..0000000 --- a/gp2502/patch/redis-service-nodeport_patch.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gp2502/patch/task-deployment_patch.yaml b/gp2502/patch/task-deployment_patch.yaml deleted file mode 100644 index 4347b09..0000000 --- a/gp2502/patch/task-deployment_patch.yaml +++ /dev/null @@ -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" \ No newline at end of file diff --git a/gpdev/ingress.yaml b/gpdev/ingress.yaml index f8f77f8..c51f3f5 100644 --- a/gpdev/ingress.yaml +++ b/gpdev/ingress.yaml @@ -3,7 +3,7 @@ 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: / From 68e28b380037cb605b346458cb8a4a7d4ea71157 Mon Sep 17 00:00:00 2001 From: owen Date: Mon, 21 Apr 2025 14:06:54 +0800 Subject: [PATCH 2/4] 1 --- base/mysql-nodeport/mysql-service-nodeport.yaml | 2 +- base/redis-nodeport/redis-service-nodeport.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/mysql-nodeport/mysql-service-nodeport.yaml b/base/mysql-nodeport/mysql-service-nodeport.yaml index e9f34b9..fdd7015 100644 --- a/base/mysql-nodeport/mysql-service-nodeport.yaml +++ b/base/mysql-nodeport/mysql-service-nodeport.yaml @@ -9,4 +9,4 @@ spec: ports: - port: 3306 targetPort: 3306 - nodePort: 31000 # 可选，如果不指定，Kubernetes 会自动分配 \ No newline at end of file + nodePort: 32000 # 可选，如果不指定，Kubernetes 会自动分配 \ No newline at end of file diff --git a/base/redis-nodeport/redis-service-nodeport.yaml b/base/redis-nodeport/redis-service-nodeport.yaml index 9d0c830..67d7fe4 100644 --- a/base/redis-nodeport/redis-service-nodeport.yaml +++ b/base/redis-nodeport/redis-service-nodeport.yaml @@ -7,6 +7,6 @@ spec: ports: - port: 6379 targetPort: 6379 - nodePort: 31001 # 可选，如果不指定，Kubernetes 会自动分配 + nodePort: 32001 # 可选，如果不指定，Kubernetes 会自动分配 selector: app: redis \ No newline at end of file From ca210e19b2a2406c7a63cd36995b5baadaef3319 Mon Sep 17 00:00:00 2001 From: owen Date: Mon, 21 Apr 2025 14:57:14 +0800 Subject: [PATCH 3/4] 1 --- gpdev/ingress.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gpdev/ingress.yaml b/gpdev/ingress.yaml index c51f3f5..2a7c555 100644 --- a/gpdev/ingress.yaml +++ b/gpdev/ingress.yaml @@ -6,7 +6,6 @@ metadata: 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 From 6cc44efbdbac1a78ee161d93348824076c39cb0c Mon Sep 17 00:00:00 2001 From: owen Date: Tue, 22 Apr 2025 18:53:23 +0800 Subject: [PATCH 4/4] 1 --- gpdev/patch/h5blue-deployment_patch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpdev/patch/h5blue-deployment_patch.yaml b/gpdev/patch/h5blue-deployment_patch.yaml index 7dd3372..0a0a528 100644 --- a/gpdev/patch/h5blue-deployment_patch.yaml +++ b/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 \ No newline at end of file