Skip to content
This repository has been archived by the owner on Sep 30, 2020. It is now read-only.

Update reserved storage flag name #1410

Merged
merged 1 commit into from
Jul 19, 2018
Merged

Update reserved storage flag name #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions core/controlplane/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,16 +1121,16 @@ func TestKubeletReserved(t *testing.T) {
{
conf: `
kubelet:
kubeReserved: "cpu=100m,memory=100Mi,storage=1Gi"
systemReserved: "cpu=200m,memory=200Mi,storage=2Gi"
kubeReserved: "cpu=100m,memory=100Mi,ephemeral-storage=1Gi"
systemReserved: "cpu=200m,memory=200Mi,ephemeral-storage=2Gi"
`,
kubeReserved: "cpu=100m,memory=100Mi,storage=1Gi",
systemReserved: "cpu=200m,memory=200Mi,storage=2Gi",
kubeReserved: "cpu=100m,memory=100Mi,ephemeral-storage=1Gi",
systemReserved: "cpu=200m,memory=200Mi,ephemeral-storage=2Gi",
},
{
conf: `
kubeReserved: "cpu=100m,memory=100Mi,storage=1Gi"
systemReserved: "cpu=200m,memory=200Mi,storage=2Gi"
kubeReserved: "cpu=100m,memory=100Mi,ephemeral-storage=1Gi"
systemReserved: "cpu=200m,memory=200Mi,ephemeral-storage=2Gi"
`,
kubeReserved: "",
systemReserved: "",
Expand Down
4 changes: 2 additions & 2 deletions core/root/config/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,9 +1507,9 @@ kubelet:
# How resources are reserved: https://kubernetes.io/docs/tasks/administer-cluster/reserve-compute-resources/
# How to size these limits: https://kubernetes.io/blog/2016/11/visualize-kubelet-performance-with-node-dashboard/
# kubeReserved is used to reserve capacity for kubernetes system daemons
#kubeReserved: "cpu=100m,memory=100Mi,storage=1Gi"
#kubeReserved: "cpu=100m,memory=100Mi,ephemeral-storage=1Gi"
# systemReserved is used to reserve capacity for OS system daemons
#systemReserved: "cpu=100m,memory=100Mi,storage=1Gi"
#systemReserved: "cpu=100m,memory=100Mi,ephemeral-storage=1Gi"

# AWS Tags for cloudformation stack resources
#stackTags:
Expand Down