From 36b3ab50d358c1b87dc0537fbeba8513684403d9 Mon Sep 17 00:00:00 2001
From: Karl Skewes <karl.skewes@gmail.com>
Date: Sun, 4 Nov 2018 09:02:30 +1300
Subject: [PATCH] Update labels to Kubernetes recommended naming scheme

Signed-off-by: Karl Skewes <karl.skewes@gmail.com>
---
 fluent-bit-daemonset-kafka-rest.yml              | 8 ++++----
 output/elasticsearch/fluent-bit-configmap.yaml   | 2 +-
 output/elasticsearch/fluent-bit-ds-minikube.yaml | 8 ++++----
 output/elasticsearch/fluent-bit-ds.yaml          | 8 ++++----
 output/kafka/fluent-bit-configmap.yaml           | 2 +-
 output/kafka/fluent-bit-ds-minikube.yaml         | 8 ++++----
 output/kafka/fluent-bit-ds.yaml                  | 8 ++++----
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/fluent-bit-daemonset-kafka-rest.yml b/fluent-bit-daemonset-kafka-rest.yml
index 1ce18d1..92fa14c 100644
--- a/fluent-bit-daemonset-kafka-rest.yml
+++ b/fluent-bit-daemonset-kafka-rest.yml
@@ -4,15 +4,15 @@ metadata:
   name: fluent-bit
   namespace: kube-system
   labels:
-    k8s-app: fluent-bit-logging
-    version: v1
+    app.kubernetes.io/name: fluent-bit-logging
+    app.kubernetes.io/version: v1
     kubernetes.io/cluster-service: "true"
 spec:
   template:
     metadata:
       labels:
-        k8s-app: fluent-bit-logging
-        version: v1
+        app.kubernetes.io/name: fluent-bit-logging
+        app.kubernetes.io/version: v1
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
diff --git a/output/elasticsearch/fluent-bit-configmap.yaml b/output/elasticsearch/fluent-bit-configmap.yaml
index df13d5e..2576a8c 100644
--- a/output/elasticsearch/fluent-bit-configmap.yaml
+++ b/output/elasticsearch/fluent-bit-configmap.yaml
@@ -4,7 +4,7 @@ metadata:
   name: fluent-bit-config
   namespace: logging
   labels:
-    k8s-app: fluent-bit
+    app.kubernetes.io/name: fluent-bit
 data:
   # Configuration files: server, input, filters and output
   # ======================================================
diff --git a/output/elasticsearch/fluent-bit-ds-minikube.yaml b/output/elasticsearch/fluent-bit-ds-minikube.yaml
index f9a2838..dba4082 100644
--- a/output/elasticsearch/fluent-bit-ds-minikube.yaml
+++ b/output/elasticsearch/fluent-bit-ds-minikube.yaml
@@ -4,15 +4,15 @@ metadata:
   name: fluent-bit
   namespace: logging
   labels:
-    k8s-app: fluent-bit-logging
-    version: v1
+    app.kubernetes.io/name: fluent-bit-logging
+    app.kubernetes.io/version: v1
     kubernetes.io/cluster-service: "true"
 spec:
   template:
     metadata:
       labels:
-        k8s-app: fluent-bit-logging
-        version: v1
+        app.kubernetes.io/name: fluent-bit-logging
+        app.kubernetes.io/version: v1
         kubernetes.io/cluster-service: "true"
       annotations:
         prometheus.io/scrape: "true"
diff --git a/output/elasticsearch/fluent-bit-ds.yaml b/output/elasticsearch/fluent-bit-ds.yaml
index 0754df4..9bbe000 100644
--- a/output/elasticsearch/fluent-bit-ds.yaml
+++ b/output/elasticsearch/fluent-bit-ds.yaml
@@ -4,15 +4,15 @@ metadata:
   name: fluent-bit
   namespace: logging
   labels:
-    k8s-app: fluent-bit-logging
-    version: v1
+    app.kubernetes.io/name: fluent-bit-logging
+    app.kubernetes.io/version: v1
     kubernetes.io/cluster-service: "true"
 spec:
   template:
     metadata:
       labels:
-        k8s-app: fluent-bit-logging
-        version: v1
+        app.kubernetes.io/name: fluent-bit-logging
+        app.kubernetes.io/version: v1
         kubernetes.io/cluster-service: "true"
       annotations:
         prometheus.io/scrape: "true"
diff --git a/output/kafka/fluent-bit-configmap.yaml b/output/kafka/fluent-bit-configmap.yaml
index ff5bccb..2085a69 100644
--- a/output/kafka/fluent-bit-configmap.yaml
+++ b/output/kafka/fluent-bit-configmap.yaml
@@ -4,7 +4,7 @@ metadata:
   name: fluent-bit-config
   namespace: logging
   labels:
-    k8s-app: fluent-bit
+    app.kubernetes.io/name: fluent-bit
 data:
   # Configuration files: server, input, filters and output
   # ======================================================
diff --git a/output/kafka/fluent-bit-ds-minikube.yaml b/output/kafka/fluent-bit-ds-minikube.yaml
index 44f71e8..a86e912 100644
--- a/output/kafka/fluent-bit-ds-minikube.yaml
+++ b/output/kafka/fluent-bit-ds-minikube.yaml
@@ -4,8 +4,8 @@ metadata:
   name: fluent-bit
   namespace: logging
   labels:
-    k8s-app: fluent-bit-logging
-    version: v1
+    app.kubernetes.io/name: fluent-bit-logging
+    app.kubernetes.io/version: v1
     kubernetes.io/cluster-service: "true"
 spec:
   updateStrategy:
@@ -13,8 +13,8 @@ spec:
   template:
     metadata:
       labels:
-        k8s-app: fluent-bit-logging
-        version: v1
+        app.kubernetes.io/name: fluent-bit-logging
+        app.kubernetes.io/version: v1
         kubernetes.io/cluster-service: "true"
       annotations:
         prometheus.io/scrape: "true"
diff --git a/output/kafka/fluent-bit-ds.yaml b/output/kafka/fluent-bit-ds.yaml
index 67931b7..f3e1962 100644
--- a/output/kafka/fluent-bit-ds.yaml
+++ b/output/kafka/fluent-bit-ds.yaml
@@ -4,8 +4,8 @@ metadata:
   name: fluent-bit
   namespace: logging
   labels:
-    k8s-app: fluent-bit-logging
-    version: v1
+    app.kubernetes.io/name: fluent-bit-logging
+    app.kubernetes.io/version: v1
     kubernetes.io/cluster-service: "true"
 spec:
   updateStrategy:
@@ -13,8 +13,8 @@ spec:
   template:
     metadata:
       labels:
-        k8s-app: fluent-bit-logging
-        version: v1
+        app.kubernetes.io/name: fluent-bit-logging
+        app.kubernetes.io/version: v1
         kubernetes.io/cluster-service: "true"
       annotations:
         prometheus.io/scrape: "true"