diff options
| author | Vincent Ambo <tazjin@google.com> | 2019-12-20T16·07+0000 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2019-12-20T16·07+0000 |
| commit | 2512ea42567f74348fc5bfafb1ea1eb4ebe705dd (patch) | |
| tree | 6dd7146d2b373909e2708447e57d5c1ccf0f530c /infra/kubernetes | |
| parent | 9653bdcf694e2317754060056dec31577e8d55ae (diff) | |
feat(infra/k8s): Add cgit to Ingress load balancer r/221
Apart from the fact that TLS certificate provisioning is very wonky, it seems to be working now. AFAICT the L7 LBs still don't support path rewriting, which means that this is likely not the final configuration and it will move behind nginx instead.
Diffstat (limited to 'infra/kubernetes')
| -rw-r--r-- | infra/kubernetes/cgit/config.yaml | 3 | ||||
| -rw-r--r-- | infra/kubernetes/https-lb/ingress.yaml | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/infra/kubernetes/cgit/config.yaml b/infra/kubernetes/cgit/config.yaml index f59a237aaa23..577a56650ad6 100644 --- a/infra/kubernetes/cgit/config.yaml +++ b/infra/kubernetes/cgit/config.yaml @@ -70,4 +70,5 @@ spec: app: cgit ports: - protocol: TCP - port: 8080 + port: 2448 # cgit + targetPort: 8080 diff --git a/infra/kubernetes/https-lb/ingress.yaml b/infra/kubernetes/https-lb/ingress.yaml index f1d9fa4270b0..0a3092da2001 100644 --- a/infra/kubernetes/https-lb/ingress.yaml +++ b/infra/kubernetes/https-lb/ingress.yaml @@ -6,7 +6,7 @@ kind: Ingress metadata: name: https-ingress annotations: - networking.gke.io/managed-certificates: tazj-in, www-tazj-in, oslo-pub + 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. @@ -14,6 +14,14 @@ spec: serviceName: tazblog servicePort: 8000 rules: + # Route git.tazj.in to the cgit pods + - host: git.tazj.in + http: + paths: + - path: / + backend: + serviceName: cgit + servicePort: 2448 # Route oslo.pub to the nginx instance which serves redirects - host: oslo.pub http: |