Merge fluent#37 into kustomize-base

Yolean · Aug 10, 2021 · fa55a41 · fa55a41
2 parents 46d321e + 36b3ab5
commit fa55a41
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/fluent-bit-daemonset-kafka-rest.yml b/fluent-bit-daemonset-kafka-rest.yml
@@ -4,8 +4,8 @@ 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:
   selector:
@@ -14,8 +14,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"
     spec:
       containers:

diff --git 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
@@ -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:
   selector:
@@ -14,8 +14,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/elasticsearch/fluent-bit-ds.yaml b/output/elasticsearch/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:
   selector:
@@ -14,8 +14,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-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
@@ -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:
@@ -16,8 +16,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
@@ -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:
@@ -16,8 +16,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"