Merge pull request #62998 from kawych/automated-cherry-pick-of-#62909-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #62909: Manage Metadata Agent Config with Addon Manager Cherry pick of #62909 on release-1.10. #62909: Manage Metadata Agent Config with Addon Manager **Release note**: ```release-note Fix error where config map for Metadata Agent was not created by addon manager. ```

Merge pull request #62998 from kawych/automated-cherry-pick-of-#62909-upstream-release-1.10
c1d064a7 · Kubernetes Submit Queue · GitHub · 7195f798 · 22ea3740 · c1d064a7
Unverified Commit c1d064a7 authored Apr 24, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

metadata-agent.yaml ...ter/addons/metadata-agent/stackdriver/metadata-agent.yaml +3 -0

No files found.
--- a/cluster/addons/metadata-agent/stackdriver/metadata-agent.yaml
+++ b/cluster/addons/metadata-agent/stackdriver/metadata-agent.yaml
@@ -12,6 +12,9 @@ kind: ConfigMap
 metadata:
  name: metadata-agent-config
  namespace: kube-system
+  labels:
+    kubernetes.io/cluster-service: "true"
+    addonmanager.kubernetes.io/mode: Reconcile
 data:
  node_level.conf: |-
    KubernetesUseWatch: true