mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 19:01:49 +00:00
Merge pull request #101477 from x13n/metrics-server
Bump metrics server to use 0.4.4 image.
This commit is contained in:
commit
eec38190a0
@ -23,24 +23,23 @@ data:
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: metrics-server-v0.3.7
|
||||
name: metrics-server-v0.4.4
|
||||
namespace: kube-system
|
||||
labels:
|
||||
k8s-app: metrics-server
|
||||
kubernetes.io/cluster-service: "true"
|
||||
addonmanager.kubernetes.io/mode: Reconcile
|
||||
version: v0.3.7
|
||||
version: v0.4.4
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
k8s-app: metrics-server
|
||||
version: v0.3.7
|
||||
version: v0.4.4
|
||||
template:
|
||||
metadata:
|
||||
name: metrics-server
|
||||
labels:
|
||||
k8s-app: metrics-server
|
||||
version: v0.3.7
|
||||
version: v0.4.4
|
||||
spec:
|
||||
securityContext:
|
||||
seccompProfile:
|
||||
@ -51,7 +50,7 @@ spec:
|
||||
kubernetes.io/os: linux
|
||||
containers:
|
||||
- name: metrics-server
|
||||
image: k8s.gcr.io/metrics-server/metrics-server:v0.3.7
|
||||
image: k8s.gcr.io/metrics-server/metrics-server:v0.4.4
|
||||
command:
|
||||
- /metrics-server
|
||||
- --metric-resolution=30s
|
||||
@ -60,10 +59,15 @@ spec:
|
||||
- --kubelet-port=10255
|
||||
- --deprecated-kubelet-completely-insecure=true
|
||||
- --kubelet-preferred-address-types=InternalIP,Hostname,InternalDNS,ExternalDNS,ExternalIP
|
||||
- --cert-dir=/tmp
|
||||
- --secure-port=443
|
||||
ports:
|
||||
- containerPort: 443
|
||||
name: https
|
||||
protocol: TCP
|
||||
volumeMounts:
|
||||
- mountPath: /tmp
|
||||
name: tmp-dir
|
||||
- name: metrics-server-nanny
|
||||
image: k8s.gcr.io/addon-resizer:1.8.11
|
||||
resources:
|
||||
@ -93,7 +97,7 @@ spec:
|
||||
- --memory={{ base_metrics_server_memory }}
|
||||
- --extra-memory={{ metrics_server_memory_per_node }}Mi
|
||||
- --threshold=5
|
||||
- --deployment=metrics-server-v0.3.7
|
||||
- --deployment=metrics-server-v0.4.4
|
||||
- --container=metrics-server
|
||||
- --poll-period=300000
|
||||
- --estimator=exponential
|
||||
@ -103,9 +107,11 @@ spec:
|
||||
# Use kube-apiserver metrics to avoid periodically listing nodes.
|
||||
- --use-metrics=true
|
||||
volumes:
|
||||
- name: metrics-server-config-volume
|
||||
configMap:
|
||||
name: metrics-server-config
|
||||
- name: metrics-server-config-volume
|
||||
configMap:
|
||||
name: metrics-server-config
|
||||
- emptyDir: {}
|
||||
name: tmp-dir
|
||||
tolerations:
|
||||
- key: "CriticalAddonsOnly"
|
||||
operator: "Exists"
|
||||
|
Loading…
Reference in New Issue
Block a user