diff --git a/cluster/addons/metrics-server/auth-delegator.yaml b/cluster/addons/metrics-server/auth-delegator.yaml
index 109f55f2e68..cbaa6250689 100644
--- a/cluster/addons/metrics-server/auth-delegator.yaml
+++ b/cluster/addons/metrics-server/auth-delegator.yaml
@@ -2,6 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: metrics-server:system:auth-delegator
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/cluster/addons/metrics-server/auth-reader.yaml b/cluster/addons/metrics-server/auth-reader.yaml
index 9eff1294e05..60da052c1c5 100644
--- a/cluster/addons/metrics-server/auth-reader.yaml
+++ b/cluster/addons/metrics-server/auth-reader.yaml
@@ -3,6 +3,9 @@ kind: RoleBinding
 metadata:
   name: metrics-server-auth-reader
   namespace: kube-system
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
diff --git a/cluster/addons/metrics-server/metrics-apiservice.yaml b/cluster/addons/metrics-server/metrics-apiservice.yaml
index 088045113b5..28b5627df6f 100644
--- a/cluster/addons/metrics-server/metrics-apiservice.yaml
+++ b/cluster/addons/metrics-server/metrics-apiservice.yaml
@@ -2,6 +2,9 @@ apiVersion: apiregistration.k8s.io/v1beta1
 kind: APIService
 metadata:
   name: v1alpha1.metrics
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   service:
     name: metrics-server
diff --git a/cluster/addons/metrics-server/metrics-server-deployment.yaml b/cluster/addons/metrics-server/metrics-server-deployment.yaml
index 4e0d10f857e..9da44cc2933 100644
--- a/cluster/addons/metrics-server/metrics-server-deployment.yaml
+++ b/cluster/addons/metrics-server/metrics-server-deployment.yaml
@@ -3,6 +3,9 @@ kind: ServiceAccount
 metadata:
   name: metrics-server
   namespace: kube-system
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -11,6 +14,8 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: metrics-server
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   selector:
     matchLabels:
@@ -20,6 +25,8 @@ spec:
       name: metrics-server
       labels:
         k8s-app: metrics-server
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       serviceAccountName: metrics-server
       containers:
diff --git a/cluster/addons/metrics-server/metrics-server-service.yaml b/cluster/addons/metrics-server/metrics-server-service.yaml
index fa39073a84d..3764c0544dc 100644
--- a/cluster/addons/metrics-server/metrics-server-service.yaml
+++ b/cluster/addons/metrics-server/metrics-server-service.yaml
@@ -4,6 +4,8 @@ metadata:
   name: metrics-server
   namespace: kube-system
   labels:
+    addonmanager.kubernetes.io/mode: Reconcile
+    kubernetes.io/cluster-service: "true"
     kubernetes.io/name: "Metrics-server"
 spec:
   selector: