From e3a5a5d3b028084366ba545f7d0bdf6182363e34 Mon Sep 17 00:00:00 2001 From: "William.Z" Date: Thu, 8 Jan 2026 20:31:33 +0800 Subject: [PATCH] 1 --- gpdev/env/storage.env | 8 ++-- gpdev/ingress-admin.yaml | 99 ++++++++++++++++++++++++++++++++++++++++ gpdev/ingress.yaml | 91 +----------------------------------- gpdev/kustomization.yaml | 1 + 4 files changed, 105 insertions(+), 94 deletions(-) create mode 100644 gpdev/ingress-admin.yaml diff --git a/gpdev/env/storage.env b/gpdev/env/storage.env index 079814f..333de55 100644 --- a/gpdev/env/storage.env +++ b/gpdev/env/storage.env @@ -1,6 +1,6 @@ -CLOUD_ID=IKIDPhniOp11pOh6IFwQgiV5RatMo48yi8OR -CLOUD_KEY=tdAUZP2Scw52oOn360iEVZR9fy62mJfr +CLOUD_ID=IKIDyzsXzXyEINFwQhml7TfiZGsJat32oNkB +CLOUD_KEY=MVTGrFMMAmpfHgrqeGhvviHftvpX1Kiy CLOUD_DOMAIN=cos.ap-guangzhou.myqcloud.com -CLOUD_APP_ID=1321231020 -CLOUD_BUCKET=agdev-1321231020 +CLOUD_APP_ID=1389479125 +CLOUD_BUCKET=agdev-1389479125 CLOUD_REGION=ap-guangzhou \ No newline at end of file diff --git a/gpdev/ingress-admin.yaml b/gpdev/ingress-admin.yaml new file mode 100644 index 0000000..73d0e9b --- /dev/null +++ b/gpdev/ingress-admin.yaml @@ -0,0 +1,99 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: admin-ingress + annotations: + kubernetes.io/ingress.class: "nginx-ingress" + nginx.ingress.kubernetes.io/proxy-body-size: "10m" + nginx.ingress.kubernetes.io/use-forwarded-headers: "true" +spec: + rules: + - host: admin.gpdev.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: /admin + pathType: Prefix + backend: + service: + name: stock2-java-api-service + port: + number: 80 + - path: /api/market + pathType: Prefix + backend: + service: + name: haproxy-service + port: + number: 8188 + - host: agent.gpdev.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: /api/market + pathType: Prefix + backend: + service: + name: haproxy-service + port: + number: 8188 + - host: market.gpdev.qq.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: stock2-java-market-service + port: + number: 80 + - host: haproxy-gpdev.qq.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: haproxy-service + port: + number: 8280 \ No newline at end of file diff --git a/gpdev/ingress.yaml b/gpdev/ingress.yaml index ec74d8d..78bdd05 100644 --- a/gpdev/ingress.yaml +++ b/gpdev/ingress.yaml @@ -154,93 +154,4 @@ spec: service: name: haproxy-service port: - number: 8188 - - host: admin.gpdev.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: /admin - pathType: Prefix - backend: - service: - name: stock2-java-api-service - port: - number: 80 - - path: /api/market - pathType: Prefix - backend: - service: - name: haproxy-service - port: - number: 8188 - - host: agent.gpdev.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: /api/market - pathType: Prefix - backend: - service: - name: haproxy-service - port: - number: 8188 - - host: market.gpdev.qq.com - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: stock2-java-market-service - port: - number: 80 - - host: haproxy-gpdev.qq.com - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: haproxy-service - port: - number: 8280 \ No newline at end of file + number: 8188 \ No newline at end of file diff --git a/gpdev/kustomization.yaml b/gpdev/kustomization.yaml index 50a1a0e..cebd873 100644 --- a/gpdev/kustomization.yaml +++ b/gpdev/kustomization.yaml @@ -17,6 +17,7 @@ resources: - ../base/updater - ../base/haproxy - ingress.yaml + - ingress-admin.yaml configMapGenerator: - name: mysql-configmap