From e677d7f936a7fb7d97e358a2106b8680e31ebada Mon Sep 17 00:00:00 2001 From: Mahendran Mookkiah Date: Wed, 30 Oct 2019 04:30:53 -0400 Subject: [PATCH] [stable/selenium] fix for #18217 deployment spec selector does not match template labels (#18259) * issue #18217 - deployment spec selector does not match template labels Signed-off-by: Mahendran Mookkiah * issue #18217 - deployment spec selector does not match template labels Signed-off-by: Mahendran Mookkiah * issue #18217 - we should not use version number in selector label to avoid breaking upgrade Signed-off-by: Mahendran Mookkiah --- stable/selenium/Chart.yaml | 2 +- stable/selenium/templates/chrome-deployment.yaml | 4 ++++ stable/selenium/templates/chromeDebug-deployment.yaml | 4 ++++ stable/selenium/templates/firefox-deployment.yaml | 4 ++++ stable/selenium/templates/firefoxDebug-deployment.yaml | 4 ++++ stable/selenium/templates/hub-deployment.yaml | 4 ++++ 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/stable/selenium/Chart.yaml b/stable/selenium/Chart.yaml index ca4ac1654c..2423692415 100644 --- a/stable/selenium/Chart.yaml +++ b/stable/selenium/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: selenium -version: 1.0.9 +version: 1.0.10 appVersion: 3.141.59 description: Chart for selenium grid keywords: diff --git a/stable/selenium/templates/chrome-deployment.yaml b/stable/selenium/templates/chrome-deployment.yaml index 81a8ef229f..80ad2e850c 100644 --- a/stable/selenium/templates/chrome-deployment.yaml +++ b/stable/selenium/templates/chrome-deployment.yaml @@ -7,6 +7,10 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: replicas: {{ .Values.chrome.replicas }} + selector: + matchLabels: + app: {{ template "selenium.chrome.fullname" . }} + release: "{{ .Release.Name }}" template: metadata: labels: diff --git a/stable/selenium/templates/chromeDebug-deployment.yaml b/stable/selenium/templates/chromeDebug-deployment.yaml index 2f7682b7d8..4e5a2a41e5 100644 --- a/stable/selenium/templates/chromeDebug-deployment.yaml +++ b/stable/selenium/templates/chromeDebug-deployment.yaml @@ -7,6 +7,10 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: replicas: {{ .Values.chromeDebug.replicas }} + selector: + matchLabels: + app: {{ template "selenium.chromeDebug.fullname" . }} + release: "{{ .Release.Name }}" template: metadata: labels: diff --git a/stable/selenium/templates/firefox-deployment.yaml b/stable/selenium/templates/firefox-deployment.yaml index 7a6144590f..96ad497f73 100644 --- a/stable/selenium/templates/firefox-deployment.yaml +++ b/stable/selenium/templates/firefox-deployment.yaml @@ -7,6 +7,10 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: replicas: {{ .Values.firefox.replicas }} + selector: + matchLabels: + app: {{ template "selenium.firefox.fullname" . }} + release: "{{ .Release.Name }}" template: metadata: labels: diff --git a/stable/selenium/templates/firefoxDebug-deployment.yaml b/stable/selenium/templates/firefoxDebug-deployment.yaml index 6366cc2b75..80b9c97921 100644 --- a/stable/selenium/templates/firefoxDebug-deployment.yaml +++ b/stable/selenium/templates/firefoxDebug-deployment.yaml @@ -7,6 +7,10 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: replicas: {{ .Values.firefoxDebug.replicas }} + selector: + matchLabels: + app: {{ template "selenium.firefoxDebug.fullname" . }} + release: "{{ .Release.Name }}" template: metadata: labels: diff --git a/stable/selenium/templates/hub-deployment.yaml b/stable/selenium/templates/hub-deployment.yaml index 1278f41793..1df9689961 100644 --- a/stable/selenium/templates/hub-deployment.yaml +++ b/stable/selenium/templates/hub-deployment.yaml @@ -6,6 +6,10 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: replicas: 1 + selector: + matchLabels: + app: {{ template "selenium.hub.fullname" . }} + release: "{{ .Release.Name }}" template: metadata: labels: