Update curator for es v8

This PS is to update es curator for elasticsearch v8. Curator 5.x
is not compatible with es v8.

Changes are needed for config.yml:

https://github.com/elastic/curator#new-client-configuration

No changes are required for the actions file.

Change-Id: I6968e22c7ae5f630e1342f47feee0c2c494b767f

elasticsearch/Chart.yaml

@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v8.9.0
 description: OpenStack-Helm ElasticSearch
 name: elasticsearch
-version: 0.2.29
+version: 0.2.30
 home: https://www.elastic.co/
 sources:
   - https://github.com/elastic/elasticsearch

elasticsearch/templates/cron-job-curator.yaml

@@ -58,11 +58,21 @@ spec:
               command:
                 - /tmp/curator.sh
               env:
-                - name: ELASTICSEARCH_HOST
+                - name: ELASTICSEARCH_USERNAME
                   valueFrom:
                     secretKeyRef:
                       name: {{ $esUserSecret }}
-                      key: ELASTICSEARCH_URI
+                      key: ELASTICSEARCH_USERNAME
+                - name: ELASTICSEARCH_PASSWORD
+                  valueFrom:
+                    secretKeyRef:
+                      name: {{ $esUserSecret }}
+                      key: ELASTICSEARCH_PASSWORD
+                - name: ELASTICSEARCH_URL
+                  valueFrom:
+                    secretKeyRef:
+                      name: {{ $esUserSecret }}
+                      key: ELASTICSEARCH_URL
               volumeMounts:
                 - name: pod-tmp
                   mountPath: /tmp

elasticsearch/templates/secret-elasticsearch.yaml

@@ -21,6 +21,7 @@ limitations under the License.
 {{- $elasticsearch_host := tuple "elasticsearch" "internal" "http" $envAll | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
 {{- $elasticsearch_scheme := tuple "elasticsearch" "internal" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" }}
 {{- $elasticsearch_uri := printf "%s://%s:%s@%s" $elasticsearch_scheme $elasticsearch_user $elasticsearch_password $elasticsearch_host }}
+{{- $elasticsearch_url := printf "%s://%s" $elasticsearch_scheme $elasticsearch_host }}
 ---
 apiVersion: v1
 kind: Secret
@@ -33,6 +34,7 @@ data:
   ELASTICSEARCH_LOGGING_USERNAME: {{ .Values.endpoints.elasticsearch.auth.logging.username | b64enc }}
   ELASTICSEARCH_LOGGING_PASSWORD: {{ .Values.endpoints.elasticsearch.auth.logging.password | b64enc }}
   ELASTICSEARCH_URI: {{ $elasticsearch_uri | b64enc }}
+  ELASTICSEARCH_URL: {{ $elasticsearch_url | b64enc }}
   BIND_DN: {{ .Values.endpoints.ldap.auth.admin.bind | b64enc }}
   BIND_PASSWORD: {{ .Values.endpoints.ldap.auth.admin.password | b64enc }}
 {{- end }}

elasticsearch/values.yaml

@@ -20,7 +20,7 @@ images:
     apache_proxy: docker.io/library/httpd:2.4
     memory_init: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
     elasticsearch: docker.io/openstackhelm/elasticsearch-s3:latest-8_9_0
-    curator: docker.io/bobrik/curator:5.8.1
+    curator: docker.io/untergeek/curator:8.0.8
     ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013
     s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013
     s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013
@@ -595,7 +595,7 @@ conf:
   ceph:
     admin_keyring: null
   curator:
-    executable: /usr/bin/curator
+    executable: /curator/curator
     action_file: {}
       # Remember, leave a key empty if there is no value.  None will be a string,
       # not a Python "NoneType"
@@ -694,12 +694,14 @@ conf:
     config:
       # Remember, leave a key empty if there is no value.  None will be a string,
       # not a Python "NoneType"
-      client:
+      elasticsearch:
-        hosts:
+        client:
-          - ${ELASTICSEARCH_HOST}
+          hosts: ${ELASTICSEARCH_URL}
-        use_ssl: False
+          request_timeout: 60
-        ssl_no_validate: False
+        other_settings:
-        timeout: 60
+          username: ${ELASTICSEARCH_USERNAME}
+          password: ${ELASTICSEARCH_PASSWORD}
+
       logging:
         loglevel: INFO
         logformat: logstash

releasenotes/notes/elasticsearch.yaml

@@ -39,4 +39,5 @@ elasticsearch:
   - 0.2.27 Update Rook to 1.12.5 and Ceph to 18.2.0
   - 0.2.28 Utilize bucket claim CRD when using with Rook
   - 0.2.29 Make es curator path configurable
+  - 0.2.30 Update curator for es v8
 ...