bug 1711075: set resource requests on containers

Prevent pods from eviction, OOMKilling, and CPU starvation when running in the BestEffort QoS by setting resource requests. openshift/origin#22787 Limits used: Memory: service-ca-operator 80Mi apiservice-cabundle-injector 50Mi configmap-cabundle-injector 50Mi service-serving-cert-signer 120Mi CPU: all 10m
openshift · May 16, 2019 · 6bcc7a3 · 6bcc7a3
1 parent d00230e
commit 6bcc7a3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 0 deletions.
diff --git a/bindata/v4.0.0/apiservice-cabundle-controller/deployment.yaml b/bindata/v4.0.0/apiservice-cabundle-controller/deployment.yaml
@@ -30,6 +30,10 @@ spec:
         - "--config=/var/run/configmaps/config/controller-config.yaml"
         ports:
         - containerPort: 8443
+        resources:
+          requests:
+            memory: 50Mi
+            cpu: 10m
         volumeMounts:
         - mountPath: /var/run/configmaps/config
           name: config

diff --git a/bindata/v4.0.0/configmap-cabundle-controller/deployment.yaml b/bindata/v4.0.0/configmap-cabundle-controller/deployment.yaml
@@ -30,6 +30,10 @@ spec:
         - "--config=/var/run/configmaps/config/controller-config.yaml"
         ports:
         - containerPort: 8443
+        resources:
+          requests:
+            memory: 50Mi
+            cpu: 10m
         volumeMounts:
         - mountPath: /var/run/configmaps/config
           name: config

diff --git a/bindata/v4.0.0/service-serving-cert-signer-controller/deployment.yaml b/bindata/v4.0.0/service-serving-cert-signer-controller/deployment.yaml
@@ -30,6 +30,10 @@ spec:
         - "--config=/var/run/configmaps/config/controller-config.yaml"
         ports:
         - containerPort: 8443
+        resources:
+          requests:
+            memory: 120Mi
+            cpu: 10m
         volumeMounts:
         - mountPath: /var/run/configmaps/config
           name: config

diff --git a/manifests/05_deploy.yaml b/manifests/05_deploy.yaml
@@ -25,6 +25,10 @@ spec:
         args:
         - "--config=/var/run/configmaps/config/operator-config.yaml"
         - "-v=4"
+        resources:
+          requests:
+            memory: 80Mi
+            cpu: 10m
         env:
         - name: CONTROLLER_IMAGE
           value: quay.io/openshift/origin-service-ca-operator:v4.0

diff --git a/pkg/operator/v4_00_assets/bindata.go b/pkg/operator/v4_00_assets/bindata.go