Skip to content

Commit

Permalink
Merge pull request #52548 from piosz/ms-bump
Browse files Browse the repository at this point in the history
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 kubernetes/enhancements#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.
```
  • Loading branch information
Kubernetes Submit Queue committed Sep 16, 2017
2 parents 549bd71 + c632649 commit 0f7aa67
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions cluster/addons/metrics-server/metrics-apiservice.yaml
@@ -1,16 +1,16 @@
apiVersion: apiregistration.k8s.io/v1beta1
kind: APIService
metadata:
name: v1alpha1.metrics
name: v1beta1.metrics.k8s.io
labels:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
spec:
service:
name: metrics-server
namespace: kube-system
group: metrics
version: v1alpha1
group: metrics.k8s.io
version: v1beta1
insecureSkipTLSVerify: true
groupPriorityMinimum: 100
versionPriority: 100
7 changes: 5 additions & 2 deletions cluster/addons/metrics-server/metrics-server-deployment.yaml
Expand Up @@ -10,28 +10,31 @@ metadata:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: metrics-server
name: metrics-server-v0.2.0
namespace: kube-system
labels:
k8s-app: metrics-server
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
version: v0.2.0
spec:
selector:
matchLabels:
k8s-app: metrics-server
version: v0.2.0
template:
metadata:
name: metrics-server
labels:
k8s-app: metrics-server
version: v0.2.0
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
serviceAccountName: metrics-server
containers:
- 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
# TODO(piosz): revisit resources
resources:
Expand Down

0 comments on commit 0f7aa67

Please sign in to comment.