[airflow] branch main updated: Fix chart elasticsearch default port 80 to 9200. (#20616)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 0067d27  Fix chart elasticsearch default port 80 to 9200. (#20616)
0067d27 is described below

commit 0067d2742c68261f7ecd23936c44942204f5e6d9
Author: Sonins <gm...@gmail.com>
AuthorDate: Sat Jan 1 20:15:25 2022 +0900

    Fix chart elasticsearch default port 80 to 9200. (#20616)
    
    * Elasticsearch uses rather 9200 than 80 as default.
---
 chart/templates/secrets/elasticsearch-secret.yaml | 2 +-
 chart/tests/test_elasticsearch_secret.py          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chart/templates/secrets/elasticsearch-secret.yaml b/chart/templates/secrets/elasticsearch-secret.yaml
index d8d65fa..8f03137 100644
--- a/chart/templates/secrets/elasticsearch-secret.yaml
+++ b/chart/templates/secrets/elasticsearch-secret.yaml
@@ -33,6 +33,6 @@ metadata:
 type: Opaque
 data:
   {{- with .Values.elasticsearch.connection }}
-  connection: {{ urlJoin (dict "scheme" (default "http" .scheme) "userinfo" (printf "%s:%s" (.user | urlquery) (.pass | urlquery)) "host" (printf "%s:%s" .host ((default 80 .port) | toString) ) ) | b64enc | quote }}
+  connection: {{ urlJoin (dict "scheme" (default "http" .scheme) "userinfo" (printf "%s:%s" (.user | urlquery) (.pass | urlquery)) "host" (printf "%s:%s" .host ((default 9200 .port) | toString) ) ) | b64enc | quote }}
   {{- end }}
 {{- end }}
diff --git a/chart/tests/test_elasticsearch_secret.py b/chart/tests/test_elasticsearch_secret.py
index 22d5cfc..a304a7b 100644
--- a/chart/tests/test_elasticsearch_secret.py
+++ b/chart/tests/test_elasticsearch_secret.py
@@ -95,7 +95,7 @@ class ElasticsearchSecretTest(unittest.TestCase):
 
         assert (
             "http://username%21%40%23$%25%25%5E&%2A%28%29:password%21%40%23$%25%25%5E&%2A%28%29@"
-            "elastichostname:80" == connection
+            "elastichostname:9200" == connection
         )
 
     def test_should_generate_secret_with_specified_port(self):
@@ -131,4 +131,4 @@ class ElasticsearchSecretTest(unittest.TestCase):
             }
         )
 
-        assert f"{scheme}://username:password@elastichostname:80" == connection
+        assert f"{scheme}://username:password@elastichostname:9200" == connection