From 5fdfc8a4250a22783b39f77919864ad3af0c1f01 Mon Sep 17 00:00:00 2001 From: raydds Date: Tue, 14 Jan 2020 12:14:33 -0500 Subject: [PATCH 1/5] Create a horizontal pod autoscaler --- deploy/azure/autoscaling.yml | 40 +++++++++++++++++++++++++++++++++ deploy/azure/kustomization.yaml | 1 + 2 files changed, 41 insertions(+) create mode 100644 deploy/azure/autoscaling.yml diff --git a/deploy/azure/autoscaling.yml b/deploy/azure/autoscaling.yml new file mode 100644 index 00000000..714e7df3 --- /dev/null +++ b/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: 2 + maxReplicas: 10 + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: atst + metrics: + - type: Resource + resource: + name: cpu + targetAverageUtilization: 60 diff --git a/deploy/azure/kustomization.yaml b/deploy/azure/kustomization.yaml index 9dee809c..d0162394 100644 --- a/deploy/azure/kustomization.yaml +++ b/deploy/azure/kustomization.yaml @@ -12,3 +12,4 @@ resources: - acme-challenges.yml - aadpodidentity.yml - nginx-snippets.yml + - autoscaling.yml From 5813cc1370472aa6a142ae69b9c53de23ff35a75 Mon Sep 17 00:00:00 2001 From: raydds Date: Tue, 14 Jan 2020 12:17:06 -0500 Subject: [PATCH 2/5] Do not explicitly set replica count --- deploy/azure/azure.yml | 2 -- deploy/overlays/cloudzero-dev/kustomization.yaml | 1 - deploy/overlays/cloudzero-dev/replica_count.yml | 14 -------------- deploy/overlays/staging/kustomization.yaml | 1 - deploy/overlays/staging/replica_count.yml | 14 -------------- 5 files changed, 32 deletions(-) delete mode 100644 deploy/overlays/cloudzero-dev/replica_count.yml delete mode 100644 deploy/overlays/staging/replica_count.yml diff --git a/deploy/azure/azure.yml b/deploy/azure/azure.yml index aa13b67e..54523ece 100644 --- a/deploy/azure/azure.yml +++ b/deploy/azure/azure.yml @@ -15,7 +15,6 @@ spec: selector: matchLabels: role: web - replicas: 4 strategy: type: RollingUpdate template: @@ -169,7 +168,6 @@ spec: selector: matchLabels: role: worker - replicas: 2 strategy: type: RollingUpdate template: diff --git a/deploy/overlays/cloudzero-dev/kustomization.yaml b/deploy/overlays/cloudzero-dev/kustomization.yaml index ee6f3a0c..24705531 100644 --- a/deploy/overlays/cloudzero-dev/kustomization.yaml +++ b/deploy/overlays/cloudzero-dev/kustomization.yaml @@ -5,7 +5,6 @@ resources: - namespace.yml - reset-cron-job.yml patchesStrategicMerge: - - replica_count.yml - ports.yml - envvars.yml - flex_vol.yml diff --git a/deploy/overlays/cloudzero-dev/replica_count.yml b/deploy/overlays/cloudzero-dev/replica_count.yml deleted file mode 100644 index 272286f7..00000000 --- a/deploy/overlays/cloudzero-dev/replica_count.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: atst -spec: - replicas: 2 ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: atst-worker -spec: - replicas: 1 diff --git a/deploy/overlays/staging/kustomization.yaml b/deploy/overlays/staging/kustomization.yaml index ee6f3a0c..24705531 100644 --- a/deploy/overlays/staging/kustomization.yaml +++ b/deploy/overlays/staging/kustomization.yaml @@ -5,7 +5,6 @@ resources: - namespace.yml - reset-cron-job.yml patchesStrategicMerge: - - replica_count.yml - ports.yml - envvars.yml - flex_vol.yml diff --git a/deploy/overlays/staging/replica_count.yml b/deploy/overlays/staging/replica_count.yml deleted file mode 100644 index 272286f7..00000000 --- a/deploy/overlays/staging/replica_count.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: atst -spec: - replicas: 2 ---- -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: atst-worker -spec: - replicas: 1 From f14b30b346d1bc7058313b89ac8f6c3557ded03d Mon Sep 17 00:00:00 2001 From: raydds Date: Tue, 14 Jan 2020 12:17:26 -0500 Subject: [PATCH 3/5] Min workers is 1 --- deploy/azure/autoscaling.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/azure/autoscaling.yml b/deploy/azure/autoscaling.yml index 714e7df3..270a46fe 100644 --- a/deploy/azure/autoscaling.yml +++ b/deploy/azure/autoscaling.yml @@ -27,7 +27,7 @@ metadata: name: atst-worker namespace: atat spec: - minReplicas: 2 + minReplicas: 1 maxReplicas: 10 scaleTargetRef: apiVersion: apps/v1 From d07d4f09fd0c5ce422a96702b6bee1e6b83184c8 Mon Sep 17 00:00:00 2001 From: raydds Date: Wed, 15 Jan 2020 11:16:30 -0500 Subject: [PATCH 4/5] This HPA should point at the worker --- deploy/azure/autoscaling.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/azure/autoscaling.yml b/deploy/azure/autoscaling.yml index 270a46fe..e208d943 100644 --- a/deploy/azure/autoscaling.yml +++ b/deploy/azure/autoscaling.yml @@ -32,7 +32,7 @@ spec: scaleTargetRef: apiVersion: apps/v1 kind: Deployment - name: atst + name: atst-worker metrics: - type: Resource resource: From eb7625a26e706c69c2c424a3674a1e3a4fb3b0a2 Mon Sep 17 00:00:00 2001 From: raydds Date: Wed, 15 Jan 2020 11:26:07 -0500 Subject: [PATCH 5/5] Bump CPU for atst worker --- deploy/azure/azure.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/azure/azure.yml b/deploy/azure/azure.yml index 54523ece..1300ed34 100644 --- a/deploy/azure/azure.yml +++ b/deploy/azure/azure.yml @@ -205,10 +205,10 @@ spec: resources: requests: memory: 280Mi - cpu: 20m + cpu: 400m limits: memory: 280Mi - cpu: 20m + cpu: 400m volumes: - name: pgsslrootcert configMap: