about summary refs log tree commit diff
path: root/infra
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-09-02T19·16+0100
committerVincent Ambo <tazjin@google.com>2019-09-02T19·16+0100
commitd577629b5b2c767a6031f90fe1303f8811a8b870 (patch)
tree767af1c0ef7df12359a96215018d6e81517a11ea /infra
parentf2e0f3ee27ae59e45b92351d0956432920722b7e (diff)
fix(k8s): Add nginx route for load-balancer health checks r/75
Diffstat (limited to 'infra')
-rw-r--r--infra/kubernetes/https-lb/ingress.yaml5
-rw-r--r--infra/kubernetes/nginx/nginx.conf7
-rw-r--r--infra/kubernetes/nginx/nginx.yaml2
3 files changed, 11 insertions, 3 deletions
diff --git a/infra/kubernetes/https-lb/ingress.yaml b/infra/kubernetes/https-lb/ingress.yaml
index 03fa2cec0738..f1d9fa4270b0 100644
--- a/infra/kubernetes/https-lb/ingress.yaml
+++ b/infra/kubernetes/https-lb/ingress.yaml
@@ -18,6 +18,7 @@ spec:
     - host: oslo.pub
       http:
         paths:
-          - backend:
+          - path: /
+            backend:
               serviceName: nginx
-              servicePort: 80
+              servicePort: 6756
diff --git a/infra/kubernetes/nginx/nginx.conf b/infra/kubernetes/nginx/nginx.conf
index cdc228b494b0..5a008a0b953f 100644
--- a/infra/kubernetes/nginx/nginx.conf
+++ b/infra/kubernetes/nginx/nginx.conf
@@ -26,6 +26,13 @@ http {
     keepalive_timeout  65;
 
     server {
+        listen 80 default_server;
+        location / {
+            return 200 "ok";
+        }
+    }
+
+    server {
         listen       80;
         server_name  oslo.pub;
 
diff --git a/infra/kubernetes/nginx/nginx.yaml b/infra/kubernetes/nginx/nginx.yaml
index c107ab68764a..366beb458cc4 100644
--- a/infra/kubernetes/nginx/nginx.yaml
+++ b/infra/kubernetes/nginx/nginx.yaml
@@ -51,5 +51,5 @@ spec:
     app: nginx
   ports:
     - protocol: TCP
-      port: 80
+      port: 6756
       targetPort: 80