From af2647a0a45d9d8b8a0bbf71746cbb94b86bc9ed Mon Sep 17 00:00:00 2001
From: Jeff Billimek <jeff@billimek.com>
Date: Tue, 23 Jun 2020 20:28:31 -0400
Subject: [PATCH] fix label selector for affinity rules

Signed-off-by: Jeff Billimek <jeff@billimek.com>
---
 helm/vernemq/Chart.yaml                 |  2 +-
 helm/vernemq/templates/statefulset.yaml | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/helm/vernemq/Chart.yaml b/helm/vernemq/Chart.yaml
index b56651e..c23f9f4 100644
--- a/helm/vernemq/Chart.yaml
+++ b/helm/vernemq/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v1
 appVersion: 1.10.3
 description: VerneMQ is a high-performance, distributed MQTT message broker
 name: vernemq
-version: 1.6.3
+version: 1.6.4
 icon: http://www.stickpng.com/assets/thumbs/58482b21cef1014c0b5e4a24.png
diff --git a/helm/vernemq/templates/statefulset.yaml b/helm/vernemq/templates/statefulset.yaml
index a886fe8..6b2377d 100644
--- a/helm/vernemq/templates/statefulset.yaml
+++ b/helm/vernemq/templates/statefulset.yaml
@@ -129,14 +129,10 @@ spec:
             - topologyKey: "kubernetes.io/hostname"
               labelSelector:
                 matchExpressions:
-                  - key: "app"
+                  - key: "app.kubernetes.io/name"
                     operator: In
                     values:
                       - {{ include "vernemq.name" . }}
-                  - key: "release"
-                    operator: In
-                    values:
-                      - {{ .Release.Name }}
     {{- else if eq .Values.podAntiAffinity "soft" }}
       affinity:
         podAntiAffinity:
@@ -146,14 +142,10 @@ spec:
                 topologyKey: "kubernetes.io/hostname"
                 labelSelector:
                   matchExpressions:
-                    - key: "app"
+                    - key: "app.kubernetes.io/name"
                       operator: In
                       values:
                         - {{ include "vernemq.name" . }}
-                    - key: "release"
-                      operator: In
-                      values:
-                        - {{ .Release.Name }}
     {{- end }}
     {{- with .Values.tolerations }}
       tolerations: