Merge pull request kubernetes#65433 from kawych/automated-cherry-pick-of-#65176-upstream-release-1.11

Automatic merge from submit-queue.

Automated cherry pick of kubernetes#65176: Pass cluster_location argument to Heapster

Cherry pick of kubernetes#65176 on release-1.11.

kubernetes#65176: Pass cluster_location argument to Heapster

Author: Kubernetes Submit Queue

cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml

@@ -59,7 +59,7 @@ spec:
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
-            - --sink=stackdriver:?cluster_name={{ cluster_name }}&use_old_resources={{ use_old_resources }}&use_new_resources={{ use_new_resources }}&min_interval_sec=100&batch_export_timeout_sec=110
+            - --sink=stackdriver:?cluster_name={{ cluster_name }}&use_old_resources={{ use_old_resources }}&use_new_resources={{ use_new_resources }}&min_interval_sec=100&batch_export_timeout_sec=110&cluster_location={{ cluster_location }}
         # BEGIN_PROMETHEUS_TO_SD
         - name: prom-to-sd
           image: k8s.gcr.io/prometheus-to-sd:v0.2.4

cluster/gce/gci/configure-helper.sh

@@ -2353,6 +2353,7 @@ EOF
     fi
 
     sed -i -e "s@{{ cluster_name }}@${CLUSTER_NAME}@g" "${controller_yaml}"
+    sed -i -e "s@{{ cluster_location }}@${ZONE}@g" "${controller_yaml}"
     sed -i -e "s@{{ *base_metrics_memory *}}@${base_metrics_memory}@g" "${controller_yaml}"
     sed -i -e "s@{{ *base_metrics_cpu *}}@${base_metrics_cpu}@g" "${controller_yaml}"
     sed -i -e "s@{{ *base_eventer_memory *}}@${base_eventer_memory}@g" "${controller_yaml}"