Kubernetes watch implementation.

src/Makefile

@@ -63,8 +63,8 @@ install: metadatad
 
 export DISTRO
 PKG_NAME=stackdriver-metadata
-PKG_VERSION=0.0.13
-PKG_RELEASE=5
+PKG_VERSION=0.0.14
+PKG_RELEASE=1
 PKG_MAINTAINER=Stackdriver Engineering <engineering@stackdriver.com>
 
 DOCKER_VERSION=0.2

src/configuration.cc

@@ -46,6 +46,8 @@ constexpr const int kKubernetesUpdaterDefaultIntervalSeconds = 60;
 constexpr const char kKubernetesDefaultEndpointHost[] = "https://kubernetes";
 constexpr const char kKubernetesDefaultPodLabelSelector[] = "";
 constexpr const char kKubernetesDefaultClusterName[] = "";
+constexpr const char kKubernetesDefaultNodeName[] = "";
+constexpr const bool kKubernetesDefaultUseWatch = true;
 constexpr const char kDefaultInstanceId[] = "";
 constexpr const char kDefaultInstanceZone[] = "";
 
@@ -72,6 +74,8 @@ MetadataAgentConfiguration::MetadataAgentConfiguration()
       kubernetes_endpoint_host_(kKubernetesDefaultEndpointHost),
       kubernetes_pod_label_selector_(kKubernetesDefaultPodLabelSelector),
       kubernetes_cluster_name_(kKubernetesDefaultClusterName),
+      kubernetes_node_name_(kKubernetesDefaultNodeName),
+      kubernetes_use_watch_(kKubernetesDefaultUseWatch),
       instance_id_(kDefaultInstanceId),
       instance_zone_(kDefaultInstanceZone) {}
 
@@ -154,6 +158,10 @@ void MetadataAgentConfiguration::ParseConfigFile(const std::string& filename) {
   kubernetes_cluster_name_ =
       config["KubernetesClusterName"].as<std::string>(
           kKubernetesDefaultClusterName);
+  kubernetes_node_name_ =
+      config["KubernetesNodeName"].as<std::string>(kKubernetesDefaultNodeName);
+  kubernetes_use_watch_ =
+      config["KubernetesUseWatch"].as<bool>(kKubernetesDefaultUseWatch);
   instance_id_ =
       config["InstanceId"].as<std::string>(kDefaultInstanceId);
   instance_zone_ =

src/configuration.h

@@ -95,6 +95,14 @@ class MetadataAgentConfiguration {
     std::lock_guard<std::mutex> lock(mutex_);
     return kubernetes_cluster_name_;
   }
+  const std::string& KubernetesNodeName() const {
+    std::lock_guard<std::mutex> lock(mutex_);
+    return kubernetes_node_name_;
+  }
+  bool KubernetesUseWatch() const {
+    std::lock_guard<std::mutex> lock(mutex_);
+    return kubernetes_use_watch_;
+  }
   // Common metadata updater options.
   const std::string& InstanceId() const {
     std::lock_guard<std::mutex> lock(mutex_);
@@ -125,6 +133,8 @@ class MetadataAgentConfiguration {
   std::string kubernetes_endpoint_host_;
   std::string kubernetes_pod_label_selector_;
   std::string kubernetes_cluster_name_;
+  std::string kubernetes_node_name_;
+  bool kubernetes_use_watch_;
   std::string instance_id_;
   std::string instance_zone_;
 };