Update metricbeat-kubernetes.yaml

elastic · Oct 15, 2024 · 5870919 · 5870919
1 parent 6c1481d
commit 5870919
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/deploy/kubernetes/metricbeat-kubernetes.yaml b/deploy/kubernetes/metricbeat-kubernetes.yaml
@@ -291,11 +291,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: metricbeat
-<<<<<<< HEAD
-        image: docker.elastic.co/beats/metricbeat:8.16.0
-=======
-        image: docker.elastic.co/beats/metricbeat-wolfi:9.0.0
->>>>>>> 3492089397 (Switch K8s tests to Wolfi by default and make it configurable (#41222))
+        image: docker.elastic.co/beats/metricbeat-wolfi:8.16.0
         args: [
           "-c", "/etc/metricbeat.yml",
           "-e",