Skip to content

Commit

Permalink
Merge #56329
Browse files Browse the repository at this point in the history
56329: cloud: update resource requests/limits in StatefulSet configs r=taroface a=taroface

Our various StatefulSet configs had a placeholder `resources.requests` block with guidelines that became outdated with #51471. The guidelines are now updated.

Thanks to @tim-o for pointing this out.

Release note: none

Co-authored-by: taroface <[email protected]>
  • Loading branch information
craig[bot] and taroface committed Dec 2, 2020
2 parents 4c61427 + 1dd7c7e commit 965db4a
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 47 deletions.
11 changes: 11 additions & 0 deletions cloud/kubernetes/bring-your-own-certs/cockroachdb-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,17 @@ spec:
- name: cockroachdb
image: cockroachdb/cockroach:v20.2.2
imagePullPolicy: IfNotPresent
# TODO: Change these to appropriate values for the hardware that you're running. You can see
# the resources that can be allocated on each of your Kubernetes nodes by running:
# kubectl describe nodes
# Note that requests and limits should have identical values.
# resources:
# requests:
# cpu: "16"
# memory: "8Gi"
# limits:
# cpu: "16"
# memory: "8Gi"
ports:
- containerPort: 26257
name: grpc
Expand Down
12 changes: 4 additions & 8 deletions cloud/kubernetes/cockroachdb-statefulset-secure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -197,20 +197,16 @@ spec:
image: cockroachdb/cockroach:v20.2.2
imagePullPolicy: IfNotPresent
# TODO: Change these to appropriate values for the hardware that you're running. You can see
# the amount of allocatable resources on each of your Kubernetes nodes by running:
# the resources that can be allocated on each of your Kubernetes nodes by running:
# kubectl describe nodes
# Note that requests and limits should have identical values.
# resources:
# requests:
# cpu: "16"
# memory: "8Gi"
# limits:
# NOTE: Unless you have enabled the non-default Static CPU Management Policy
# and are using an integer number of CPUs, we don't recommend setting a CPU limit.
# See:
# https://kubernetes.io/docs/tasks/administer-cluster/cpu-management-policies/#static-policy
# https://github.com/kubernetes/kubernetes/issues/51135
# cpu: "16"
# memory: "8Gi"
# cpu: "16"
# memory: "8Gi"
ports:
- containerPort: 26257
name: grpc
Expand Down
12 changes: 4 additions & 8 deletions cloud/kubernetes/cockroachdb-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,20 +100,16 @@ spec:
image: cockroachdb/cockroach:v20.2.2
imagePullPolicy: IfNotPresent
# TODO: Change these to appropriate values for the hardware that you're running. You can see
# the amount of allocatable resources on each of your Kubernetes nodes by running:
# the resources that can be allocated on each of your Kubernetes nodes by running:
# kubectl describe nodes
# Note that requests and limits should have identical values.
# resources:
# requests:
# cpu: "16"
# memory: "8Gi"
# limits:
# NOTE: Unless you have enabled the non-default Static CPU Management Policy
# and are using an integer number of CPUs, we don't recommend setting a CPU limit.
# See:
# https://kubernetes.io/docs/tasks/administer-cluster/cpu-management-policies/#static-policy
# https://github.com/kubernetes/kubernetes/issues/51135
# cpu: "16"
# memory: "8Gi"
# cpu: "16"
# memory: "8Gi"
ports:
- containerPort: 26257
name: grpc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,17 @@ spec:
- name: cockroachdb
image: cockroachdb/cockroach:v20.2.2
imagePullPolicy: IfNotPresent
# TODO: Change these to appropriate values for the hardware that you're running. You can see the amount of allocatable resources on each of your Kubernetes nodes by running: kubectl describe nodes
# TODO: Change these to appropriate values for the hardware that you're running. You can see
# the resources that can be allocated on each of your Kubernetes nodes by running:
# kubectl describe nodes
# Note that requests and limits should have identical values.
# resources:
# requests:
# cpu: "16"
# memory: "8Gi"
# NOTE: Unless you have enabled the non-default Static CPU Management Policy and are using an integer number of CPUs, we don't recommend setting a CPU limit. See:
# https://kubernetes.io/docs/tasks/administer-cluster/cpu-management-policies/#static-policy
# https://github.com/kubernetes/kubernetes/issues/51135
# limits:
# cpu: "16"
# memory: "8Gi"
# memory: "8Gi"
ports:
- containerPort: 26257
name: grpc
Expand Down
22 changes: 9 additions & 13 deletions cloud/kubernetes/performance/cockroachdb-statefulset-insecure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,16 @@ spec:
image: cockroachdb/cockroach:v20.2.2
imagePullPolicy: IfNotPresent
# TODO: Change these to appropriate values for the hardware that you're running. You can see
# the amount of allocatable resources on each of your Kubernetes nodes by running:
# the resources that can be allocated on each of your Kubernetes nodes by running:
# kubectl describe nodes
resources:
requests:
cpu: "16"
memory: "8Gi"
limits:
# NOTE: Unless you have enabled the non-default Static CPU Management Policy
# and are using an integer number of CPUs, we don't recommend setting a CPU limit.
# See:
# https://kubernetes.io/docs/tasks/administer-cluster/cpu-management-policies/#static-policy
# https://github.com/kubernetes/kubernetes/issues/51135
#cpu: "16"
memory: "8Gi"
# Note that requests and limits should have identical values.
# resources:
# requests:
# cpu: "16"
# memory: "8Gi"
# limits:
# cpu: "16"
# memory: "8Gi"
ports:
- containerPort: 26257
name: grpc
Expand Down
22 changes: 9 additions & 13 deletions cloud/kubernetes/performance/cockroachdb-statefulset-secure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -234,20 +234,16 @@ spec:
image: cockroachdb/cockroach:v20.2.2
imagePullPolicy: IfNotPresent
# TODO: Change these to appropriate values for the hardware that you're running. You can see
# the amount of allocatable resources on each of your Kubernetes nodes by running:
# the resources that can be allocated on each of your Kubernetes nodes by running:
# kubectl describe nodes
resources:
requests:
cpu: "16"
memory: "8Gi"
limits:
# NOTE: Unless you have enabled the non-default Static CPU Management Policy
# and are using an integer number of CPUs, we don't recommend setting a CPU limit.
# See:
# https://kubernetes.io/docs/tasks/administer-cluster/cpu-management-policies/#static-policy
# https://github.com/kubernetes/kubernetes/issues/51135
#cpu: "16"
memory: "8Gi"
# Note that requests and limits should have identical values.
# resources:
# requests:
# cpu: "16"
# memory: "8Gi"
# limits:
# cpu: "16"
# memory: "8Gi"
ports:
- containerPort: 26257
name: grpc
Expand Down

0 comments on commit 965db4a

Please sign in to comment.