From ff31ec7ad967897abfbb48c891332111f22b0c8e Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Tue, 9 Apr 2019 08:48:57 -0500 Subject: [PATCH] Add selector.matchLabel key to packetbeat and apm-server This adds the selector.matchLabel key to the packetbeat daemonset and the elastic-apm-server deployment templates as it's a required field for apps/v1 Change-Id: Idcc639b49b34579508e77a03f814dcf45ecf667c --- elastic-apm-server/templates/deployment.yaml | 5 +++++ elastic-packetbeat/templates/daemonset.yaml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/elastic-apm-server/templates/deployment.yaml b/elastic-apm-server/templates/deployment.yaml index 7e037d3fb..f94916828 100644 --- a/elastic-apm-server/templates/deployment.yaml +++ b/elastic-apm-server/templates/deployment.yaml @@ -54,7 +54,12 @@ apiVersion: apps/v1 kind: Deployment metadata: name: elastic-apm-server + labels: +{{ tuple $envAll "elastic-apm-server" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: + selector: + matchLabels: +{{ tuple $envAll "elastic-apm-server" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }} {{ tuple $envAll "elastic-apm-server" | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }} template: metadata: diff --git a/elastic-packetbeat/templates/daemonset.yaml b/elastic-packetbeat/templates/daemonset.yaml index bde34b3f3..a3d167ad9 100644 --- a/elastic-packetbeat/templates/daemonset.yaml +++ b/elastic-packetbeat/templates/daemonset.yaml @@ -77,6 +77,9 @@ kind: DaemonSet metadata: name: packetbeat spec: + selector: + matchLabels: +{{ tuple $envAll "packetbeat" "daemon" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }} {{ tuple $envAll "packetbeat" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} template: metadata: