diff --git a/Makefile b/Makefile index 01c8008f9..26d2bed64 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ ifndef TEMP_DIR TEMP_DIR:=$(shell mktemp -d /tmp/metrics-server.XXXXXX) endif -VERSION?=v0.1.0 +VERSION?=v0.2.0 GIT_COMMIT:=$(shell git rev-parse --short HEAD) ifdef REPO_DIR diff --git a/deploy/metrics-apiservice.yaml b/deploy/metrics-apiservice.yaml index 088045113..a8860fbcc 100644 --- a/deploy/metrics-apiservice.yaml +++ b/deploy/metrics-apiservice.yaml @@ -1,13 +1,13 @@ apiVersion: apiregistration.k8s.io/v1beta1 kind: APIService metadata: - name: v1alpha1.metrics + name: v1beta1.metrics.k8s.io spec: service: name: metrics-server namespace: kube-system - group: metrics - version: v1alpha1 + group: metrics.k8s.io + version: v1beta1 insecureSkipTLSVerify: true groupPriorityMinimum: 100 versionPriority: 100 diff --git a/deploy/metrics-server-deployment.yaml b/deploy/metrics-server-deployment.yaml index 8d9119a0e..ceaaee5b4 100644 --- a/deploy/metrics-server-deployment.yaml +++ b/deploy/metrics-server-deployment.yaml @@ -24,7 +24,7 @@ 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 command: - /metrics-server diff --git a/metrics/heapster.go b/metrics/heapster.go index 7b2f2ba80..95c0e0f9e 100644 --- a/metrics/heapster.go +++ b/metrics/heapster.go @@ -69,7 +69,7 @@ func main() { setLabelSeperator(opt) setMaxProcs(opt) glog.Infof(strings.Join(os.Args, " ")) - glog.Infof("Heapster version %v", version.MetricsServerVersion) + glog.Infof("Metrics Server version %v", version.MetricsServerVersion) if err := validateFlags(opt); err != nil { glog.Fatal(err) }