summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@gmail.com>2015-11-24T13·07+0100
committerVincent Ambo <tazjin@gmail.com>2015-11-24T13·07+0100
commit94788f1f92b0d4d3733e044b015b72c0857d02cd (patch)
tree87d406edd04566b1cebbf50a0ecc44caf8d836c8
parent35dba3b2114248dabe23a3ad2a177b4de909994f (diff)
[varnish & k8s] Minor config updates
-rw-r--r--k8s/tazblog-rc.yaml9
-rw-r--r--varnish/Dockerfile4
2 files changed, 9 insertions, 4 deletions
diff --git a/k8s/tazblog-rc.yaml b/k8s/tazblog-rc.yaml
index 4a075a52fa66..019d1bee0613 100644
--- a/k8s/tazblog-rc.yaml
+++ b/k8s/tazblog-rc.yaml
@@ -1,17 +1,17 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: tazblog-5.1
+  name: tazblog-5.1.1
 spec:
   replicas: 2
   selector:
     app: tazblog
-    version: v5.1
+    version: v5.1.1
   template:
     metadata:
       labels:
         app: tazblog
-        version: v5.1
+        version: v5.1.1
     spec:
       containers:
         - image: tazjin/tazblog-haskell:master
@@ -36,6 +36,9 @@ spec:
             - name: tazblog-tls
               readOnly: true
               mountPath: /etc/hitch/ssl
+          resources:
+            requests:
+              memory: "1024Mi"
       volumes:
         - name: tazblog-tls
           secret:
diff --git a/varnish/Dockerfile b/varnish/Dockerfile
index 54a8afe27879..83733b527d31 100644
--- a/varnish/Dockerfile
+++ b/varnish/Dockerfile
@@ -11,4 +11,6 @@ ADD default.vcl /etc/varnish/default.vcl
 
 CMD ulimit -n 131072 && \
     /usr/sbin/varnishd -F -f /etc/varnish/default.vcl \
-                       -a :6081 -T :6082 -a :6083,PROXY -t 120
+                       -a :6081 -T :6082 -a :6083,PROXY -t 120 \
+                       -p thread_pool_min=5 -p thread_pool_max=500\
+                       -p thread_pool_timeout=300