update Beat and k8s spec versions

Author: DanRoscigno

beats-k8s-send-anywhere/filebeat-kubernetes.yaml

@@ -98,7 +98,7 @@ data:
       host: ${KIBANA_HOST}
     
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: filebeat-dynamic
@@ -107,6 +107,10 @@ metadata:
     k8s-app: filebeat-dynamic
     kubernetes.io/cluster-service: "true"
 spec:
+  selector:
+     matchLabels:
+       k8s-app: filebeat-dynamic
+       kubernetes.io/cluster-service: "true"
   template:
     metadata:
       labels:
@@ -117,7 +121,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
       - name: filebeat-dynamic
-        image: docker.elastic.co/beats/filebeat:7.6.2
+        image: docker.elastic.co/beats/filebeat:7.10.1
         imagePullPolicy: Always
         args: [
           "-c", "/etc/filebeat.yml",
@@ -194,7 +198,7 @@ spec:
       - name: data
         emptyDir: {}
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: filebeat-dynamic
@@ -207,7 +211,7 @@ roleRef:
   name: filebeat-dynamic
   apiGroup: rbac.authorization.k8s.io
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: filebeat-dynamic

beats-k8s-send-anywhere/metricbeat-kubernetes.yaml

@@ -41,7 +41,7 @@ spec:
       containers:
       - name: metricbeat-setup
         #imagePullPolicy: Always
-        image: docker.elastic.co/beats/metricbeat:7.6.2
+        image: docker.elastic.co/beats/metricbeat:7.10.1
         args: [
           "-c", "/etc/metricbeat.yml",
           "-e",
@@ -224,26 +224,29 @@ data:
 
 ---
 # Deploy a Metricbeat instance per node for node metrics retrieval
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: metricbeat
   namespace: kube-system
   labels:
     k8s-app: metricbeat
 spec:
+  selector:
+     matchLabels:
+       k8s-app: metricbeat-ds
   template:
     metadata:
       labels:
-        k8s-app: metricbeat
+        k8s-app: metricbeat-ds
     spec:
       serviceAccountName: metricbeat
       terminationGracePeriodSeconds: 30
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: metricbeat
-        image: docker.elastic.co/beats/metricbeat:7.6.2
+        image: docker.elastic.co/beats/metricbeat:7.10.1
         args: [
           "-c", "/etc/metricbeat.yml",
           "-e",
@@ -389,25 +392,28 @@ data:
       hosts: ["kube-state-metrics:8080"]
 ---
 # Deploy singleton instance in the whole cluster for some unique data sources, like kube-state-metrics
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: metricbeat
   namespace: kube-system
   labels:
     k8s-app: metricbeat
 spec:
+  selector:
+     matchLabels:
+       k8s-app: metricbeat-singleton
   template:
     metadata:
       labels:
-        k8s-app: metricbeat
+        k8s-app: metricbeat-singleton
     spec:
       serviceAccountName: metricbeat
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: metricbeat
-        image: docker.elastic.co/beats/metricbeat:7.6.2
+        image: docker.elastic.co/beats/metricbeat:7.10.1
         args: [
           "-c", "/etc/metricbeat.yml",
           "-e",
@@ -479,7 +485,7 @@ spec:
           defaultMode: 0600
           name: metricbeat-deployment-modules
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: metricbeat
@@ -492,7 +498,7 @@ roleRef:
   name: metricbeat
   apiGroup: rbac.authorization.k8s.io
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: metricbeat

beats-k8s-send-anywhere/packetbeat-kubernetes.yaml

@@ -81,28 +81,29 @@ data:
       host: ${KIBANA_HOST}
 
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: packetbeat-dynamic
+  name: packetbeat
   namespace: kube-system
   labels:
-    k8s-app: packetbeat-dynamic
-    kubernetes.io/cluster-service: "true"
+    k8s-app: packetbeat
 spec:
+  selector:
+     matchLabels:
+       k8s-app: packetbeat-dynamic
   template:
     metadata:
       labels:
         k8s-app: packetbeat-dynamic
-        kubernetes.io/cluster-service: "true"
     spec:
       serviceAccountName: packetbeat-dynamic
       terminationGracePeriodSeconds: 30
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: packetbeat-dynamic
-        image: docker.elastic.co/beats/packetbeat:7.6.2
+        image: docker.elastic.co/beats/packetbeat:7.10.1
         imagePullPolicy: Always
         args: [
           "-c", "/etc/packetbeat.yml",
@@ -165,7 +166,7 @@ spec:
       - name: data
         emptyDir: {}
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: packetbeat-dynamic
@@ -178,7 +179,7 @@ roleRef:
   name: packetbeat-dynamic
   apiGroup: rbac.authorization.k8s.io
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: packetbeat-dynamic