diff --git a/proxy/deploy-proxy-for-env.sh b/proxy/deploy-proxy-for-env.sh index a20c53b6d..3eeca05d0 100755 --- a/proxy/deploy-proxy-for-env.sh +++ b/proxy/deploy-proxy-for-env.sh @@ -33,6 +33,7 @@ do --project "${project}" --zone "${parts[1]}" sed s/GCP_PROJECT/${project}/g "./kubernetes/proxy-deployment-${environment}.yaml" | \ kubectl apply -f - + kubectl apply -f "./kubernetes/proxy-limit-range.yaml" --force kubectl apply -f "./kubernetes/proxy-service.yaml" --force # Alpha does not have canary if [[ ${environment} != "alpha" ]]; then diff --git a/proxy/kubernetes/proxy-limit-range.yaml b/proxy/kubernetes/proxy-limit-range.yaml new file mode 100644 index 000000000..9c01bf1cd --- /dev/null +++ b/proxy/kubernetes/proxy-limit-range.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: LimitRange +metadata: + name: resource-limits + namespace: default +spec: + limits: + - type: Container + default: + cpu: "300m" + memory: "512Mi" + defaultRequest: + cpu: "100m" + memory: "350Mi" diff --git a/proxy/kubernetes/proxy-service-canary.yaml b/proxy/kubernetes/proxy-service-canary.yaml index 240f7a98f..bd6489e20 100644 --- a/proxy/kubernetes/proxy-service-canary.yaml +++ b/proxy/kubernetes/proxy-service-canary.yaml @@ -33,3 +33,10 @@ spec: name: proxy-deployment-canary maxReplicas: 10 minReplicas: 1 + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: 100 diff --git a/proxy/kubernetes/proxy-service.yaml b/proxy/kubernetes/proxy-service.yaml index ccacf4d77..4d8b6307c 100644 --- a/proxy/kubernetes/proxy-service.yaml +++ b/proxy/kubernetes/proxy-service.yaml @@ -33,3 +33,11 @@ spec: name: proxy-deployment maxReplicas: 50 minReplicas: 10 + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: 100 +