Formatting and add namespace

carlosedp · carlosedp · commit 00adfa794e7a · 2019-02-05T10:48:00.000-02:00
diff --git a/cerebro-external-ingress.yaml b/cerebro-external-ingress.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
diff --git a/cerebro.yaml b/cerebro.yaml
@@ -1,7 +1,9 @@
+---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: cerebro-pv-claim
+  namespace: logging
   labels:
     component: elk
     role: cerebro
@@ -16,6 +18,7 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   name: cerebro
+  namespace: logging
   labels:
     component: elk
     role: cerebro
@@ -49,6 +52,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: cerebro
+  namespace: logging
   labels:
     component: elk
     role: cerebro
@@ -67,6 +71,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: cerebro
+  namespace: logging
   annotations:
     traefik.frontend.rule.type: PathPrefix
 spec:
diff --git a/elasticsearch-hq.yaml b/elasticsearch-hq.yaml
@@ -1,7 +1,9 @@
+---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: elasticsearch-hq-pv-claim
+  namespace: logging
   labels:
     component: elk
     role: elasticsearch-hq
@@ -16,6 +18,7 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   name: elasticsearch-hq
+  namespace: logging
   labels:
     component: elk
     role: elasticsearch-hq
@@ -54,6 +57,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: elasticsearch-hq
+  namespace: logging
   labels:
     component: elk
     role: elasticsearch-hq
@@ -72,6 +76,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: elasticsearch-hq
+  namespace: logging
   annotations:
     traefik.frontend.rule.type: PathPrefix
 spec:
diff --git a/es-configmap.yaml b/es-configmap.yaml
@@ -1,4 +1,9 @@
+---
 apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: es-configmap
+  namespace: logging
 data:
   elasticsearch.yml: |
     cluster:
@@ -42,7 +47,3 @@ data:
     cluster.routing.rebalance.enable: all
     cluster.routing.allocation.allow_rebalance: all
 
-kind: ConfigMap
-metadata:
-  creationTimestamp: null
-  name: es-configmap
diff --git a/es-curator-configmap.yaml b/es-curator-configmap.yaml
@@ -1,7 +1,9 @@
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: curator-config
+  namespace: logging
 data:
   action_file.yml: |-
     ---
diff --git a/es-curator-cronjob.yaml b/es-curator-cronjob.yaml
@@ -1,7 +1,9 @@
+---
 apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: curator
+  namespace: logging
 spec:
   schedule: 0 8 * * *
   jobTemplate:
diff --git a/es-full-statefulset.yaml b/es-full-statefulset.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
diff --git a/es-full-svc.yaml b/es-full-svc.yaml
@@ -1,7 +1,9 @@
+---
 apiVersion: v1
 kind: Service
 metadata:
   name: elasticsearch
+  namespace: logging
   labels:
     component: elasticsearch
     role: full
@@ -18,6 +20,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: elasticsearch
+  namespace: logging
   annotations:
     traefik.frontend.rule.type: PathPrefix
 spec:
@@ -34,6 +37,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: elasticsearch-discovery
+  namespace: logging
   labels:
     component: elasticsearch
     role: full
diff --git a/fluentd-configmap.yaml b/fluentd-configmap.yaml
@@ -1,5 +1,6 @@
-kind: ConfigMap
+---
 apiVersion: v1
+kind: ConfigMap
 metadata:
   name: fluentd-es-config
   namespace: logging
diff --git a/fluentd-daemonset.yaml b/fluentd-daemonset.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/kibana-configmap.yaml b/kibana-configmap.yaml
@@ -1,4 +1,10 @@
+---
 apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kibana-config
+  namespace: logging
+  creationTimestamp: null
 data:
   kibana.yml: |+
     # Kibana is served by a back end server. This setting specifies the port to use.
@@ -133,7 +139,3 @@ data:
         }
       ]
     }
-kind: ConfigMap
-metadata:
-  creationTimestamp: null
-  name: kibana-config
diff --git a/kibana-deployment.yaml b/kibana-deployment.yaml
@@ -3,11 +3,13 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: elk
+  namespace: logging
 ---
 apiVersion: v1
 kind: ReplicationController
 metadata:
   name: kibana
+  namespace: logging
   labels:
     component: elk
     role: kibana
diff --git a/kibana-external-ingress.yaml b/kibana-external-ingress.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
diff --git a/kibana-svc.yaml b/kibana-svc.yaml
@@ -1,7 +1,9 @@
+---
 apiVersion: v1
 kind: Service
 metadata:
   name: kibana
+namespace: logging
   labels:
     component: elk
     role: kibana
@@ -20,6 +22,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: kibana
+  namespace: logging
   annotations:
     traefik.frontend.rule.type: PathPrefix
 spec:
diff --git a/separate-roles/es-data-statefulset.yaml b/separate-roles/es-data-statefulset.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
diff --git a/separate-roles/es-data-svc.yaml b/separate-roles/es-data-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: elasticsearch-data-discovery
+  namespace: logging
   labels:
     component: elasticsearch
     role: data
@@ -19,6 +20,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: elasticsearch-data-api
+  namespace: logging
   labels:
     component: elasticsearch
     role: data
diff --git a/separate-roles/es-ingest-statefulset.yaml b/separate-roles/es-ingest-statefulset.yaml
@@ -1,7 +1,9 @@
+---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: es-ingest
+  namespace: logging
   labels:
     component: elasticsearch
     role: ingest
diff --git a/separate-roles/es-ingest-svc.yaml b/separate-roles/es-ingest-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: elasticsearch
+  namespace: logging
   labels:
     component: elasticsearch
     role: ingest
@@ -19,6 +20,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: elasticsearch-ingest-discovery
+  namespace: logging
   labels:
     component: elasticsearch
     role: ingest
@@ -36,6 +38,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: elasticsearch
+  namespace: logging
   annotations:
     traefik.frontend.rule.type: PathPrefix
 spec:
diff --git a/separate-roles/es-master-statefulset.yaml b/separate-roles/es-master-statefulset.yaml
@@ -1,7 +1,9 @@
+---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: es-master
+  namespace: logging
   labels:
     component: elasticsearch
     role: master
diff --git a/separate-roles/es-master-svc.yaml b/separate-roles/es-master-svc.yaml
@@ -1,7 +1,9 @@
+---
 apiVersion: v1
 kind: Service
 metadata:
   name: elasticsearch-discovery
+  namespace: logging
   labels:
     component: elasticsearch
     role: master
@@ -19,6 +21,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: elasticsearch-master-api
+  namespace: logging
   labels:
     component: elasticsearch
     role: master

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`apiVersion: extensions/v1beta1`
`2`	`3`	`kind: Ingress`
`3`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`apiVersion: apps/v1`
`2`	`3`	`kind: StatefulSet`
`3`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`apiVersion: v1`
`2`	`3`	`kind: ServiceAccount`
`3`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,10 @@`
	`1`	`+---`
`1`	`2`	`apiVersion: v1`
	`3`	`+kind: ConfigMap`
	`4`	`+metadata:`
	`5`	`+ name: kibana-config`
	`6`	`+ namespace: logging`
	`7`	`+ creationTimestamp: null`
`2`	`8`	`data:`
`3`	`9`	`kibana.yml: \|+`
`4`	`10`	`# Kibana is served by a back end server. This setting specifies the port to use.`
`@@ -133,7 +139,3 @@ data:`
`133`	`139`	`}`
`134`	`140`	`]`
`135`	`141`	`}`
`136`		`-kind: ConfigMap`
`137`		`-metadata:`
`138`		`- creationTimestamp: null`
`139`		`- name: kibana-config`