Adds the new addon-manager labels on cluster addon templates

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:

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

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:

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:

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.

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

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: 

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

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

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

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: 

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: 

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: 

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

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: 

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:

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

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:

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.

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.

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.

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

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:

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:

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:

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

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

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:

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:

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:

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:

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:

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:

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:

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

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

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:
   - ""

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:

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

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:

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:

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

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

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

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