diff options
| -rw-r--r-- | infra/kubernetes/cgit/config.yaml | 3 | ||||
| -rw-r--r-- | infra/kubernetes/https-lb/ingress.yaml | 19 | ||||
| -rw-r--r-- | infra/kubernetes/nginx/nginx.conf | 15 |
3 files changed, 27 insertions, 10 deletions
diff --git a/infra/kubernetes/cgit/config.yaml b/infra/kubernetes/cgit/config.yaml index 577a56650ad6..e48544d50742 100644 --- a/infra/kubernetes/cgit/config.yaml +++ b/infra/kubernetes/cgit/config.yaml @@ -65,10 +65,9 @@ kind: Service metadata: name: cgit spec: - type: NodePort selector: app: cgit ports: - protocol: TCP - port: 2448 # cgit + port: 80 targetPort: 8080 diff --git a/infra/kubernetes/https-lb/ingress.yaml b/infra/kubernetes/https-lb/ingress.yaml index 0a3092da2001..069771a4217f 100644 --- a/infra/kubernetes/https-lb/ingress.yaml +++ b/infra/kubernetes/https-lb/ingress.yaml @@ -8,20 +8,23 @@ metadata: annotations: networking.gke.io/managed-certificates: tazj-in, git-tazj-in, www-tazj-in, oslo-pub spec: - # Default traffic is routed to the blog, in case people go to - # peculiar hostnames. - backend: - serviceName: tazblog - servicePort: 8000 rules: + # Route blog to the blog ... + - host: tazj.in + http: + paths: + - path: /* + backend: + serviceName: tazblog + servicePort: 8000 # Route git.tazj.in to the cgit pods - host: git.tazj.in http: paths: - - path: / + - path: /* backend: - serviceName: cgit - servicePort: 2448 + serviceName: nginx + servicePort: 6756 # Route oslo.pub to the nginx instance which serves redirects - host: oslo.pub http: diff --git a/infra/kubernetes/nginx/nginx.conf b/infra/kubernetes/nginx/nginx.conf index ead5c4061720..918aa6067806 100644 --- a/infra/kubernetes/nginx/nginx.conf +++ b/infra/kubernetes/nginx/nginx.conf @@ -41,4 +41,19 @@ http { return 302 https://www.google.com/maps/d/viewer?mid=1pJIYY9cuEdt9DuMTbb4etBVq7hs; } } + + server { + listen 80; + server_name git.tazj.in; + + # Static assets must always hit the root. + location ~ ^/(favicon\.ico|cgit\.(css|png))$ { + proxy_pass http://cgit; + } + + # Everything else hits the depot directly. + location / { + proxy_pass http://cgit/cgit.cgi/depot/; + } + } } |