From 8cc3faff69b3f15d8be0659a263c5137b7a8d5f9 Mon Sep 17 00:00:00 2001 From: Igor Peshansky Date: Sat, 31 Mar 2018 02:35:18 -0400 Subject: [PATCH 1/2] Disable Docker polling by default. --- src/configuration.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configuration.cc b/src/configuration.cc index 138ddb1d..ae2ccac5 100644 --- a/src/configuration.cc +++ b/src/configuration.cc @@ -54,7 +54,7 @@ constexpr const char kMetadataIngestionDefaultRawContentVersion[] = "0.1"; constexpr const int kInstanceUpdaterDefaultIntervalSeconds = 60*60; constexpr const char kDefaultInstanceResourceType[] = ""; // A blank value means "unspecified; detect via environment". -constexpr const int kDockerUpdaterDefaultIntervalSeconds = 60; +constexpr const int kDockerUpdaterDefaultIntervalSeconds = 0; constexpr const char kDockerDefaultEndpointHost[] = "unix://%2Fvar%2Frun%2Fdocker.sock/"; constexpr const char kDockerDefaultApiVersion[] = "1.23"; From cbaa6a3a179b2c2a29c7d423de4100e3313ca499 Mon Sep 17 00:00:00 2001 From: Igor Peshansky Date: Sat, 31 Mar 2018 14:19:23 -0400 Subject: [PATCH 2/2] Also disable Kubernetes watch (nothing but instance by default). --- src/configuration.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configuration.cc b/src/configuration.cc index ae2ccac5..e6077474 100644 --- a/src/configuration.cc +++ b/src/configuration.cc @@ -66,7 +66,7 @@ constexpr const char kKubernetesDefaultPodLabelSelector[] = ""; constexpr const char kKubernetesDefaultClusterName[] = ""; constexpr const char kKubernetesDefaultClusterLocation[] = ""; constexpr const char kKubernetesDefaultNodeName[] = ""; -constexpr const bool kKubernetesDefaultUseWatch = true; +constexpr const bool kKubernetesDefaultUseWatch = false; constexpr const bool kKubernetesDefaultClusterLevelMetadata = false; constexpr const char kDefaultInstanceId[] = ""; constexpr const char kDefaultInstanceZone[] = "";