revert es config changes (#1954)

* revert es config changes * fix pre-commit
astronomer · Aug 10, 2023 · 2fd47e8 · 2fd47e8
1 parent 7c557a2
commit 2fd47e8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/charts/astronomer/templates/houston/houston-configmap.yaml b/charts/astronomer/templates/houston/houston-configmap.yaml
@@ -390,7 +390,7 @@ data:
           elasticsearch:
             enabled: true
             connection:
-              host: {{ printf "http://%s-external-es-proxy.%s" .Release.Name .Release.Namespace }}
+              host: {{ printf "%s-external-es-proxy.%s" .Release.Name .Release.Namespace }}
               port: 9200
 
     elasticsearch:
@@ -404,7 +404,7 @@ data:
           elasticsearch:
             enabled: true
             connection:
-              host: {{ printf "http://%s-elasticsearch-nginx.%s" .Release.Name .Release.Namespace }}
+              host: {{ printf "%s-elasticsearch-nginx.%s" .Release.Name .Release.Namespace }}
               port: 9200
 
     elasticsearch:

diff --git a/tests/chart_tests/test_external_elasticsearch.py b/tests/chart_tests/test_external_elasticsearch.py
@@ -492,24 +492,3 @@ def test_externalelasticsearch_with_extraenv(self, kube_version):
         assert {"name": "TEST_VAR_NAME", "value": "test_var_value"} in doc["spec"][
             "template"
         ]["spec"]["containers"][0]["env"]
-
-    def test_externalelasticsearch_houston_configmap_with_http_endpoint(
-        self, kube_version
-    ):
-        """Test Houston Configmap with kibanaUIFlag."""
-        docs = render_chart(
-            kube_version=kube_version,
-            values={"global": {"customLogging": {"enabled": True}}},
-            show_only=[
-                "charts/astronomer/templates/houston/houston-configmap.yaml",
-            ],
-        )
-        doc = docs[0]
-        prod = yaml.safe_load(doc["data"]["production.yaml"])
-        print(prod)
-        assert (
-            prod["deployments"]["helm"]["airflow"]["elasticsearch"]["enabled"] is True
-        )
-        assert prod["deployments"]["helm"]["airflow"]["elasticsearch"]["connection"][
-            "host"
-        ].startswith("http://")
diff --git a/tests/chart_tests/test_houston_configmap.py b/tests/chart_tests/test_houston_configmap.py
@@ -48,9 +48,6 @@ def test_houston_configmap():
     # Ensure elasticsearch client param is at the correct location and contains http://
     assert "node" in prod["elasticsearch"]["client"]
     assert prod["elasticsearch"]["client"]["node"].startswith("http://")
-    assert prod["deployments"]["helm"]["airflow"]["elasticsearch"]["connection"][
-        "host"
-    ].startswith("http://")
     with pytest.raises(KeyError):
         # Ensure sccEnabled is not defined by default
         assert prod["deployments"]["helm"]["sccEnabled"] is False