From 7631b09bafe252fedfd16c5c868b359ae44dcb09 Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Wed, 21 Sep 2016 15:26:29 -0700 Subject: [PATCH] remove cpu limits for dns pod. The current limits are not based on usage profiles Signed-off-by: Vishnu kannan --- cluster/addons/dns/skydns-rc.yaml.base | 5 ----- cluster/addons/dns/skydns-rc.yaml.in | 5 ----- cluster/addons/dns/skydns-rc.yaml.sed | 5 ----- cluster/addons/dns/skydns-svc.yaml.base | 2 -- cluster/addons/dns/skydns-svc.yaml.in | 2 -- cluster/addons/dns/skydns-svc.yaml.sed | 2 -- 6 files changed, 21 deletions(-) diff --git a/cluster/addons/dns/skydns-rc.yaml.base b/cluster/addons/dns/skydns-rc.yaml.base index 59c6a0b8cd0..cb60f0b2e6c 100644 --- a/cluster/addons/dns/skydns-rc.yaml.base +++ b/cluster/addons/dns/skydns-rc.yaml.base @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml - # TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.* # __MACHINE_GENERATED_WARNING__ @@ -51,7 +49,6 @@ spec: # guaranteed class. Currently, this container falls into the # "burstable" category so the kubelet doesn't backoff from restarting it. limits: - cpu: 100m memory: 170Mi requests: cpu: 100m @@ -103,9 +100,7 @@ spec: - name: healthz image: gcr.io/google_containers/exechealthz-amd64:1.1 resources: - # keep request = limit to keep this container in guaranteed class limits: - cpu: 10m memory: 50Mi requests: cpu: 10m diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in index f59ef418be2..a047ebab003 100644 --- a/cluster/addons/dns/skydns-rc.yaml.in +++ b/cluster/addons/dns/skydns-rc.yaml.in @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml - # TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.* # Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base @@ -51,7 +49,6 @@ spec: # guaranteed class. Currently, this container falls into the # "burstable" category so the kubelet doesn't backoff from restarting it. limits: - cpu: 100m memory: 170Mi requests: cpu: 100m @@ -103,9 +100,7 @@ spec: - name: healthz image: gcr.io/google_containers/exechealthz-amd64:1.1 resources: - # keep request = limit to keep this container in guaranteed class limits: - cpu: 10m memory: 50Mi requests: cpu: 10m diff --git a/cluster/addons/dns/skydns-rc.yaml.sed b/cluster/addons/dns/skydns-rc.yaml.sed index 80de0b4dc3c..eb95574a3ea 100644 --- a/cluster/addons/dns/skydns-rc.yaml.sed +++ b/cluster/addons/dns/skydns-rc.yaml.sed @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml - # TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.* # Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base @@ -51,7 +49,6 @@ spec: # guaranteed class. Currently, this container falls into the # "burstable" category so the kubelet doesn't backoff from restarting it. limits: - cpu: 100m memory: 170Mi requests: cpu: 100m @@ -102,9 +99,7 @@ spec: - name: healthz image: gcr.io/google_containers/exechealthz-amd64:1.1 resources: - # keep request = limit to keep this container in guaranteed class limits: - cpu: 10m memory: 50Mi requests: cpu: 10m diff --git a/cluster/addons/dns/skydns-svc.yaml.base b/cluster/addons/dns/skydns-svc.yaml.base index 5c9f06f726c..086cdcfdef5 100644 --- a/cluster/addons/dns/skydns-svc.yaml.base +++ b/cluster/addons/dns/skydns-svc.yaml.base @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml - # TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.* # __MACHINE_GENERATED_WARNING__ diff --git a/cluster/addons/dns/skydns-svc.yaml.in b/cluster/addons/dns/skydns-svc.yaml.in index 12a0f89a320..9853f90cee4 100644 --- a/cluster/addons/dns/skydns-svc.yaml.in +++ b/cluster/addons/dns/skydns-svc.yaml.in @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml - # TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.* # Warning: This is a file generated from the base underscore template file: skydns-svc.yaml.base diff --git a/cluster/addons/dns/skydns-svc.yaml.sed b/cluster/addons/dns/skydns-svc.yaml.sed index 1e5d14d20a7..447366b864d 100644 --- a/cluster/addons/dns/skydns-svc.yaml.sed +++ b/cluster/addons/dns/skydns-svc.yaml.sed @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml - # TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.* # Warning: This is a file generated from the base underscore template file: skydns-svc.yaml.base