Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
8bd0a306
Commit
8bd0a306
authored
Jul 13, 2018
by
Van Tu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Templatize the scaling policy for metrics-server
Also update the metrics-server-nanny to use addon resizer 1.8.3 to leverage the minSizeCluster command line flag. This is a no-op change.
parent
4797c8df
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
4 deletions
+21
-4
metrics-server-deployment.yaml
cluster/addons/metrics-server/metrics-server-deployment.yaml
+5
-4
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+16
-0
No files found.
cluster/addons/metrics-server/metrics-server-deployment.yaml
View file @
8bd0a306
...
@@ -58,7 +58,7 @@ spec:
...
@@ -58,7 +58,7 @@ spec:
name
:
https
name
:
https
protocol
:
TCP
protocol
:
TCP
-
name
:
metrics-server-nanny
-
name
:
metrics-server-nanny
image
:
k8s.gcr.io/addon-resizer:1.8.
2
image
:
k8s.gcr.io/addon-resizer:1.8.
3
resources
:
resources
:
limits
:
limits
:
cpu
:
100m
cpu
:
100m
...
@@ -81,15 +81,16 @@ spec:
...
@@ -81,15 +81,16 @@ spec:
command
:
command
:
-
/pod_nanny
-
/pod_nanny
-
--config-dir=/etc/config
-
--config-dir=/etc/config
-
--cpu=
40m
-
--cpu=
{{ base_metrics_server_cpu }}
-
--extra-cpu=0.5m
-
--extra-cpu=0.5m
-
--memory=
40Mi
-
--memory=
{{ base_metrics_server_memory }}
-
--extra-memory=
4
Mi
-
--extra-memory=
{{ metrics_server_memory_per_node }}
Mi
-
--threshold=5
-
--threshold=5
-
--deployment=metrics-server-v0.2.1
-
--deployment=metrics-server-v0.2.1
-
--container=metrics-server
-
--container=metrics-server
-
--poll-period=300000
-
--poll-period=300000
-
--estimator=exponential
-
--estimator=exponential
-
--minClusterSize={{ metrics_server_min_cluster_size }}
volumes
:
volumes
:
-
name
:
metrics-server-config-volume
-
name
:
metrics-server-config-volume
configMap
:
configMap
:
...
...
cluster/gce/gci/configure-helper.sh
View file @
8bd0a306
...
@@ -2399,6 +2399,22 @@ EOF
...
@@ -2399,6 +2399,22 @@ EOF
fi
fi
if
[[
"
${
ENABLE_METRICS_SERVER
:-}
"
==
"true"
]]
;
then
if
[[
"
${
ENABLE_METRICS_SERVER
:-}
"
==
"true"
]]
;
then
setup-addon-manifests
"addons"
"metrics-server"
setup-addon-manifests
"addons"
"metrics-server"
base_metrics_server_cpu
=
"40m"
base_metrics_server_memory
=
"40Mi"
metrics_server_memory_per_node
=
"4"
metrics_server_min_cluster_size
=
"16"
if
[[
"
${
ENABLE_SYSTEM_ADDON_RESOURCE_OPTIMIZATIONS
:-}
"
==
"true"
]]
;
then
# TODO: Set each of the following variables to optimized values.
base_metrics_server_cpu
=
"40m"
base_metrics_server_memory
=
"40Mi"
metrics_server_memory_per_node
=
"4"
metrics_server_min_cluster_size
=
"16"
fi
local
-r
metrics_server_yaml
=
"
${
dst_dir
}
/metrics-server/metrics-server-deployment.yaml"
sed
-i
-e
"s@{{ base_metrics_server_cpu }}@
${
base_metrics_server_cpu
}
@g"
"
${
metrics_server_yaml
}
"
sed
-i
-e
"s@{{ base_metrics_server_memory }}@
${
base_metrics_server_memory
}
@g"
"
${
metrics_server_yaml
}
"
sed
-i
-e
"s@{{ metrics_server_memory_per_node }}@
${
metrics_server_memory_per_node
}
@g"
"
${
metrics_server_yaml
}
"
sed
-i
-e
"s@{{ metrics_server_min_cluster_size }}@
${
metrics_server_min_cluster_size
}
@g"
"
${
metrics_server_yaml
}
"
fi
fi
if
[[
"
${
ENABLE_NVIDIA_GPU_DEVICE_PLUGIN
:-}
"
==
"true"
]]
;
then
if
[[
"
${
ENABLE_NVIDIA_GPU_DEVICE_PLUGIN
:-}
"
==
"true"
]]
;
then
setup-addon-manifests
"addons"
"device-plugins/nvidia-gpu"
setup-addon-manifests
"addons"
"device-plugins/nvidia-gpu"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment