Merge branch 'staging' into 170505212-uwsgi-logs

deploy/azure/autoscaling.yml

@@ -0,0 +1,40 @@
+---
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  labels:
+    app: atst
+  name: atst
+  namespace: atat
+spec:
+  minReplicas: 2
+  maxReplicas: 10
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: atst
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: 60
+---
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  labels:
+    app: atst
+  name: atst-worker
+  namespace: atat
+spec:
+  minReplicas: 1
+  maxReplicas: 10
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: atst-worker
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: 60

deploy/azure/azure.yml

@@ -15,7 +15,6 @@ spec:
   selector:
     matchLabels:
       role: web
-  replicas: 4
   strategy:
     type: RollingUpdate
   template:
@@ -49,6 +48,13 @@ spec:
               subPath: uwsgi.ini
             - name: flask-secret
               mountPath: "/config"
+          resources:
+            requests:
+              memory: 200Mi
+              cpu: 400m
+            limits:
+              memory: 200Mi
+              cpu: 400m
         - name: nginx
           image: nginx:alpine
           ports:
@@ -77,6 +83,13 @@ spec:
               mountPath: "/etc/nginx/snippets/"
             - name: nginx-secret
               mountPath: "/etc/ssl/"
+          resources:
+            requests:
+              memory: 20Mi
+              cpu: 10m
+            limits:
+              memory: 20Mi
+              cpu: 10m
       volumes:
         - name: nginx-client-ca-bundle
           configMap:
@@ -155,7 +168,6 @@ spec:
   selector:
     matchLabels:
       role: worker
-  replicas: 2
   strategy:
     type: RollingUpdate
   template:
@@ -190,6 +202,13 @@ spec:
               subPath: pgsslrootcert.crt
             - name: flask-secret
               mountPath: "/config"
+          resources:
+            requests:
+              memory: 280Mi
+              cpu: 400m
+            limits:
+              memory: 280Mi
+              cpu: 400m
       volumes:
         - name: pgsslrootcert
           configMap:
@@ -255,6 +274,13 @@ spec:
               subPath: pgsslrootcert.crt
             - name: flask-secret
               mountPath: "/config"
+          resources:
+            requests:
+              memory: 80Mi
+              cpu: 10m
+            limits:
+              memory: 80Mi
+              cpu: 10m
       volumes:
         - name: pgsslrootcert
           configMap:

deploy/azure/kustomization.yaml

@@ -12,3 +12,4 @@ resources:
   - acme-challenges.yml
   - aadpodidentity.yml
   - nginx-snippets.yml
+  - autoscaling.yml