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

Merge pull request #57456 from kawych/master

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Bump Metrics Server to version v0.2.1

**What this PR does / why we need it**:
Bumps Metrics Server to version v0.2.1, which exposes standard apiserver metrics via /metric endpoint.

**Release note**:
```release-note
Expose Metrics Server metrics via /metric endpoint.
```
This commit is contained in:
Kubernetes Submit Queue 2018-01-12 13:11:44 -08:00 committed by GitHub
commit e99ea24569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/addons/metrics-server/metrics-server-deployment.yaml
View File

@ -23,31 +23,31 @@ data:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: metrics-server-v0.2.0 name: metrics-server-v0.2.1
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: metrics-server k8s-app: metrics-server
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v0.2.0 version: v0.2.1
spec: spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: metrics-server k8s-app: metrics-server
version: v0.2.0 version: v0.2.1
template: template:
metadata: metadata:
name: metrics-server name: metrics-server
labels: labels:
k8s-app: metrics-server k8s-app: metrics-server
version: v0.2.0 version: v0.2.1
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
serviceAccountName: metrics-server serviceAccountName: metrics-server
containers: containers:
- name: metrics-server - name: metrics-server
image: gcr.io/google_containers/metrics-server-amd64:v0.2.0 image: gcr.io/google_containers/metrics-server-amd64:v0.2.1
command: command:
- /metrics-server - /metrics-server
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
@ -84,7 +84,7 @@ spec:
- --memory=140Mi - --memory=140Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=metrics-server-v0.2.0 - --deployment=metrics-server-v0.2.1
- --container=metrics-server - --container=metrics-server
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential