From 8a9682627b0e5a079898ad81b9062b45a7daf311 Mon Sep 17 00:00:00 2001 From: James Payne Date: Fri, 21 Feb 2020 15:39:31 +0000 Subject: [PATCH 1/3] Fix app label to match service if chart is deployed with an alias --- kibana/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kibana/templates/deployment.yaml b/kibana/templates/deployment.yaml index ad563b3f2..73cb992ca 100644 --- a/kibana/templates/deployment.yaml +++ b/kibana/templates/deployment.yaml @@ -14,12 +14,12 @@ spec: {{ toYaml .Values.updateStrategy | indent 4 }} selector: matchLabels: - app: kibana + app: {{ .Chart.Name }} release: {{ .Release.Name | quote }} template: metadata: labels: - app: kibana + app: {{ .Chart.Name }} release: {{ .Release.Name | quote }} {{- range $key, $value := .Values.labels }} {{ $key }}: {{ $value | quote }} From 25df7511a35689f9bac98995ba26deef5ae2db2a Mon Sep 17 00:00:00 2001 From: James Payne Date: Fri, 21 Feb 2020 23:36:27 +0000 Subject: [PATCH 2/3] Add tests to ensure the service selectors bind correctly to pods created by the deployment --- kibana/tests/kibana_test.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py index 1d43bef69..75da70205 100644 --- a/kibana/tests/kibana_test.py +++ b/kibana/tests/kibana_test.py @@ -515,6 +515,31 @@ def test_adding_pod_labels(): ) +def test_service_to_pod_label_selectors(): + config = "" + + r = helm_template(config) + + assert(all ( + l in r["deployment"][name]["spec"]["template"]["metadata"]["labels"].items() + for l in r["service"][name]["spec"]["selector"].items()) + ) + + +def test_service_to_pod_label_selectors_with_custom_labels(): + config = """ +labels: + app.kubernetes.io/name: kibana +""" + + r = helm_template(config) + + assert(all ( + l in r["deployment"][name]["spec"]["template"]["metadata"]["labels"].items() + for l in r["service"][name]["spec"]["selector"].items()) + ) + + def test_adding_a_secret_mount_with_subpath(): config = """ secretMounts: From dd682a48d0bbdc6b562c78ef1094fd79b3e3b6cf Mon Sep 17 00:00:00 2001 From: James Payne Date: Thu, 19 Mar 2020 21:15:50 +0000 Subject: [PATCH 3/3] Fix linting issues --- kibana/tests/kibana_test.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py index 75da70205..4b864f2f0 100644 --- a/kibana/tests/kibana_test.py +++ b/kibana/tests/kibana_test.py @@ -516,13 +516,13 @@ def test_adding_pod_labels(): def test_service_to_pod_label_selectors(): - config = "" - + config = "" + r = helm_template(config) - assert(all ( - l in r["deployment"][name]["spec"]["template"]["metadata"]["labels"].items() - for l in r["service"][name]["spec"]["selector"].items()) + assert all( + l in r["deployment"][name]["spec"]["template"]["metadata"]["labels"].items() + for l in r["service"][name]["spec"]["selector"].items() ) @@ -534,9 +534,9 @@ def test_service_to_pod_label_selectors_with_custom_labels(): r = helm_template(config) - assert(all ( - l in r["deployment"][name]["spec"]["template"]["metadata"]["labels"].items() - for l in r["service"][name]["spec"]["selector"].items()) + assert all( + l in r["deployment"][name]["spec"]["template"]["metadata"]["labels"].items() + for l in r["service"][name]["spec"]["selector"].items() )