Update all references of in_cluster kubernetes config

elastic · Jul 29, 2019 · adba6b4 · adba6b4
1 parent 1450f9e
commit adba6b4
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 49 deletions.
diff --git a/libbeat/autodiscover/providers/kubernetes/config.go b/libbeat/autodiscover/providers/kubernetes/config.go
@@ -26,7 +26,6 @@ import (
 
 // Config for kubernetes autodiscover provider
 type Config struct {
-	InCluster      bool          `config:"in_cluster"`
 	KubeConfig     string        `config:"kube_config"`
 	Host           string        `config:"host"`
 	Namespace      string        `config:"namespace"`
@@ -42,7 +41,6 @@ type Config struct {
 
 func defaultConfig() *Config {
 	return &Config{
-		InCluster:      true,
 		SyncPeriod:     10 * time.Minute,
 		CleanupTimeout: 60 * time.Second,
 		Prefix:         "co.elastic",

diff --git a/libbeat/docs/processors-using.asciidoc b/libbeat/docs/processors-using.asciidoc
@@ -1226,7 +1226,6 @@ Kubernetes.
 -------------------------------------------------------------------------------
 processors:
 - add_kubernetes_metadata:
-    in_cluster: true
 -------------------------------------------------------------------------------
 
 The configuration below enables the processor on a Beat running as a process on
@@ -1236,7 +1235,6 @@ the Kubernetes node.
 -------------------------------------------------------------------------------
 processors:
 - add_kubernetes_metadata:
-    in_cluster: false
     host: <hostname>
     kube_config: ${HOME}/.kube/config
 -------------------------------------------------------------------------------
@@ -1248,7 +1246,6 @@ enables ones that the user is interested in.
 -------------------------------------------------------------------------------
 processors:
 - add_kubernetes_metadata:
-    in_cluster: false
     host: <hostname>
     kube_config: ~/.kube/config
     default_indexers.enabled: false
@@ -1262,8 +1259,6 @@ processors:
 
 The `add_kubernetes_metadata` processor has the following configuration settings:
 
-`in_cluster`:: (Optional) Use in cluster settings for Kubernetes client, `true`
-by default.
 `host`:: (Optional) Identify the node where {beatname_lc} is running in case it
 cannot be accurately detected, as when running {beatname_lc} in host network
 mode.

diff --git a/libbeat/docs/shared-autodiscover.asciidoc b/libbeat/docs/shared-autodiscover.asciidoc
@@ -175,8 +175,6 @@ contain variables from the autodiscover event. They can be accessed under data n
 
 The `kubernetes` autodiscover provider has the following configuration settings:
 
-`in_cluster`:: (Optional) Use in cluster settings for Kubernetes client, `true`
-  by default.
 `host`:: (Optional) Identify the node where {beatname_lc} is running in case it
   cannot be accurately detected, as when running {beatname_lc} in host network
   mode.

diff --git a/libbeat/processors/add_kubernetes_metadata/config.go b/libbeat/processors/add_kubernetes_metadata/config.go
@@ -24,7 +24,6 @@ import (
 )
 
 type kubeAnnotatorConfig struct {
-	InCluster  bool          `config:"in_cluster"`
 	KubeConfig string        `config:"kube_config"`
 	Host       string        `config:"host"`
 	Namespace  string        `config:"namespace"`
@@ -46,7 +45,6 @@ type PluginConfig []map[string]common.Config
 
 func defaultKubernetesAnnotatorConfig() kubeAnnotatorConfig {
 	return kubeAnnotatorConfig{
-		InCluster:       true,
 		SyncPeriod:      10 * time.Minute,
 		CleanupTimeout:  60 * time.Second,
 		DefaultMatchers: Enabled{true},

diff --git a/libbeat/processors/add_kubernetes_metadata/kubernetes.go b/libbeat/processors/add_kubernetes_metadata/kubernetes.go
@@ -18,7 +18,6 @@
 package add_kubernetes_metadata
 
 import (
-	"errors"
 	"fmt"
 	"time"
 
@@ -61,11 +60,6 @@ func New(cfg *common.Config) (processors.Processor, error) {
 		return nil, fmt.Errorf("fail to unpack the kubernetes configuration: %s", err)
 	}
 
-	err = validate(config)
-	if err != nil {
-		return nil, err
-	}
-
 	//Load default indexer configs
 	if config.DefaultIndexers.Enabled == true {
 		Indexing.RLock()
@@ -102,7 +96,7 @@ func New(cfg *common.Config) (processors.Processor, error) {
 		return nil, err
 	}
 
-	config.Host = kubernetes.DiscoverKubernetesNode(config.Host, config.InCluster, client)
+	config.Host = kubernetes.DiscoverKubernetesNode(config.Host, kubernetes.IsInCluster(config.KubeConfig), client)
 
 	logp.Debug("kubernetes", "Using host: %s", config.Host)
 	logp.Debug("kubernetes", "Initializing watcher")
@@ -179,10 +173,3 @@ func (k *kubernetesAnnotator) removePod(pod *kubernetes.Pod) {
 func (*kubernetesAnnotator) String() string {
 	return "add_kubernetes_metadata"
 }
-
-func validate(config kubeAnnotatorConfig) error {
-	if !config.InCluster && config.KubeConfig == "" {
-		return errors.New("`kube_config` path can't be empty when in_cluster is set to false")
-	}
-	return nil
-}
diff --git a/metricbeat/docs/modules/kubernetes.asciidoc b/metricbeat/docs/modules/kubernetes.asciidoc
@@ -77,7 +77,6 @@ metricbeat.modules:
 
   # Enriching parameters:
   add_metadata: true
-  in_cluster: true
   # When used outside the cluster:
   #host: node_name
   #kube_config: ~/.kube/config
@@ -97,7 +96,6 @@ metricbeat.modules:
 
   # Enriching parameters:
   add_metadata: true
-  in_cluster: true
   # When used outside the cluster:
   #host: node_name
   #kube_config: ~/.kube/config

diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
@@ -433,7 +433,6 @@ metricbeat.modules:
 
   # Enriching parameters:
   add_metadata: true
-  in_cluster: true
   # When used outside the cluster:
   #host: node_name
   #kube_config: ~/.kube/config
@@ -453,7 +452,6 @@ metricbeat.modules:
 
   # Enriching parameters:
   add_metadata: true
-  in_cluster: true
   # When used outside the cluster:
   #host: node_name
   #kube_config: ~/.kube/config

diff --git a/metricbeat/module/kubernetes/_meta/config.reference.yml b/metricbeat/module/kubernetes/_meta/config.reference.yml
@@ -17,7 +17,6 @@
 
   # Enriching parameters:
   add_metadata: true
-  in_cluster: true
   # When used outside the cluster:
   #host: node_name
   #kube_config: ~/.kube/config
@@ -37,7 +36,6 @@
 
   # Enriching parameters:
   add_metadata: true
-  in_cluster: true
   # When used outside the cluster:
   #host: node_name
   #kube_config: ~/.kube/config

diff --git a/metricbeat/module/kubernetes/_meta/config.yml b/metricbeat/module/kubernetes/_meta/config.yml
@@ -16,11 +16,9 @@
 
   # Enriching parameters:
   #add_metadata: true
-  #in_cluster: true
   #labels.dedot: true
   #annotations.dedot: true
   # When used outside the cluster:
-  #in_cluster: false
   #host: node_name
   #kube_config: ~/.kube/config
 
@@ -36,7 +34,6 @@
 #  period: 10s
 #  hosts: ["kube-state-metrics:8080"]
 #  add_metadata: true
-#  in_cluster: true
 
 # Kubernetes events
 #- module: kubernetes

diff --git a/metricbeat/module/kubernetes/event/config.go b/metricbeat/module/kubernetes/event/config.go
@@ -18,12 +18,10 @@
 package event
 
 import (
-	"errors"
 	"time"
 )
 
 type kubeEventsConfig struct {
-	InCluster        bool          `config:"in_cluster"`
 	KubeConfig       string        `config:"kube_config"`
 	Namespace        string        `config:"namespace"`
 	SyncPeriod       time.Duration `config:"sync_period"`
@@ -37,16 +35,8 @@ type Enabled struct {
 
 func defaultKubernetesEventsConfig() kubeEventsConfig {
 	return kubeEventsConfig{
-		InCluster:        true,
 		SyncPeriod:       10 * time.Minute,
 		LabelsDedot:      true,
 		AnnotationsDedot: true,
 	}
 }
-
-func (c kubeEventsConfig) Validate() error {
-	if !c.InCluster && c.KubeConfig == "" {
-		return errors.New("`kube_config` path can't be empty when in_cluster is set to false")
-	}
-	return nil
-}
diff --git a/metricbeat/modules.d/kubernetes.yml.disabled b/metricbeat/modules.d/kubernetes.yml.disabled
@@ -19,11 +19,9 @@
 
   # Enriching parameters:
   #add_metadata: true
-  #in_cluster: true
   #labels.dedot: true
   #annotations.dedot: true
   # When used outside the cluster:
-  #in_cluster: false
   #host: node_name
   #kube_config: ~/.kube/config
 
@@ -39,7 +37,6 @@
 #  period: 10s
 #  hosts: ["kube-state-metrics:8080"]
 #  add_metadata: true
-#  in_cluster: true
 
 # Kubernetes events
 #- module: kubernetes

diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml
@@ -503,7 +503,6 @@ metricbeat.modules:
 
   # Enriching parameters:
   add_metadata: true
-  in_cluster: true
   # When used outside the cluster:
   #host: node_name
   #kube_config: ~/.kube/config
@@ -523,7 +522,6 @@ metricbeat.modules:
 
   # Enriching parameters:
   add_metadata: true
-  in_cluster: true
   # When used outside the cluster:
   #host: node_name
   #kube_config: ~/.kube/config