From 6ab70d656ea50f9cbbbda815bb8aa85a49d6a22e Mon Sep 17 00:00:00 2001 From: "William.Z" Date: Thu, 8 Jan 2026 04:03:11 +0800 Subject: [PATCH] 1 --- gp2523/ingress-admin.yaml | 91 ++++++++++++++++++++++++++------------- gp2524/ingress-admin.yaml | 91 ++++++++++++++++++++++++++------------- 2 files changed, 120 insertions(+), 62 deletions(-) diff --git a/gp2523/ingress-admin.yaml b/gp2523/ingress-admin.yaml index 999d706..5045c69 100644 --- a/gp2523/ingress-admin.yaml +++ b/gp2523/ingress-admin.yaml @@ -1,60 +1,50 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: gp-ingress + name: admin-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/auth-tls-secret: "gp2523/ca-secret" -# nginx.ingress.kubernetes.io/auth-tls-verify-client: "on" -# nginx.ingress.kubernetes.io/auth-tls-verify-depth: "2" -# nginx.ingress.kubernetes.io/auth-tls-pass-certificate-to-upstream: "true" -# nginx.ingress.kubernetes.io/ssl-redirect: "true" -# nginx.ingress.kubernetes.io/force-ssl-redirect: "true" -# nginx.ingress.kubernetes.io/auth-type: "basic" -# nginx.ingress.kubernetes.io/auth-secret: "basic-auth" -# nginx.ingress.kubernetes.io/auth-realm: "Authentication Required" + # nginx.ingress.kubernetes.io/auth-tls-secret: "gp2523/ca-secret" + # nginx.ingress.kubernetes.io/auth-tls-verify-client: "on" + # nginx.ingress.kubernetes.io/auth-tls-verify-depth: "2" + # nginx.ingress.kubernetes.io/auth-tls-pass-certificate-to-upstream: "true" + # nginx.ingress.kubernetes.io/ssl-redirect: "true" + # nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + nginx.ingress.kubernetes.io/auth-type: "basic" + nginx.ingress.kubernetes.io/auth-secret: "basic-auth" + nginx.ingress.kubernetes.io/auth-realm: "Authentication Required" spec: tls: - hosts: - - api-g2523.qq.com - - h5-g2523.qq.com - - down-g2523.qq.com + - haproxy-g2523.qq.com + - admin-g2523.qq.com + - agent-g2523.qq.com secretName: tls-secret rules: - - host: api-g2523.qq.com + - host: admin-g2523.qq.com http: paths: - path: / pathType: Prefix backend: service: - name: stock2-java-api-service + name: stock2-web-admin-service port: number: 80 - - path: /api/market + - path: /admin pathType: Prefix backend: service: - name: haproxy-service - port: - number: 8188 - - host: h5-g2523.qq.com - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: stock2-web-h5-service + name: stock2-java-api2-service port: number: 80 - path: /api pathType: Prefix backend: service: - name: stock2-java-api-service + name: stock2-java-api2-service port: number: 80 - path: /api/market @@ -64,13 +54,52 @@ spec: name: haproxy-service port: number: 8188 - - host: down-g2523.qq.com + - host: agent-g2523.qq.com http: paths: - path: / pathType: Prefix backend: service: - name: download-cos-proxy-service + name: stock2-web-agent-service port: - number: 80 \ No newline at end of file + 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: haproxy-service + port: + number: 8188 + + - host: haproxy-g2523.qq.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: haproxy-service + port: + number: 8280 \ No newline at end of file diff --git a/gp2524/ingress-admin.yaml b/gp2524/ingress-admin.yaml index ce1c602..18170e1 100644 --- a/gp2524/ingress-admin.yaml +++ b/gp2524/ingress-admin.yaml @@ -1,60 +1,50 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: gp-ingress + name: admin-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/auth-tls-secret: "gp2524/ca-secret" -# nginx.ingress.kubernetes.io/auth-tls-verify-client: "on" -# nginx.ingress.kubernetes.io/auth-tls-verify-depth: "2" -# nginx.ingress.kubernetes.io/auth-tls-pass-certificate-to-upstream: "true" -# nginx.ingress.kubernetes.io/ssl-redirect: "true" -# nginx.ingress.kubernetes.io/force-ssl-redirect: "true" -# nginx.ingress.kubernetes.io/auth-type: "basic" -# nginx.ingress.kubernetes.io/auth-secret: "basic-auth" -# nginx.ingress.kubernetes.io/auth-realm: "Authentication Required" + # nginx.ingress.kubernetes.io/auth-tls-secret: "gp2524/ca-secret" + # nginx.ingress.kubernetes.io/auth-tls-verify-client: "on" + # nginx.ingress.kubernetes.io/auth-tls-verify-depth: "2" + # nginx.ingress.kubernetes.io/auth-tls-pass-certificate-to-upstream: "true" + # nginx.ingress.kubernetes.io/ssl-redirect: "true" + # nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + nginx.ingress.kubernetes.io/auth-type: "basic" + nginx.ingress.kubernetes.io/auth-secret: "basic-auth" + nginx.ingress.kubernetes.io/auth-realm: "Authentication Required" spec: tls: - hosts: - - api-g2524.qq.com - - h5-g2524.qq.com - - down-g2524.qq.com + - haproxy-g2524.qq.com + - admin-g2524.qq.com + - agent-g2524.qq.com secretName: tls-secret rules: - - host: api-g2524.qq.com + - host: admin-g2524.qq.com http: paths: - path: / pathType: Prefix backend: service: - name: stock2-java-api-service + name: stock2-web-admin-service port: number: 80 - - path: /api/market + - path: /admin pathType: Prefix backend: service: - name: haproxy-service - port: - number: 8188 - - host: h5-g2524.qq.com - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: stock2-web-h5-service + name: stock2-java-api2-service port: number: 80 - path: /api pathType: Prefix backend: service: - name: stock2-java-api-service + name: stock2-java-api2-service port: number: 80 - path: /api/market @@ -64,13 +54,52 @@ spec: name: haproxy-service port: number: 8188 - - host: down-g2524.qq.com + - host: agent-g2524.qq.com http: paths: - path: / pathType: Prefix backend: service: - name: download-cos-proxy-service + name: stock2-web-agent-service port: - number: 80 \ No newline at end of file + 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: haproxy-service + port: + number: 8188 + + - host: haproxy-g2524.qq.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: haproxy-service + port: + number: 8280 \ No newline at end of file