Tidy up recipes after code review comments

elastic · Apr 28, 2023 · d92d0cc · d92d0cc
1 parent 4f874b1
commit d92d0cc
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 292 deletions.
diff --git a/config/recipes/logstash/README.asciidoc b/config/recipes/logstash/README.asciidoc
@@ -14,11 +14,11 @@ These recipes demonstrate how to run Logstash, Elasticsearch, Kibana and Filebea
 
 Deploys Logstash with the pipeline defined inline in the CRD.
 
-===== Pipeline as secret - `logstash-pipelinesecret.yaml`
+===== Pipeline as secret - `logstash-pipeline-as-secret.yaml`
 
 Deploys Logstash with the pipeline defined in a Secret and referred to via `pipelinesRef`.
 
-===== Pipeline as mounted volume - `logstash-pipelinevolume.yaml`
+===== Pipeline as mounted volume - `logstash-pipeline-as-volume.yaml`
 
 Deploys Logstash with the pipeline details defined in the CRD, and the pipeline itself mounted as a volume.
 

diff --git a/config/recipes/logstash/logstash-eck.yaml b/config/recipes/logstash/logstash-eck.yaml
@@ -3,9 +3,6 @@ apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: elasticsearch
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: elasticsearch
 spec:
   version: 8.7.0
   nodeSets:
@@ -19,9 +16,6 @@ apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: kibana
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: kibana
 spec:
   version: 8.7.0
   count: 1
@@ -32,9 +26,6 @@ apiVersion: beat.k8s.elastic.co/v1beta1
 kind: Beat
 metadata:
   name: filebeat
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: filebeat
 spec:
   type: filebeat
   version: 8.7.0
@@ -47,10 +38,6 @@ spec:
       hosts: ["logstash-ls-api.default.svc:5044"]
   deployment:
     podTemplate:
-      metadata:
-        labels:
-          app.kubernetes.io/name: eck-logstash
-          app.kubernetes.io/component: filebeat
       spec:
         automountServiceAccountToken: true
         initContainers:
@@ -78,9 +65,6 @@ apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: logstash
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: logstash
 spec:
   count: 1
   version: 8.7.0

diff --git a/config/recipes/logstash/logstash-monitored.yaml b/config/recipes/logstash/logstash-monitored.yaml
@@ -3,9 +3,6 @@ apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: elasticsearch
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: elasticsearch
 spec:
   version: 8.7.0
   nodeSets:
@@ -19,9 +16,6 @@ apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: kibana
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: kibana
 spec:
   version: 8.7.0
   count: 1
@@ -32,9 +26,6 @@ apiVersion: beat.k8s.elastic.co/v1beta1
 kind: Beat
 metadata:
   name: filebeat
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: filebeat
 spec:
   type: filebeat
   version: 8.7.0
@@ -47,10 +38,6 @@ spec:
       hosts: ["logstash-ls-api.default.svc:5044"]
   deployment:
     podTemplate:
-      metadata:
-        labels:
-          app.kubernetes.io/name: eck-logstash
-          app.kubernetes.io/component: filebeat
       spec:
         automountServiceAccountToken: true
         initContainers:
@@ -78,9 +65,6 @@ apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: logstash
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: logstash
 spec:
   count: 1
   version: 8.7.0
@@ -148,7 +132,3 @@ spec:
   count: 1
   elasticsearchRef:
     name: elasticsearch-monitoring
-  config:
-    # enable the UI to reflect container level CPU usage, only displays info if CPU limits are set on the monitored ES cluster
-    # https://www.elastic.co/guide/en/kibana/current/monitoring-settings-kb.html
-    monitoring.ui.container.elasticsearch.enabled: true
diff --git a/config/recipes/logstash/logstash-multi.yaml b/config/recipes/logstash/logstash-multi.yaml
@@ -11,9 +11,6 @@ kind: Elasticsearch
 metadata:
   name: qa
   namespace: qa
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: elasticsearch
 spec:
   version: 8.7.0
   nodeSets:
@@ -28,9 +25,6 @@ kind: Kibana
 metadata:
   name: qa
   namespace: qa
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: kibana
 spec:
   version: 8.7.0
   count: 1
@@ -41,9 +35,6 @@ apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: production
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: elasticsearch
 spec:
   version: 8.7.0
   nodeSets:
@@ -57,9 +48,6 @@ apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: production
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: kibana
 spec:
   version: 8.7.0
   count: 1
@@ -70,9 +58,6 @@ apiVersion: beat.k8s.elastic.co/v1beta1
 kind: Beat
 metadata:
   name: filebeat
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: filebeat
 spec:
   type: filebeat
   version: 8.7.0
@@ -85,10 +70,6 @@ spec:
       hosts: ["logstash-ls-api.default.svc:5044"]
   deployment:
     podTemplate:
-      metadata:
-        labels:
-          app.kubernetes.io/name: eck-logstash
-          app.kubernetes.io/component: filebeat
       spec:
         automountServiceAccountToken: true
         initContainers:
@@ -116,9 +97,6 @@ apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: logstash
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: logstash
 spec:
   count: 1
   version: 8.7.0
@@ -218,8 +196,4 @@ spec:
   version: 8.7.0
   count: 1
   elasticsearchRef:
-    name: elasticsearch-monitoring
-  config:
-    # enable the UI to reflect container level CPU usage, only displays info if CPU limits are set on the monitored ES cluster
-    # https://www.elastic.co/guide/en/kibana/current/monitoring-settings-kb.html
-    monitoring.ui.container.elasticsearch.enabled: true
+    name: elasticsearch-monitoring
diff --git a/...pes/logstash/logstash-pipelinesecret.yaml → ...logstash/logstash-pipeline-as-secret.yaml b/...pes/logstash/logstash-pipelinesecret.yaml → ...logstash/logstash-pipeline-as-secret.yaml
@@ -3,9 +3,6 @@ apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: elasticsearch
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: elasticsearch
 spec:
   version: 8.7.0
   nodeSets:
@@ -19,9 +16,6 @@ apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: kibana
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: kibana
 spec:
   version: 8.7.0
   count: 1
@@ -32,9 +26,6 @@ apiVersion: beat.k8s.elastic.co/v1beta1
 kind: Beat
 metadata:
   name: filebeat
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: filebeat
 spec:
   type: filebeat
   version: 8.7.0
@@ -47,10 +38,6 @@ spec:
       hosts: ["logstash-ls-api.default.svc:5044"]
   deployment:
     podTemplate:
-      metadata:
-        labels:
-          app.kubernetes.io/name: eck-logstash
-          app.kubernetes.io/component: filebeat
       spec:
         automountServiceAccountToken: true
         initContainers:
@@ -78,9 +65,6 @@ apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: logstash
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: logstash
 spec:
   count: 1
   version: 8.7.0
@@ -104,8 +88,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: logstash-pipeline
-  labels:
-    app.kubernetes.io/name: eck-logstash
 stringData:
   pipelines.yml: |-
     - pipeline.id: main

diff --git a/...pes/logstash/logstash-pipelinevolume.yaml → ...logstash/logstash-pipeline-as-volume.yaml b/...pes/logstash/logstash-pipelinevolume.yaml → ...logstash/logstash-pipeline-as-volume.yaml
@@ -3,9 +3,6 @@ apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: elasticsearch
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: elasticsearch
 spec:
   version: 8.7.0
   nodeSets:
@@ -19,9 +16,6 @@ apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: kibana
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: kibana
 spec:
   version: 8.7.0
   count: 1
@@ -32,9 +26,6 @@ apiVersion: beat.k8s.elastic.co/v1beta1
 kind: Beat
 metadata:
   name: filebeat
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: filebeat
 spec:
   type: filebeat
   version: 8.7.0
@@ -47,10 +38,6 @@ spec:
       hosts: ["logstash-ls-api.default.svc:5044"]
   deployment:
     podTemplate:
-      metadata:
-        labels:
-          app.kubernetes.io/name: eck-logstash
-          app.kubernetes.io/component: filebeat
       spec:
         automountServiceAccountToken: true
         initContainers:
@@ -78,9 +65,6 @@ apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: logstash
-  labels:
-    app.kubernetes.io/name: eck-logstash
-    app.kubernetes.io/component: logstash
 spec:
   count: 1
   version: 8.7.0
@@ -117,8 +101,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: logstash-pipeline
-  labels:
-    app.kubernetes.io/name: eck-logstash
 stringData:
   input.conf: |-
     input {