From 24bbb6fc01de4b8abd325bfed8ecc30dd42df1a7 Mon Sep 17 00:00:00 2001
From: Christophe Haen <christophe.haen@cern.ch>
Date: Thu, 16 Nov 2023 17:58:59 +0100
Subject: [PATCH] cont

---
 README.md          | 11 +++--------
 diracx/values.yaml | 40 +++++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index ede1b3f..113a6ce 100644
--- a/README.md
+++ b/README.md
@@ -129,6 +129,8 @@ TODO
 | diracxWeb.image.tag | string | `"latest"` |  |
 | diracxWeb.service.port | int | `8080` |  |
 | diracxWeb.service.type | string | `"ClusterIP"` |  |
+| elasticsearch."discovery.seed_hosts"[0] | string | `"elasticsearch-master-headless"` |  |
+| elasticsearch.clusterHealthCheckParams | string | `"local=true"` |  |
 | elasticsearch.enabled | bool | `true` |  |
 | elasticsearch.esJavaOpts | string | `"-Xms128m -Xmx128m"` |  |
 | elasticsearch.replicas | int | `1` |  |
@@ -172,16 +174,8 @@ TODO
 | image.repository | string | `"ghcr.io/diracgrid/diracx/server"` |  |
 | image.tag | string | `"latest"` |  |
 | ingress.annotations | object | `{}` |  |
-| ingress.annotations."nginx.ingress.kubernetes.io/use-regex" | string | `"true"` |  |
 | ingress.className | string | `"nginx"` |  |
-| ingress.className | string | `"nginx"` |  |
-| ingress.enabled | bool | `true` |  |
 | ingress.enabled | bool | `true` |  |
-| ingress.hosts[0].paths[0].backend.service.name | string | `"diracx-demo"` |  |
-| ingress.hosts[0].paths[0].backend.service.port.number | int | `8000` |  |
-| ingress.hosts[0].paths[0].path | string | `"/"` |  |
-| ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
-| ingress.tls | list | `[]` |  |
 | ingress.tlsSecretName | string | `"myingress-cert"` |  |
 | init-cs.defaultUsers | list | `[]` |  |
 | init-cs.enabled | bool | `true` |  |
@@ -273,6 +267,7 @@ TODO
 | resources | object | `{}` |  |
 | securityContext | object | `{}` |  |
 | service.port | int | `8000` |  |
+| service.tls | list | `[]` |  |
 | service.type | string | `"ClusterIP"` |  |
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
diff --git a/diracx/values.yaml b/diracx/values.yaml
index b84ae94..e21c156 100644
--- a/diracx/values.yaml
+++ b/diracx/values.yaml
@@ -227,6 +227,8 @@ elasticsearch:
   enabled: true
   esJavaOpts: "-Xms128m -Xmx128m"
   replicas: 1
+  clusterHealthCheckParams: "local=true"
+  discovery.seed_hosts: ["elasticsearch-master-headless"]
   # Allocate smaller chunks of memory per pod.
   resources:
     requests:
@@ -538,25 +540,25 @@ service:
   type: ClusterIP
   port: 8000
 
-ingress:
-  enabled: true
-  className: "nginx"
-  annotations:
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-    # Needed if you want to use a base path different from /
-    # #Use rewrite rules https://kubernetes.github.io/ingress-nginx/examples/rewrite/
-    nginx.ingress.kubernetes.io/use-regex: "true"
-    # nginx.ingress.kubernetes.io/rewrite-target: "/$2"
-  hosts:
-    - paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: diracx-demo
-              port:
-                number: 8000
+# ingress:
+#   enabled: true
+#   className: "nginx"
+#   annotations:
+#     # kubernetes.io/ingress.class: nginx
+#     # kubernetes.io/tls-acme: "true"
+#     # Needed if you want to use a base path different from /
+#     # #Use rewrite rules https://kubernetes.github.io/ingress-nginx/examples/rewrite/
+#     nginx.ingress.kubernetes.io/use-regex: "true"
+#     # nginx.ingress.kubernetes.io/rewrite-target: "/$2"
+#   hosts:
+#     - paths:
+#         - path: /
+#           pathType: Prefix
+#           backend:
+#             service:
+#               name: diracx-demo
+#               port:
+#                 number: 8000
 
   tls: []
   #  - secretName: chart-example-tls