about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-02-09T01·27+0000
committerVincent Ambo <tazjin@google.com>2020-02-09T01·27+0000
commiteb6e64ad475e91df9f16c6a52ee9d36f0e4a2d4a (patch)
treefc50745c0aa12e9257c94fecc106e49c539ff6d6
parent05ab6825b3451687fbaf6f8c987e94e616b6d4ff (diff)
chore(ops/infra/k8s): Delete tazblog deployment r/500
-rw-r--r--ops/infra/kubernetes/https-lb/ingress.yaml4
-rw-r--r--ops/infra/kubernetes/primary-cluster.yaml2
-rw-r--r--ops/infra/kubernetes/tazblog/config.yaml34
3 files changed, 3 insertions, 37 deletions
diff --git a/ops/infra/kubernetes/https-lb/ingress.yaml b/ops/infra/kubernetes/https-lb/ingress.yaml
index 069771a4217f..b50ea21ceefb 100644
--- a/ops/infra/kubernetes/https-lb/ingress.yaml
+++ b/ops/infra/kubernetes/https-lb/ingress.yaml
@@ -15,8 +15,8 @@ spec:
         paths:
           - path: /*
             backend:
-              serviceName: tazblog
-              servicePort: 8000
+              serviceName: website
+              servicePort: 8080
     # Route git.tazj.in to the cgit pods
     - host: git.tazj.in
       http:
diff --git a/ops/infra/kubernetes/primary-cluster.yaml b/ops/infra/kubernetes/primary-cluster.yaml
index 1d5d33e0bb26..3d601b80cd01 100644
--- a/ops/infra/kubernetes/primary-cluster.yaml
+++ b/ops/infra/kubernetes/primary-cluster.yaml
@@ -30,7 +30,7 @@ include:
       account: nixery@tazjins-infrastructure.iam.gserviceaccount.com
       repo: ssh://tazjin@gmail.com@source.developers.google.com:2022/p/tazjins-infrastructure/r/depot
       popularity: 'popularity-nixos-unstable-3140fa89c51233397f496f49014f6b23216667c2.json'
-  - name: tazblog
+  - name: website
   - name: cgit
   - name: https-lb
   - name: nginx
diff --git a/ops/infra/kubernetes/tazblog/config.yaml b/ops/infra/kubernetes/tazblog/config.yaml
deleted file mode 100644
index dc63ce8e4b38..000000000000
--- a/ops/infra/kubernetes/tazblog/config.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: tazblog
-  labels:
-    app: tazblog
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: tazblog
-  template:
-    metadata:
-      labels:
-        app: tazblog
-    spec:
-      containers:
-      - name: tazblog
-        image: nixery.local/shell/web.tazblog:{{ gitHEAD }}
-        command: [ "tazblog" ]
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: tazblog
-spec:
-  type: NodePort
-  selector:
-    app: tazblog
-  ports:
-    - protocol: TCP
-      port: 8000
-      targetPort: 8000