Update labels to use kubernetes recommended labels

Kubernetes have not used the `app` or `k8s-app` for some time and have provided guidance on what the recommended labels are for some time as seen in their [docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/). This commit updates all manifests/docs to use this approach.
elastic · May 9, 2024 · 0832609 · 0832609
1 parent b2532cf
commit 0832609
Show file tree

Hide file tree

Showing 49 changed files with 220 additions and 220 deletions.
diff --git a/...c-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/...c-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
@@ -5,15 +5,15 @@ metadata:
   name: elastic-agent
   namespace: kube-system
   labels:
-    app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
 spec:
   selector:
     matchLabels:
-      app: elastic-agent
+      app.kubernetes.io/name: elastic-agent
   template:
     metadata:
       labels:
-        app: elastic-agent
+        app.kubernetes.io/name: elastic-agent
     spec:
       # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes.
       # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes

diff --git a/...lastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-role.yaml b/...lastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-role.yaml
@@ -3,7 +3,7 @@ kind: ClusterRole
 metadata:
   name: elastic-agent
   labels:
-    k8s-app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
 rules:
   - apiGroups: [""]
     resources:
@@ -75,7 +75,7 @@ metadata:
   # Should be the namespace where elastic-agent is running
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
 rules:
   - apiGroups:
       - coordination.k8s.io
@@ -89,7 +89,7 @@ metadata:
   name: elastic-agent-kubeadm-config
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
 rules:
   - apiGroups: [""]
     resources:

diff --git a/...t-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-service-account.yaml b/...t-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-service-account.yaml
@@ -4,4 +4,4 @@ metadata:
   name: elastic-agent
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
diff --git a/...e/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset-configmap.yaml b/...e/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset-configmap.yaml
@@ -5,7 +5,7 @@ metadata:
   name: agent-node-datastreams
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 data:
   agent.yml: |-
     outputs:

diff --git a/...t-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/...t-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
@@ -5,15 +5,15 @@ metadata:
   name: elastic-agent-standalone
   namespace: kube-system
   labels:
-    app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 spec:
   selector:
     matchLabels:
-      app: elastic-agent-standalone
+      app.kubernetes.io/name: elastic-agent-standalone
   template:
     metadata:
       labels:
-        app: elastic-agent-standalone
+        app.kubernetes.io/name: elastic-agent-standalone
     spec:
       # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes.
       # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes

diff --git a/...fault/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml b/...fault/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml
@@ -6,7 +6,7 @@ metadata:
   name: agent-node-datastreams
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 data:
   agent.yml: |-
     outputs:

diff --git a/...ult/elastic-agent-standalone/base/elastic-agent-standalone-ksm-statefulset-configmap.yaml b/...ult/elastic-agent-standalone/base/elastic-agent-standalone-ksm-statefulset-configmap.yaml
@@ -6,7 +6,7 @@ metadata:
   name: agent-ksm-datastreams
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 data:
   agent.yml: |-
     outputs:

diff --git a/...-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-role.yaml b/...-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-role.yaml
@@ -3,7 +3,7 @@ kind: ClusterRole
 metadata:
   name: elastic-agent-standalone
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 rules:
   - apiGroups: [""]
     resources:
@@ -75,7 +75,7 @@ metadata:
   # Should be the namespace where elastic-agent is running
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 rules:
   - apiGroups:
       - coordination.k8s.io
@@ -89,7 +89,7 @@ metadata:
   name: elastic-agent-standalone-kubeadm-config
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 rules:
   - apiGroups: [""]
     resources:

diff --git a/...omize/default/elastic-agent-standalone/base/elastic-agent-standalone-service-account.yaml b/...omize/default/elastic-agent-standalone/base/elastic-agent-standalone-service-account.yaml
@@ -4,4 +4,4 @@ metadata:
   name: elastic-agent-standalone
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
diff --git a/...ustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/...ustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
@@ -5,15 +5,15 @@ metadata:
   name: elastic-agent
   namespace: kube-system
   labels:
-    app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
 spec:
   selector:
     matchLabels:
-      app: elastic-agent
+      app.kubernetes.io/name: elastic-agent
   template:
     metadata:
       labels:
-        app: elastic-agent
+        app.kubernetes.io/name: elastic-agent
     spec:
       # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes.
       # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes

diff --git a/...ent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-role.yaml b/...ent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-role.yaml
@@ -3,7 +3,7 @@ kind: ClusterRole
 metadata:
   name: elastic-agent
   labels:
-    k8s-app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
 rules:
   - apiGroups: [""]
     resources:
@@ -75,7 +75,7 @@ metadata:
   # Should be the namespace where elastic-agent is running
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
 rules:
   - apiGroups:
       - coordination.k8s.io
@@ -89,7 +89,7 @@ metadata:
   name: elastic-agent-kubeadm-config
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
 rules:
   - apiGroups: [""]
     resources:

diff --git a/...ze/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-service-account.yaml b/...ze/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-service-account.yaml
@@ -4,4 +4,4 @@ metadata:
   name: elastic-agent
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
diff --git a/...omize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml b/...omize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml
@@ -5,15 +5,15 @@ metadata:
   name: elastic-agent
   namespace: kube-system
   labels:
-    app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
 spec:
   selector:
     matchLabels:
-      app: elastic-agent
+      app.kubernetes.io/name: elastic-agent
   template:
     metadata:
       labels:
-        app: elastic-agent
+        app.kubernetes.io/name: elastic-agent
     spec:
       # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes.
       # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes

diff --git a/...ze/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/...ze/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
@@ -5,15 +5,15 @@ metadata:
   name: elastic-agent-standalone
   namespace: kube-system
   labels:
-    app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 spec:
   selector:
     matchLabels:
-      app: elastic-agent-standalone
+      app.kubernetes.io/name: elastic-agent-standalone
   template:
     metadata:
       labels:
-        app: elastic-agent-standalone
+        app.kubernetes.io/name: elastic-agent-standalone
     spec:
       # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes.
       # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes
@@ -63,7 +63,7 @@ spec:
                   fieldPath: metadata.name
             - name: STATE_PATH
               value: "/etc/elastic-agent"
-            # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac.  
+            # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac.
             # For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html
             - name: ELASTIC_NETINFO
               value: "false"

diff --git a/...rding/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml b/...rding/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml
@@ -6,7 +6,7 @@ metadata:
   name: agent-node-datastreams
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 data:
   agent.yml: |-
     outputs:

diff --git a/...ing/elastic-agent-standalone/base/elastic-agent-standalone-ksm-statefulset-configmap.yaml b/...ing/elastic-agent-standalone/base/elastic-agent-standalone-ksm-statefulset-configmap.yaml
@@ -6,7 +6,7 @@ metadata:
   name: agent-ksm-datastreams
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 data:
   agent.yml: |-
     outputs:

diff --git a/...stomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-role.yaml b/...stomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-role.yaml
@@ -3,7 +3,7 @@ kind: ClusterRole
 metadata:
   name: elastic-agent-standalone
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 rules:
   - apiGroups: [""]
     resources:
@@ -75,7 +75,7 @@ metadata:
   # Should be the namespace where elastic-agent is running
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 rules:
   - apiGroups:
       - coordination.k8s.io
@@ -89,7 +89,7 @@ metadata:
   name: elastic-agent-standalone-kubeadm-config
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 rules:
   - apiGroups: [""]
     resources:

diff --git a/...-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-service-account.yaml b/...-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-service-account.yaml
@@ -4,4 +4,4 @@ metadata:
   name: elastic-agent-standalone
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
diff --git a/...ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml b/...ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml
@@ -5,15 +5,15 @@ metadata:
   name: elastic-agent-standalone
   namespace: kube-system
   labels:
-    app: elastic-agent-standalone
+    app.kubernetes.io/name: elastic-agent-standalone
 spec:
   selector:
     matchLabels:
-      app: elastic-agent-standalone
+      app.kubernetes.io/name: elastic-agent-standalone
   template:
     metadata:
       labels:
-        app: elastic-agent-standalone
+        app.kubernetes.io/name: elastic-agent-standalone
     spec:
       # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes.
       # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes
@@ -63,7 +63,7 @@ spec:
                   fieldPath: metadata.name
             - name: STATE_PATH
               value: "/etc/elastic-agent"
-            # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac.  
+            # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac.
             # For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html
             - name: ELASTIC_NETINFO
               value: "false"

diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
@@ -5,15 +5,15 @@ metadata:
   name: elastic-agent
   namespace: kube-system
   labels:
-    app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
 spec:
   selector:
     matchLabels:
-      app: elastic-agent
+      app.kubernetes.io/name: elastic-agent
   template:
     metadata:
       labels:
-        app: elastic-agent
+        app.kubernetes.io/name: elastic-agent
     spec:
       # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes.
       # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes
@@ -212,7 +212,7 @@ kind: ClusterRole
 metadata:
   name: elastic-agent
   labels:
-    k8s-app: elastic-agent
+    app.kubernetes.io/name.kubernetes.io/name: elastic-agent
 rules:
   - apiGroups: [""]
     resources:
@@ -284,7 +284,7 @@ metadata:
   # Should be the namespace where elastic-agent is running
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent
+    app.kubernetes.io/name.kubernetes.io/name: elastic-agent
 rules:
   - apiGroups:
       - coordination.k8s.io
@@ -298,7 +298,7 @@ metadata:
   name: elastic-agent-kubeadm-config
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent
+    app.kubernetes.io/name.kubernetes.io/name: elastic-agent
 rules:
   - apiGroups: [""]
     resources:
@@ -313,5 +313,5 @@ metadata:
   name: elastic-agent
   namespace: kube-system
   labels:
-    k8s-app: elastic-agent
+    app.kubernetes.io/name.kubernetes.io/name: elastic-agent
 ---
diff --git a/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml
@@ -5,15 +5,15 @@ metadata:
   name: elastic-agent
   namespace: kube-system
   labels:
-    app: elastic-agent
+    app.kubernetes.io/name: elastic-agent
 spec:
   selector:
     matchLabels:
-      app: elastic-agent
+      app.kubernetes.io/name: elastic-agent
   template:
     metadata:
       labels:
-        app: elastic-agent
+        app.kubernetes.io/name: elastic-agent
     spec:
       # Tolerations are needed to run Elastic Agent on Kubernetes control-plane nodes.
       # Agents running on control-plane nodes collect metrics from the control plane components (scheduler, controller manager) of Kubernetes