diff --git a/jetty/kubernetes/nomulus-backend.yaml b/jetty/kubernetes/nomulus-backend.yaml index 68b734de430..fc4f27d61f3 100644 --- a/jetty/kubernetes/nomulus-backend.yaml +++ b/jetty/kubernetes/nomulus-backend.yaml @@ -16,6 +16,7 @@ spec: serviceAccountName: nomulus nodeSelector: cloud.google.com/compute-class: "Performance" + cloud.google.com/machine-family: c4 containers: - name: backend image: gcr.io/GCP_PROJECT/nomulus diff --git a/jetty/kubernetes/nomulus-console.yaml b/jetty/kubernetes/nomulus-console.yaml index 34b13cb0612..db74d85003f 100644 --- a/jetty/kubernetes/nomulus-console.yaml +++ b/jetty/kubernetes/nomulus-console.yaml @@ -14,8 +14,6 @@ spec: service: console spec: serviceAccountName: nomulus - nodeSelector: - cloud.google.com/compute-class: "Performance" containers: - name: console image: gcr.io/GCP_PROJECT/nomulus @@ -24,8 +22,17 @@ spec: name: http resources: requests: + # explicit pod-slots 0 is required in order to downgrade node + # class from performance, which has implicit pod-slots 1 + cloud.google.com/pod-slots: 0 cpu: "100m" memory: "512Mi" + limits: + # explicit pod-slots 0 is required in order to downgrade node + # class from performance, which has implicit pod-slots 1 + cloud.google.com/pod-slots: 0 + cpu: "500m" + memory: "2Gi" args: [ENVIRONMENT] env: - name: POD_ID diff --git a/jetty/kubernetes/nomulus-frontend.yaml b/jetty/kubernetes/nomulus-frontend.yaml index c64dd8bb33c..5f0986e5ea5 100644 --- a/jetty/kubernetes/nomulus-frontend.yaml +++ b/jetty/kubernetes/nomulus-frontend.yaml @@ -16,6 +16,7 @@ spec: serviceAccountName: nomulus nodeSelector: cloud.google.com/compute-class: "Performance" + cloud.google.com/machine-family: c4 containers: - name: frontend image: gcr.io/GCP_PROJECT/nomulus diff --git a/jetty/kubernetes/nomulus-pubapi.yaml b/jetty/kubernetes/nomulus-pubapi.yaml index 8a204c2c769..421a84acc6e 100644 --- a/jetty/kubernetes/nomulus-pubapi.yaml +++ b/jetty/kubernetes/nomulus-pubapi.yaml @@ -14,8 +14,6 @@ spec: service: pubapi spec: serviceAccountName: nomulus - nodeSelector: - cloud.google.com/compute-class: "Performance" containers: - name: pubapi image: gcr.io/GCP_PROJECT/nomulus @@ -24,8 +22,17 @@ spec: name: http resources: requests: + # explicit pod-slots 0 is required in order to downgrade node + # class from performance, which has implicit pod-slots 1 + cloud.google.com/pod-slots: 0 cpu: "100m" memory: "512Mi" + limits: + # explicit pod-slots 0 is required in order to downgrade node + # class from performance, which has implicit pod-slots 1 + cloud.google.com/pod-slots: 0 + cpu: "500m" + memory: "2Gi" args: [ENVIRONMENT] env: - name: POD_ID