diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 0f4a537e1..69cd5dc3f 100644 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v8.9.0 description: OpenStack-Helm ElasticSearch name: elasticsearch -version: 0.3.7 +version: 0.3.8 home: https://www.elastic.co/ sources: - https://github.com/elastic/elasticsearch diff --git a/elasticsearch/templates/bin/_helm-tests.sh.tpl b/elasticsearch/templates/bin/_helm-tests.sh.tpl index e6c98ab70..c9891512e 100644 --- a/elasticsearch/templates/bin/_helm-tests.sh.tpl +++ b/elasticsearch/templates/bin/_helm-tests.sh.tpl @@ -15,11 +15,6 @@ limitations under the License. set -ex -python='python' -if [[ $(which python3) ]]; then - python='python3' -fi - function create_test_index () { index_result=$(curl ${CACERT_OPTION} -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \ -XPUT "${ELASTICSEARCH_ENDPOINT}/test_index?pretty" -H 'Content-Type: application/json' -d' @@ -31,9 +26,9 @@ function create_test_index () { } } } - ' | $python -c "import sys, json; print(json.load(sys.stdin)['acknowledged'])") - if [ "$index_result" == "True" ]; - then + ' | grep -o '"acknowledged" *: *true') + + if [ -n "$index_result" ]; then echo "PASS: Test index created!"; else echo "FAIL: Test index not created!"; diff --git a/releasenotes/notes/elasticsearch.yaml b/releasenotes/notes/elasticsearch.yaml index 217909f80..22f89b14c 100644 --- a/releasenotes/notes/elasticsearch.yaml +++ b/releasenotes/notes/elasticsearch.yaml @@ -48,4 +48,5 @@ elasticsearch: - 0.3.5 Remove gateway node role - 0.3.6 Add 2024.1 Ubuntu Jammy overrides - 0.3.7 Add 2024.2 overrides + - 0.3.8 Remove use of python in helm tests ...