From 785a5a29976a9682bd1a8a30c2bfa50185a0b5cf Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Mon, 2 Sep 2019 18:19:35 +0100
Subject: feat(k8s): Add nginx instance for oslo.pub redirect

The redirect is currently all that this instance does. It is required
because HTTP load balancers in GCP don't support URL rewriting.
---
 infra/kubernetes/nginx/nginx.yaml | 55 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 infra/kubernetes/nginx/nginx.yaml

(limited to 'infra/kubernetes/nginx/nginx.yaml')

diff --git a/infra/kubernetes/nginx/nginx.yaml b/infra/kubernetes/nginx/nginx.yaml
new file mode 100644
index 000000000000..935aa6bc1a6b
--- /dev/null
+++ b/infra/kubernetes/nginx/nginx.yaml
@@ -0,0 +1,55 @@
+# Deploy an nginx instance which serves ... redirects.
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nginx-conf
+data:
+  nginx.conf: {{ insertFile "nginx.conf" | toJson }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx
+  labels:
+    app: nginx
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+        config: {{ insertFile "nginx.conf" | sha1sum }}
+    spec:
+      containers:
+        - name: tazblog
+          image: nixery.local/shell/nginx:{{ gitHEAD }}
+          command: ["/bin/bash", "-c"]
+          args:
+            - |
+              echo 'nogroup:x:30000:nobody' >> /etc/group
+              echo 'nobody:x:30000:30000:nobody:/tmp:/bin/bash' >> /etc/passwd
+              exec nginx -c /etc/nginx/nginx.conf
+          volumeMounts:
+            - name: nginx-conf
+              mountPath: /etc/nginx
+      volumes:
+        - name: nginx-conf
+          configMap:
+            name: nginx-conf
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: nginx
+spec:
+  type: NodePort
+  selector:
+    app: nginx
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
-- 
cgit 1.4.1


From e2feae3387e5d95715bdd27cd62753a18abf16bd Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Mon, 2 Sep 2019 18:42:18 +0100
Subject: fix(k8s): nginx does not need to be pinned to gitHEAD

---
 infra/kubernetes/nginx/nginx.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'infra/kubernetes/nginx/nginx.yaml')

diff --git a/infra/kubernetes/nginx/nginx.yaml b/infra/kubernetes/nginx/nginx.yaml
index 935aa6bc1a6b..c107ab68764a 100644
--- a/infra/kubernetes/nginx/nginx.yaml
+++ b/infra/kubernetes/nginx/nginx.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
         - name: tazblog
-          image: nixery.local/shell/nginx:{{ gitHEAD }}
+          image: nixery.local/shell/nginx
           command: ["/bin/bash", "-c"]
           args:
             - |
-- 
cgit 1.4.1