github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #52548 from piosz/ms-bump

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 52488, 52548). 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>..

Bumped Metrics Server to v0.2.0

ref https://github.com/kubernetes/features/issues/271

**Release note**:
```release-note
Introduced Metrics Server in version v0.2.0. For more details see https://github.com/kubernetes-incubator/metrics-server/releases/tag/v0.2.0.
```
This commit is contained in:
Kubernetes Submit Queue 2017-09-15 18:34:27 -07:00 committed by GitHub
commit 0f7aa6727c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/addons/metrics-server/metrics-apiservice.yaml
View File

@ -1,7 +1,7 @@
apiVersion: apiregistration.k8s.io/v1beta1 apiVersion: apiregistration.k8s.io/v1beta1
kind: APIService kind: APIService
metadata: metadata:
name: v1alpha1.metrics name: v1beta1.metrics.k8s.io
labels: labels:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
@ -9,8 +9,8 @@ spec:
service: service:
name: metrics-server name: metrics-server
namespace: kube-system namespace: kube-system
group: metrics group: metrics.k8s.io
version: v1alpha1 version: v1beta1
insecureSkipTLSVerify: true insecureSkipTLSVerify: true
groupPriorityMinimum: 100 groupPriorityMinimum: 100
versionPriority: 100 versionPriority: 100

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

@ -10,28 +10,31 @@ metadata:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: metrics-server name: metrics-server-v0.2.0
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
spec: spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: metrics-server k8s-app: metrics-server
version: v0.2.0
template: template:
metadata: metadata:
name: metrics-server name: metrics-server
labels: labels:
k8s-app: metrics-server k8s-app: metrics-server
version: v0.2.0
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:dev image: gcr.io/google_containers/metrics-server-amd64:v0.2.0
imagePullPolicy: Always imagePullPolicy: Always
# TODO(piosz): revisit resources # TODO(piosz): revisit resources
resources: resources: