mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 13:37:30 +00:00
Merge pull request #103713 from aojea/metrics-server-443
cluster: fix metrics-server deployment on CI jobs
This commit is contained in:
commit
8088b3e67d
@ -23,23 +23,23 @@ data:
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: metrics-server-v0.4.4
|
name: metrics-server-v0.5.0
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
labels:
|
labels:
|
||||||
k8s-app: metrics-server
|
k8s-app: metrics-server
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
version: v0.4.4
|
version: v0.5.0
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
k8s-app: metrics-server
|
k8s-app: metrics-server
|
||||||
version: v0.4.4
|
version: v0.5.0
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
name: metrics-server
|
name: metrics-server
|
||||||
labels:
|
labels:
|
||||||
k8s-app: metrics-server
|
k8s-app: metrics-server
|
||||||
version: v0.4.4
|
version: v0.5.0
|
||||||
spec:
|
spec:
|
||||||
securityContext:
|
securityContext:
|
||||||
seccompProfile:
|
seccompProfile:
|
||||||
@ -50,14 +50,12 @@ spec:
|
|||||||
kubernetes.io/os: linux
|
kubernetes.io/os: linux
|
||||||
containers:
|
containers:
|
||||||
- name: metrics-server
|
- name: metrics-server
|
||||||
image: k8s.gcr.io/metrics-server/metrics-server:v0.4.4
|
image: k8s.gcr.io/metrics-server/metrics-server:v0.5.0
|
||||||
command:
|
command:
|
||||||
- /metrics-server
|
- /metrics-server
|
||||||
- --metric-resolution=30s
|
- --metric-resolution=30s
|
||||||
# These are needed for GKE, which doesn't support secure communication yet.
|
- --kubelet-use-node-status-port
|
||||||
# Remove these lines for non-GKE clusters, and when GKE supports token-based auth.
|
- --kubelet-insecure-tls
|
||||||
- --kubelet-port=10255
|
|
||||||
- --deprecated-kubelet-completely-insecure=true
|
|
||||||
- --kubelet-preferred-address-types=InternalIP,Hostname,InternalDNS,ExternalDNS,ExternalIP
|
- --kubelet-preferred-address-types=InternalIP,Hostname,InternalDNS,ExternalDNS,ExternalIP
|
||||||
- --cert-dir=/tmp
|
- --cert-dir=/tmp
|
||||||
- --secure-port=443
|
- --secure-port=443
|
||||||
@ -65,6 +63,20 @@ spec:
|
|||||||
- containerPort: 443
|
- containerPort: 443
|
||||||
name: https
|
name: https
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
|
readinessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /readyz
|
||||||
|
port: https
|
||||||
|
scheme: HTTPS
|
||||||
|
periodSeconds: 10
|
||||||
|
failureThreshold: 3
|
||||||
|
livenessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /livez
|
||||||
|
port: https
|
||||||
|
scheme: HTTPS
|
||||||
|
periodSeconds: 10
|
||||||
|
failureThreshold: 3
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /tmp
|
- mountPath: /tmp
|
||||||
name: tmp-dir
|
name: tmp-dir
|
||||||
@ -97,7 +109,7 @@ spec:
|
|||||||
- --memory={{ base_metrics_server_memory }}
|
- --memory={{ base_metrics_server_memory }}
|
||||||
- --extra-memory={{ metrics_server_memory_per_node }}Mi
|
- --extra-memory={{ metrics_server_memory_per_node }}Mi
|
||||||
- --threshold=5
|
- --threshold=5
|
||||||
- --deployment=metrics-server-v0.4.4
|
- --deployment=metrics-server-v0.5.0
|
||||||
- --container=metrics-server
|
- --container=metrics-server
|
||||||
- --poll-period=30000
|
- --poll-period=30000
|
||||||
- --estimator=exponential
|
- --estimator=exponential
|
||||||
|
Loading…
Reference in New Issue
Block a user