From bdbc7501293eac721ea6f77b55918652f2cd6aab Mon Sep 17 00:00:00 2001 From: ialidzhikov Date: Wed, 2 Mar 2022 18:52:46 +0200 Subject: [PATCH] apiserver: Remove the deprecated `--target-ram-mb` flag Signed-off-by: ialidzhikov --- cluster/gce/gci/configure-kubeapiserver.sh | 4 ---- .../apiserver/pkg/server/options/server_run_options.go | 5 ----- test/kubemark/resources/start-kubemark-master.sh | 1 - 3 files changed, 10 deletions(-) diff --git a/cluster/gce/gci/configure-kubeapiserver.sh b/cluster/gce/gci/configure-kubeapiserver.sh index de1d223a664..fb216efe609 100644 --- a/cluster/gce/gci/configure-kubeapiserver.sh +++ b/cluster/gce/gci/configure-kubeapiserver.sh @@ -132,10 +132,6 @@ function start-kube-apiserver { params=$(append-param-if-not-present "${params}" "max-requests-inflight" 1500) params=$(append-param-if-not-present "${params}" "max-mutating-requests-inflight" 500) fi - # Set amount of memory available for apiserver based on number of nodes. - # TODO: Once we start setting proper requests and limits for apiserver - # we should reuse the same logic here instead of current heuristic. - params=$(append-param-if-not-present "${params}" "target-ram-mb" $((NUM_NODES * 60))) fi if [[ -n "${SERVICE_CLUSTER_IP_RANGE:-}" ]]; then params+=" --service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}" diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go b/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go index ef841504041..c100d062019 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go @@ -202,11 +202,6 @@ func (s *ServerRunOptions) AddUniversalFlags(fs *pflag.FlagSet) { "List of directives for HSTS, comma separated. If this list is empty, then HSTS directives will not "+ "be added. Example: 'max-age=31536000,includeSubDomains,preload'") - deprecatedTargetRAMMB := 0 - fs.IntVar(&deprecatedTargetRAMMB, "target-ram-mb", deprecatedTargetRAMMB, - "DEPRECATED: Memory limit for apiserver in MB (used to configure sizes of caches, etc.)") - fs.MarkDeprecated("target-ram-mb", "This flag will be removed in v1.23") - fs.StringVar(&s.ExternalHost, "external-hostname", s.ExternalHost, "The hostname to use when generating externalized URLs for this master (e.g. Swagger API Docs or OpenID Discovery).") diff --git a/test/kubemark/resources/start-kubemark-master.sh b/test/kubemark/resources/start-kubemark-master.sh index 7ba475e01a5..b7fc1d1b120 100755 --- a/test/kubemark/resources/start-kubemark-master.sh +++ b/test/kubemark/resources/start-kubemark-master.sh @@ -546,7 +546,6 @@ function compute-kube-apiserver-params { params+=" --client-ca-file=/etc/srv/kubernetes/ca.crt" params+=" --token-auth-file=/etc/srv/kubernetes/known_tokens.csv" params+=" --secure-port=443" - params+=" --target-ram-mb=$((NUM_NODES * 60))" params+=" --service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}" params+=" --admission-control=${CUSTOM_ADMISSION_PLUGINS}" params+=" --authorization-mode=Node,RBAC"