Fix cockroachdb not abiding by resources reqs (#5629)

The containers in the stateful set were ignoring the resource requests
when specified in `values.yaml`. Comment out the resources requests
in `values.yaml`, so we only set requests if the user specifically
enables them.

I verified this is working by running `kubectl describe pod POD | grep
cpu` on one of the created pods on the fix branch. It returned `cpu:
"100m"`. On the master branch, the same command returned nothing.
This commit is contained in:
Matt McNaughton
2018-05-18 06:24:51 -07:00
committed by k8s-ci-robot
parent 73406be9dc
commit b2c9f8514d
3 changed files with 8 additions and 6 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
name: cockroachdb
home: https://www.cockroachlabs.com
version: 1.1.0
version: 1.1.1
appVersion: 2.0.0
description: CockroachDB is a scalable, survivable, strongly-consistent SQL database.
icon: https://raw.githubusercontent.com/cockroachdb/cockroach/master/docs/media/cockroach_db.png
@@ -249,7 +249,7 @@ spec:
periodSeconds: 5
failureThreshold: 2
resources:
{{ toYaml .Values.resources | indent 10 }}
{{ toYaml .Values.Resources | indent 10 }}
env:
- name: STATEFULSET_NAME
value: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 56 }}"
+6 -4
View File
@@ -12,10 +12,12 @@ MaxUnavailable: 1
Component: "cockroachdb"
GrpcPort: 26257
HttpPort: 8080
Resources:
requests:
cpu: "100m"
memory: "512Mi"
# Uncomment the following resources definitions or pass them from command line
# to control the cpu and memory resources allocated by the Kubernetes cluster
Resources: {}
# requests:
# cpu: "100m"
# memory: "512Mi"
Storage: "1Gi"
## Persistent Volume Storage Class for database data
## If defined, storageClassName: <StorageClass>