From fd7c737ef73de7f8b91267bf31935fbe6ea46eec Mon Sep 17 00:00:00 2001
From: gjmzj <gaojianming.zj@139.com>
Date: Tue, 2 Jul 2019 21:58:27 +0800
Subject: [PATCH] update metrics-server v0.3.3

---
 down/offline_images                                     | 2 +-
 manifests/metrics-server/metrics-server-deployment.yaml | 4 ++--
 manifests/metrics-server/metrics-server-service.yaml    | 1 +
 roles/cluster-addon/defaults/main.yml                   | 2 +-
 tools/easzup                                            | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/down/offline_images b/down/offline_images
index 82e7b78..d541c43 100644
--- a/down/offline_images
+++ b/down/offline_images
@@ -12,7 +12,7 @@ easzlab/flannel:v0.11.0-amd64
  
 mirrorgooglecontainers/heapster-amd64:v1.5.4
 
-mirrorgooglecontainers/metrics-server-amd64:v0.3.2
+mirrorgooglecontainers/metrics-server-amd64:v0.3.3
  
 mirrorgooglecontainers/pause-amd64:3.1
 
diff --git a/manifests/metrics-server/metrics-server-deployment.yaml b/manifests/metrics-server/metrics-server-deployment.yaml
index 8358bea..9c1241a 100644
--- a/manifests/metrics-server/metrics-server-deployment.yaml
+++ b/manifests/metrics-server/metrics-server-deployment.yaml
@@ -29,8 +29,8 @@ spec:
         emptyDir: {}
       containers:
       - name: metrics-server
-        #image: k8s.gcr.io/metrics-server-amd64:v0.3.2
-        image: mirrorgooglecontainers/metrics-server-amd64:v0.3.2
+        #image: k8s.gcr.io/metrics-server-amd64:v0.3.3
+        image: mirrorgooglecontainers/metrics-server-amd64:v0.3.3
         imagePullPolicy: IfNotPresent 
         command:
         - /metrics-server
diff --git a/manifests/metrics-server/metrics-server-service.yaml b/manifests/metrics-server/metrics-server-service.yaml
index 082b00c..ddf6f4a 100644
--- a/manifests/metrics-server/metrics-server-service.yaml
+++ b/manifests/metrics-server/metrics-server-service.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: kube-system
   labels:
     kubernetes.io/name: "Metrics-server"
+    kubernetes.io/cluster-service: "true"
 spec:
   selector:
     k8s-app: metrics-server
diff --git a/roles/cluster-addon/defaults/main.yml b/roles/cluster-addon/defaults/main.yml
index a4404d1..d955bb6 100644
--- a/roles/cluster-addon/defaults/main.yml
+++ b/roles/cluster-addon/defaults/main.yml
@@ -13,7 +13,7 @@ dns_offline: "{%- if dns_backend == 'coredns' -%} \
 
 # metric server 自动安装
 metricsserver_install: "yes"
-metricsVer: "v0.3.2"
+metricsVer: "v0.3.3"
 metricsserver_offline: "metrics-server_{{ metricsVer }}.tar"
 
 # dashboard 自动安装
diff --git a/tools/easzup b/tools/easzup
index 0446209..5ecf1c5 100755
--- a/tools/easzup
+++ b/tools/easzup
@@ -157,7 +157,7 @@ function get_offline_image() {
   dashboardVer=v1.10.1
   flannelVer=v0.11.0-amd64
   heapsterVer=v1.5.4
-  metricsVer=v0.3.2
+  metricsVer=v0.3.3
   pauseVer=3.1
   traefikVer=v1.7.12