Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumped Metrics Server to v0.2.0 #52548

Merged
merged 1 commit into from Sep 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, why do this? This a Deployment, not a ReplicationController...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it's to appease the arcane rules followed by the addon manager (it will only apply changes when it sees metadata changes, and it's easy to change the name).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBH I don't know what is the current logic of addon-manager so I just followed Heapster pattern.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

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