github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108457 from ialidzhikov/cleanup/target-ram-mb

Browse Source 
apiserver: Remove the deprecated `--target-ram-mb` flag
This commit is contained in:
Kubernetes Prow Robot 2022-03-07 02:38:53 -08:00 committed by GitHub
commit ad46b4f921
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/gci/configure-kubeapiserver.sh
View File

@ -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-requests-inflight" 1500)
params=$(append-param-if-not-present "${params}" "max-mutating-requests-inflight" 500) params=$(append-param-if-not-present "${params}" "max-mutating-requests-inflight" 500)
fi 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 fi
if [[ -n "${SERVICE_CLUSTER_IP_RANGE:-}" ]]; then if [[ -n "${SERVICE_CLUSTER_IP_RANGE:-}" ]]; then
params+=" --service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}" params+=" --service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}"

5
staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go
View File

@ -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 "+ "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'") "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, 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).") "The hostname to use when generating externalized URLs for this master (e.g. Swagger API Docs or OpenID Discovery).")

1
test/kubemark/resources/start-kubemark-master.sh
View File

@ -546,7 +546,6 @@ function compute-kube-apiserver-params {
params+=" --client-ca-file=/etc/srv/kubernetes/ca.crt" params+=" --client-ca-file=/etc/srv/kubernetes/ca.crt"
params+=" --token-auth-file=/etc/srv/kubernetes/known_tokens.csv" params+=" --token-auth-file=/etc/srv/kubernetes/known_tokens.csv"
params+=" --secure-port=443" params+=" --secure-port=443"
params+=" --target-ram-mb=$((NUM_NODES * 60))"
params+=" --service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}" params+=" --service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}"
params+=" --admission-control=${CUSTOM_ADMISSION_PLUGINS}" params+=" --admission-control=${CUSTOM_ADMISSION_PLUGINS}"
params+=" --authorization-mode=Node,RBAC" params+=" --authorization-mode=Node,RBAC"