Merge pull request #28823 from zenly/master

cluster/addons/addon-manager/README.md

@@ -3,7 +3,8 @@
 The `addon-manager` periodically checks for Kubernetes manifest changes in the `/etc/kubernetes/addons` directory,
 and when there's a new or changed addon, the `addon-manager` automatically `kubectl create`s it.
 
-It supports `ReplicationControllers`, `Deployments`, `DaemonSets`, `Services`, `PersistentVolumes` and `PersistentVolumeClaims`.
+It supports `ReplicationControllers`, `Deployments`, `DaemonSets`, `ConfigMaps`, `Services`, `PersistentVolumes` and
+`PersistentVolumeClaims`.
 
 The `addon-manager` is built for multiple architectures.
 

cluster/addons/addon-manager/kube-addon-update.sh

@@ -489,6 +489,7 @@ function update-addons() {
     reconcile-objects ${addon_path} Service "" &
     reconcile-objects ${addon_path} PersistentVolume "" &
     reconcile-objects ${addon_path} PersistentVolumeClaim "" &
+    reconcile-objects ${addon_path} ConfigMap "" &
 
     wait-for-jobs
     if [[ $? -eq 0 ]]; then