mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #33227 from vishh/remove-dns-limits
Automatic merge from submit-queue Remove cpu limits for dns pod to avoid CPU starvation The current limits are not based on usage profiles Fixes #33222
This commit is contained in:
commit
e69c8f142c
@ -12,8 +12,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# 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.*
|
# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
|
||||||
|
|
||||||
# __MACHINE_GENERATED_WARNING__
|
# __MACHINE_GENERATED_WARNING__
|
||||||
@ -51,7 +49,6 @@ spec:
|
|||||||
# guaranteed class. Currently, this container falls into the
|
# guaranteed class. Currently, this container falls into the
|
||||||
# "burstable" category so the kubelet doesn't backoff from restarting it.
|
# "burstable" category so the kubelet doesn't backoff from restarting it.
|
||||||
limits:
|
limits:
|
||||||
cpu: 100m
|
|
||||||
memory: 170Mi
|
memory: 170Mi
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
@ -103,9 +100,7 @@ spec:
|
|||||||
- name: healthz
|
- name: healthz
|
||||||
image: gcr.io/google_containers/exechealthz-amd64:1.1
|
image: gcr.io/google_containers/exechealthz-amd64:1.1
|
||||||
resources:
|
resources:
|
||||||
# keep request = limit to keep this container in guaranteed class
|
|
||||||
limits:
|
limits:
|
||||||
cpu: 10m
|
|
||||||
memory: 50Mi
|
memory: 50Mi
|
||||||
requests:
|
requests:
|
||||||
cpu: 10m
|
cpu: 10m
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# 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.*
|
# 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
|
# 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
|
# guaranteed class. Currently, this container falls into the
|
||||||
# "burstable" category so the kubelet doesn't backoff from restarting it.
|
# "burstable" category so the kubelet doesn't backoff from restarting it.
|
||||||
limits:
|
limits:
|
||||||
cpu: 100m
|
|
||||||
memory: 170Mi
|
memory: 170Mi
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
@ -103,9 +100,7 @@ spec:
|
|||||||
- name: healthz
|
- name: healthz
|
||||||
image: gcr.io/google_containers/exechealthz-amd64:1.1
|
image: gcr.io/google_containers/exechealthz-amd64:1.1
|
||||||
resources:
|
resources:
|
||||||
# keep request = limit to keep this container in guaranteed class
|
|
||||||
limits:
|
limits:
|
||||||
cpu: 10m
|
|
||||||
memory: 50Mi
|
memory: 50Mi
|
||||||
requests:
|
requests:
|
||||||
cpu: 10m
|
cpu: 10m
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# 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.*
|
# 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
|
# 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
|
# guaranteed class. Currently, this container falls into the
|
||||||
# "burstable" category so the kubelet doesn't backoff from restarting it.
|
# "burstable" category so the kubelet doesn't backoff from restarting it.
|
||||||
limits:
|
limits:
|
||||||
cpu: 100m
|
|
||||||
memory: 170Mi
|
memory: 170Mi
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
@ -102,9 +99,7 @@ spec:
|
|||||||
- name: healthz
|
- name: healthz
|
||||||
image: gcr.io/google_containers/exechealthz-amd64:1.1
|
image: gcr.io/google_containers/exechealthz-amd64:1.1
|
||||||
resources:
|
resources:
|
||||||
# keep request = limit to keep this container in guaranteed class
|
|
||||||
limits:
|
limits:
|
||||||
cpu: 10m
|
|
||||||
memory: 50Mi
|
memory: 50Mi
|
||||||
requests:
|
requests:
|
||||||
cpu: 10m
|
cpu: 10m
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# 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.*
|
# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
|
||||||
|
|
||||||
# __MACHINE_GENERATED_WARNING__
|
# __MACHINE_GENERATED_WARNING__
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# 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.*
|
# 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
|
# Warning: This is a file generated from the base underscore template file: skydns-svc.yaml.base
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# 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.*
|
# 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
|
# Warning: This is a file generated from the base underscore template file: skydns-svc.yaml.base
|
||||||
|
Loading…
Reference in New Issue
Block a user