From d4fa046d567698e01295fbf0a43d8eb7a453702b Mon Sep 17 00:00:00 2001
From: Zihong Zheng <zihongz@google.com>
Date: Fri, 24 Feb 2017 16:53:12 -0800
Subject: [PATCH] Adds the new addon-manager labels on cluster addon templates

---
 .../addons/calico-policy-controller/calico-etcd-service.yaml   | 1 +
 .../calico-policy-controller/calico-etcd-statefulset.yaml      | 1 +
 .../calico-policy-controller/calico-policy-controller.yaml     | 1 +
 .../cluster-loadbalancing/glbc/default-svc-controller.yaml     | 1 +
 cluster/addons/cluster-loadbalancing/glbc/default-svc.yaml     | 1 +
 .../addons/cluster-monitoring/google/heapster-controller.yaml  | 1 +
 cluster/addons/cluster-monitoring/google/heapster-service.yaml | 1 +
 .../googleinfluxdb/heapster-controller-combined.yaml           | 1 +
 .../addons/cluster-monitoring/influxdb/grafana-service.yaml    | 1 +
 .../cluster-monitoring/influxdb/heapster-controller.yaml       | 1 +
 .../addons/cluster-monitoring/influxdb/heapster-service.yaml   | 1 +
 .../influxdb/influxdb-grafana-controller.yaml                  | 1 +
 .../addons/cluster-monitoring/influxdb/influxdb-service.yaml   | 1 +
 .../cluster-monitoring/standalone/heapster-controller.yaml     | 1 +
 .../addons/cluster-monitoring/standalone/heapster-service.yaml | 1 +
 cluster/addons/dashboard/dashboard-controller.yaml             | 1 +
 cluster/addons/dashboard/dashboard-service.yaml                | 1 +
 .../dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml   | 1 +
 cluster/addons/dns/kubedns-controller.yaml.base                | 1 +
 cluster/addons/dns/kubedns-controller.yaml.in                  | 1 +
 cluster/addons/dns/kubedns-controller.yaml.sed                 | 1 +
 cluster/addons/dns/kubedns-sa.yaml                             | 1 +
 cluster/addons/dns/kubedns-svc.yaml.base                       | 1 +
 cluster/addons/dns/kubedns-svc.yaml.in                         | 1 +
 cluster/addons/dns/kubedns-svc.yaml.sed                        | 1 +
 cluster/addons/e2e-rbac-bindings/kubelet-binding.yaml          | 1 +
 cluster/addons/e2e-rbac-bindings/random-addon-grabbag.yaml     | 1 +
 cluster/addons/fluentd-elasticsearch/es-controller.yaml        | 1 +
 cluster/addons/fluentd-elasticsearch/es-service.yaml           | 1 +
 cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml        | 1 +
 cluster/addons/fluentd-elasticsearch/kibana-controller.yaml    | 1 +
 cluster/addons/fluentd-elasticsearch/kibana-service.yaml       | 1 +
 cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml                 | 1 +
 cluster/addons/node-problem-detector/npd.yaml                  | 3 +++
 .../addons/node-problem-detector/standalone/npd-binding.yaml   | 1 +
 cluster/addons/rbac/apiserver-node-proxy-binding.yaml          | 1 +
 cluster/addons/rbac/node-proxy-role.yaml                       | 1 +
 cluster/addons/registry/registry-pv.yaml.in                    | 1 +
 cluster/addons/registry/registry-pvc.yaml.in                   | 1 +
 cluster/addons/registry/registry-rc.yaml                       | 1 +
 cluster/addons/registry/registry-svc.yaml                      | 1 +
 cluster/addons/storage-class/aws/default.yaml                  | 1 +
 cluster/addons/storage-class/azure/default.yaml                | 1 +
 cluster/addons/storage-class/gce/default.yaml                  | 1 +
 cluster/addons/storage-class/openstack/default.yaml            | 1 +
 45 files changed, 47 insertions(+)

diff --git a/cluster/addons/calico-policy-controller/calico-etcd-service.yaml b/cluster/addons/calico-policy-controller/calico-etcd-service.yaml
index 7b9e6e18ba0..ad9a95e4690 100644
--- a/cluster/addons/calico-policy-controller/calico-etcd-service.yaml
+++ b/cluster/addons/calico-policy-controller/calico-etcd-service.yaml
@@ -4,6 +4,7 @@ metadata:
   labels:
     k8s-app: calico-etcd
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
   name: calico-etcd
   namespace: kube-system
 spec:
diff --git a/cluster/addons/calico-policy-controller/calico-etcd-statefulset.yaml b/cluster/addons/calico-policy-controller/calico-etcd-statefulset.yaml
index 77fd12e522e..61e996ce195 100644
--- a/cluster/addons/calico-policy-controller/calico-etcd-statefulset.yaml
+++ b/cluster/addons/calico-policy-controller/calico-etcd-statefulset.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: kube-system
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     k8s-app: calico-etcd
 spec:
   serviceName: calico-etcd
diff --git a/cluster/addons/calico-policy-controller/calico-policy-controller.yaml b/cluster/addons/calico-policy-controller/calico-policy-controller.yaml
index 68d93f87e64..899cadeabf1 100644
--- a/cluster/addons/calico-policy-controller/calico-policy-controller.yaml
+++ b/cluster/addons/calico-policy-controller/calico-policy-controller.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     k8s-app: calico-policy
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1
   selector:
diff --git a/cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml b/cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml
index 7bea6cf1f7f..f20af59d623 100644
--- a/cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml
+++ b/cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml
@@ -7,6 +7,7 @@ metadata:
     k8s-app: glbc
     kubernetes.io/name: "GLBC"
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1
   selector:
diff --git a/cluster/addons/cluster-loadbalancing/glbc/default-svc.yaml b/cluster/addons/cluster-loadbalancing/glbc/default-svc.yaml
index 1bd59320db3..84b8881dfaa 100644
--- a/cluster/addons/cluster-loadbalancing/glbc/default-svc.yaml
+++ b/cluster/addons/cluster-loadbalancing/glbc/default-svc.yaml
@@ -8,6 +8,7 @@ metadata:
   labels:
     k8s-app: glbc
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "GLBCDefaultBackend"
 spec:
   # The default backend must be of type NodePort.
diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index 0a1b02f6fbb..f1e15e3df67 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -19,6 +19,7 @@ metadata:
   labels:
     k8s-app: heapster
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     version: v1.3.0-beta.0
 spec:
   replicas: 1
diff --git a/cluster/addons/cluster-monitoring/google/heapster-service.yaml b/cluster/addons/cluster-monitoring/google/heapster-service.yaml
index 31e8b96006d..aab19cbb064 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-service.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-service.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: kube-system
   labels: 
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "Heapster"
 spec: 
   ports: 
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index cfff801866a..ee71914ef68 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -19,6 +19,7 @@ metadata:
   labels:
     k8s-app: heapster
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     version: v1.3.0-beta.0
 spec:
   replicas: 1
diff --git a/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml b/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml
index 9140e8b0c2c..50e6997b2f7 100644
--- a/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: kube-system
   labels: 
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "Grafana"
 spec:
   # On production clusters, consider setting up auth for grafana, and
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index 49c34b72226..f7c15d7d141 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -19,6 +19,7 @@ metadata:
   labels:
     k8s-app: heapster
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     version: v1.3.0-beta.0
 spec:
   replicas: 1
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml
index e406d69c44c..ed8ac37499e 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-service.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: kube-system
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "Heapster"
 spec: 
   ports: 
diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
index 680378e7591..d7ee7496784 100644
--- a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
@@ -7,6 +7,7 @@ metadata:
     k8s-app: influxGrafana
     version: v4
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec: 
   replicas: 1
   selector: 
diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml
index 066e052476e..8e9a1044277 100644
--- a/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: kube-system
   labels: 
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "InfluxDB"
 spec: 
   ports: 
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index fb07acd2da4..0d63527ae5d 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -17,6 +17,7 @@ metadata:
   labels:
     k8s-app: heapster
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     version: v1.3.0-beta.0
 spec:
   replicas: 1
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-service.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-service.yaml
index 31e8b96006d..aab19cbb064 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-service.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-service.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: kube-system
   labels: 
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "Heapster"
 spec: 
   ports: 
diff --git a/cluster/addons/dashboard/dashboard-controller.yaml b/cluster/addons/dashboard/dashboard-controller.yaml
index f74fddb85a5..bb21ffe9ce9 100644
--- a/cluster/addons/dashboard/dashboard-controller.yaml
+++ b/cluster/addons/dashboard/dashboard-controller.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     k8s-app: kubernetes-dashboard
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   selector:
     matchLabels:
diff --git a/cluster/addons/dashboard/dashboard-service.yaml b/cluster/addons/dashboard/dashboard-service.yaml
index 195b503de10..831248a97d7 100644
--- a/cluster/addons/dashboard/dashboard-service.yaml
+++ b/cluster/addons/dashboard/dashboard-service.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     k8s-app: kubernetes-dashboard
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   selector:
     k8s-app: kubernetes-dashboard
diff --git a/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml b/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml
index e2dd03e6159..bac10dca91b 100644
--- a/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml
+++ b/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml
@@ -20,6 +20,7 @@ metadata:
   labels:
     k8s-app: kube-dns-autoscaler
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   template:
     metadata:
diff --git a/cluster/addons/dns/kubedns-controller.yaml.base b/cluster/addons/dns/kubedns-controller.yaml.base
index a420a416c6a..23e5b584e63 100644
--- a/cluster/addons/dns/kubedns-controller.yaml.base
+++ b/cluster/addons/dns/kubedns-controller.yaml.base
@@ -25,6 +25,7 @@ metadata:
   labels:
     k8s-app: kube-dns
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   # replicas: not specified here:
   # 1. In order to make Addon Manager do not reconcile this replicas parameter.
diff --git a/cluster/addons/dns/kubedns-controller.yaml.in b/cluster/addons/dns/kubedns-controller.yaml.in
index 706baac3822..bcf1878bba6 100644
--- a/cluster/addons/dns/kubedns-controller.yaml.in
+++ b/cluster/addons/dns/kubedns-controller.yaml.in
@@ -25,6 +25,7 @@ metadata:
   labels:
     k8s-app: kube-dns
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   # replicas: not specified here:
   # 1. In order to make Addon Manager do not reconcile this replicas parameter.
diff --git a/cluster/addons/dns/kubedns-controller.yaml.sed b/cluster/addons/dns/kubedns-controller.yaml.sed
index 150a384fa6d..2a5928a45d9 100644
--- a/cluster/addons/dns/kubedns-controller.yaml.sed
+++ b/cluster/addons/dns/kubedns-controller.yaml.sed
@@ -25,6 +25,7 @@ metadata:
   labels:
     k8s-app: kube-dns
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   # replicas: not specified here:
   # 1. In order to make Addon Manager do not reconcile this replicas parameter.
diff --git a/cluster/addons/dns/kubedns-sa.yaml b/cluster/addons/dns/kubedns-sa.yaml
index 892351aa0c7..b7524758e59 100644
--- a/cluster/addons/dns/kubedns-sa.yaml
+++ b/cluster/addons/dns/kubedns-sa.yaml
@@ -4,3 +4,4 @@ metadata:
   name: kube-dns
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
diff --git a/cluster/addons/dns/kubedns-svc.yaml.base b/cluster/addons/dns/kubedns-svc.yaml.base
index 90a65677a56..cdeeedf96cf 100644
--- a/cluster/addons/dns/kubedns-svc.yaml.base
+++ b/cluster/addons/dns/kubedns-svc.yaml.base
@@ -22,6 +22,7 @@ metadata:
   labels:
     k8s-app: kube-dns
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "KubeDNS"
 spec:
   selector:
diff --git a/cluster/addons/dns/kubedns-svc.yaml.in b/cluster/addons/dns/kubedns-svc.yaml.in
index c8c59134e73..ed82d6155b5 100644
--- a/cluster/addons/dns/kubedns-svc.yaml.in
+++ b/cluster/addons/dns/kubedns-svc.yaml.in
@@ -22,6 +22,7 @@ metadata:
   labels:
     k8s-app: kube-dns
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "KubeDNS"
 spec:
   selector:
diff --git a/cluster/addons/dns/kubedns-svc.yaml.sed b/cluster/addons/dns/kubedns-svc.yaml.sed
index 0127ecf5d12..bac6d97f678 100644
--- a/cluster/addons/dns/kubedns-svc.yaml.sed
+++ b/cluster/addons/dns/kubedns-svc.yaml.sed
@@ -22,6 +22,7 @@ metadata:
   labels:
     k8s-app: kube-dns
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "KubeDNS"
 spec:
   selector:
diff --git a/cluster/addons/e2e-rbac-bindings/kubelet-binding.yaml b/cluster/addons/e2e-rbac-bindings/kubelet-binding.yaml
index 066e28b101d..fd8624951c1 100644
--- a/cluster/addons/e2e-rbac-bindings/kubelet-binding.yaml
+++ b/cluster/addons/e2e-rbac-bindings/kubelet-binding.yaml
@@ -9,6 +9,7 @@ metadata:
   name: kubelet-cluster-admin
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/cluster/addons/e2e-rbac-bindings/random-addon-grabbag.yaml b/cluster/addons/e2e-rbac-bindings/random-addon-grabbag.yaml
index f27c2222497..ec180e212b4 100644
--- a/cluster/addons/e2e-rbac-bindings/random-addon-grabbag.yaml
+++ b/cluster/addons/e2e-rbac-bindings/random-addon-grabbag.yaml
@@ -9,6 +9,7 @@ metadata:
   name: todo-remove-grabbag-cluster-admin
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
index b6f24cde43d..75ff11205b4 100644
--- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
@@ -7,6 +7,7 @@ metadata:
     k8s-app: elasticsearch-logging
     version: v1
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 2
   selector:
diff --git a/cluster/addons/fluentd-elasticsearch/es-service.yaml b/cluster/addons/fluentd-elasticsearch/es-service.yaml
index abf1fd3f684..ede9306bb89 100644
--- a/cluster/addons/fluentd-elasticsearch/es-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-service.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     k8s-app: elasticsearch-logging
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "Elasticsearch"
 spec:
   ports:
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
index a844acc2e83..fb8afe95f65 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     k8s-app: fluentd-es
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     version: v1.22
 spec:
   template:
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
index 06fd7bc947f..bc7725686d0 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     k8s-app: kibana-logging
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1
   selector:
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
index 43efada2c50..d241ef728de 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-service.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     k8s-app: kibana-logging
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "Kibana"
 spec:
   ports:
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
index 6161da92e6f..03a4c268a2f 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -7,6 +7,7 @@ metadata:
   labels:
     k8s-app: fluentd-gcp
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     version: v1.38
 spec:
   template:
diff --git a/cluster/addons/node-problem-detector/npd.yaml b/cluster/addons/node-problem-detector/npd.yaml
index ec140e18259..bc16e15ef09 100644
--- a/cluster/addons/node-problem-detector/npd.yaml
+++ b/cluster/addons/node-problem-detector/npd.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: kube-system
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 ---
 apiVersion: rbac.authorization.k8s.io/v1alpha1
 kind: ClusterRoleBinding
@@ -12,6 +13,7 @@ metadata:
   name: npd-binding
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -30,6 +32,7 @@ metadata:
     k8s-app: node-problem-detector
     version: v0.3.0-alpha.1
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   template:
     metadata:
diff --git a/cluster/addons/node-problem-detector/standalone/npd-binding.yaml b/cluster/addons/node-problem-detector/standalone/npd-binding.yaml
index 9f6a934d83c..48432afea21 100644
--- a/cluster/addons/node-problem-detector/standalone/npd-binding.yaml
+++ b/cluster/addons/node-problem-detector/standalone/npd-binding.yaml
@@ -4,6 +4,7 @@ metadata:
   name: npd-binding
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/cluster/addons/rbac/apiserver-node-proxy-binding.yaml b/cluster/addons/rbac/apiserver-node-proxy-binding.yaml
index 46103d006ea..8bfe366edb5 100644
--- a/cluster/addons/rbac/apiserver-node-proxy-binding.yaml
+++ b/cluster/addons/rbac/apiserver-node-proxy-binding.yaml
@@ -4,6 +4,7 @@ metadata:
   name: apiserver-node-proxy
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/cluster/addons/rbac/node-proxy-role.yaml b/cluster/addons/rbac/node-proxy-role.yaml
index d3684c99335..03a7f944c33 100644
--- a/cluster/addons/rbac/node-proxy-role.yaml
+++ b/cluster/addons/rbac/node-proxy-role.yaml
@@ -4,6 +4,7 @@ metadata:
   name: node-proxy
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 rules:
 - apiGroups:
   - ""
diff --git a/cluster/addons/registry/registry-pv.yaml.in b/cluster/addons/registry/registry-pv.yaml.in
index b6fd2b35295..196efa928da 100644
--- a/cluster/addons/registry/registry-pv.yaml.in
+++ b/cluster/addons/registry/registry-pv.yaml.in
@@ -4,6 +4,7 @@ metadata:
   name: kube-system-kube-registry-pv
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
 {% if pillar.get('cluster_registry_disk_type', '') == 'gce' %}
   capacity:
diff --git a/cluster/addons/registry/registry-pvc.yaml.in b/cluster/addons/registry/registry-pvc.yaml.in
index 92bfc69864c..35c78717713 100644
--- a/cluster/addons/registry/registry-pvc.yaml.in
+++ b/cluster/addons/registry/registry-pvc.yaml.in
@@ -5,6 +5,7 @@ metadata:
   namespace: kube-system
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/cluster/addons/registry/registry-rc.yaml b/cluster/addons/registry/registry-rc.yaml
index 29942c4538f..ab0afd27609 100644
--- a/cluster/addons/registry/registry-rc.yaml
+++ b/cluster/addons/registry/registry-rc.yaml
@@ -7,6 +7,7 @@ metadata:
     k8s-app: kube-registry
     version: v0
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1
   selector:
diff --git a/cluster/addons/registry/registry-svc.yaml b/cluster/addons/registry/registry-svc.yaml
index b9f1cc40b99..db71c91ef78 100644
--- a/cluster/addons/registry/registry-svc.yaml
+++ b/cluster/addons/registry/registry-svc.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     k8s-app: kube-registry
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "KubeRegistry"
 spec:
   selector:
diff --git a/cluster/addons/storage-class/aws/default.yaml b/cluster/addons/storage-class/aws/default.yaml
index 319fe55cbc4..4ec88ff25d6 100644
--- a/cluster/addons/storage-class/aws/default.yaml
+++ b/cluster/addons/storage-class/aws/default.yaml
@@ -6,6 +6,7 @@ metadata:
     storageclass.beta.kubernetes.io/is-default-class: "true"
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: EnsureExists
 provisioner: kubernetes.io/aws-ebs
 parameters:
   type: gp2
diff --git a/cluster/addons/storage-class/azure/default.yaml b/cluster/addons/storage-class/azure/default.yaml
index fe208c40e0d..bcc7a33a72a 100644
--- a/cluster/addons/storage-class/azure/default.yaml
+++ b/cluster/addons/storage-class/azure/default.yaml
@@ -6,4 +6,5 @@ metadata:
     storageclass.beta.kubernetes.io/is-default-class: "true"
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: EnsureExists
 provisioner: kubernetes.io/azure-disk
diff --git a/cluster/addons/storage-class/gce/default.yaml b/cluster/addons/storage-class/gce/default.yaml
index e1b89675f16..f728de1fb5a 100644
--- a/cluster/addons/storage-class/gce/default.yaml
+++ b/cluster/addons/storage-class/gce/default.yaml
@@ -6,6 +6,7 @@ metadata:
     storageclass.beta.kubernetes.io/is-default-class: "true"
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: EnsureExists
 provisioner: kubernetes.io/gce-pd
 parameters:
   type: pd-standard
diff --git a/cluster/addons/storage-class/openstack/default.yaml b/cluster/addons/storage-class/openstack/default.yaml
index 6e4f771b7bd..06edf513455 100644
--- a/cluster/addons/storage-class/openstack/default.yaml
+++ b/cluster/addons/storage-class/openstack/default.yaml
@@ -6,4 +6,5 @@ metadata:
     storageclass.beta.kubernetes.io/is-default-class: "true"
   labels:
     kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: EnsureExists
 provisioner: kubernetes.io/cinder