From 4dfc684b3428e8594e9a286bae501f183bac737e Mon Sep 17 00:00:00 2001 From: Jingyuan Liang Date: Fri, 26 May 2023 01:01:33 +0000 Subject: [PATCH] Set kube-proxy memory request to 50Mi With optional override using KUBE_PROXY_MEMORY_REQUEST following the KUBE_PROXY_CPU_REQUEST pattern. --- cluster/addons/kube-proxy/kube-proxy-ds.yaml | 1 + cluster/gce/gci/configure-helper.sh | 1 + cluster/gce/manifests/kube-proxy.manifest | 1 + 3 files changed, 3 insertions(+) diff --git a/cluster/addons/kube-proxy/kube-proxy-ds.yaml b/cluster/addons/kube-proxy/kube-proxy-ds.yaml index 838a3786e40..75ea9043c48 100644 --- a/cluster/addons/kube-proxy/kube-proxy-ds.yaml +++ b/cluster/addons/kube-proxy/kube-proxy-ds.yaml @@ -38,6 +38,7 @@ spec: resources: requests: cpu: {{ cpurequest }} + memory: {{ memoryrequest }} command: - /bin/sh - -c diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 3b172a98138..39e60000ebd 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -1783,6 +1783,7 @@ function prepare-kube-proxy-manifest-variables { sed -i -e "s@{{kube_cache_mutation_detector_env_name}}@${kube_cache_mutation_detector_env_name}@g" "${src_file}" sed -i -e "s@{{kube_cache_mutation_detector_env_value}}@${kube_cache_mutation_detector_env_value}@g" "${src_file}" sed -i -e "s@{{ cpurequest }}@${KUBE_PROXY_CPU_REQUEST:-100m}@g" "${src_file}" + sed -i -e "s@{{ memoryrequest }}@${KUBE_PROXY_MEMORY_REQUEST:-50Mi}@g" "${src_file}" sed -i -e "s@{{api_servers_with_port}}@${api_servers}@g" "${src_file}" sed -i -e "s@{{kubernetes_service_host_env_value}}@${KUBERNETES_MASTER_NAME}@g" "${src_file}" if [[ -n "${CLUSTER_IP_RANGE:-}" ]]; then diff --git a/cluster/gce/manifests/kube-proxy.manifest b/cluster/gce/manifests/kube-proxy.manifest index 914da463de5..1171a2b77bb 100644 --- a/cluster/gce/manifests/kube-proxy.manifest +++ b/cluster/gce/manifests/kube-proxy.manifest @@ -23,6 +23,7 @@ spec: resources: requests: cpu: {{ cpurequest }} + memory: {{ memoryrequest }} command: - /bin/sh - -c