From 777bbf4209924d83f195822819c078f977f00750 Mon Sep 17 00:00:00 2001
From: Gaspard FEREY <gaspard.ferey@gmail.com>
Date: Tue, 26 Nov 2024 16:44:30 +0100
Subject: [PATCH] [Elasticsearch] Fixed Kibana version. Added to schema.json to
 be specified by user.

---
 charts/elastic/Chart.yaml         |  2 +-
 charts/elastic/values.schema.json | 30 ++++++++++++++++++++++--------
 charts/elastic/values.yaml        |  4 +++-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/charts/elastic/Chart.yaml b/charts/elastic/Chart.yaml
index f2a12ca3..95cb7b5c 100644
--- a/charts/elastic/Chart.yaml
+++ b/charts/elastic/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.5
+version: 2.0.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/elastic/values.schema.json b/charts/elastic/values.schema.json
index 6a91d791..34104a11 100644
--- a/charts/elastic/values.schema.json
+++ b/charts/elastic/values.schema.json
@@ -3,11 +3,11 @@
   "type": "object",
   "properties": {
     "elasticsearch": {
-      "description": "elasticsearch configuration",
+      "description": "Elasticsearch configuration",
       "type": "object",
       "properties": {
         "image": {
-          "description": "elasticsearch image",
+          "description": "Elasticsearch image",
           "type": "object",
           "properties": {
             "registry": {
@@ -21,15 +21,13 @@
               "default": "bitnami/elasticsearch"
             },
             "tag": {
-              "description": "tag",
+              "description": "Tag Elasticsearch",
               "type": "string",
-              "default": "8.15.1-debian-12-r2",
+              "default": "8.16.1-debian-12-r0",
               "enum": [
+                "8.16.1-debian-12-r0",
                 "8.15.1-debian-12-r2",
-                "8.14.2-debian-12-r1",
-                "8.14.1-debian-12-r1",
-                "8.13.4-debian-12-r0",
-                "7.17.3"
+                "8.14.2-debian-12-r1"
               ]
             },
             "pullPolicy": {
@@ -74,6 +72,22 @@
           "description": "kibana specific configuration",
           "type": "object",
           "properties": {
+            "image": {
+              "description": "Kibana image",
+              "type": "object",
+              "properties": {
+                "tag": {
+                  "description": "Tag Kibana",
+                  "type": "string",
+                  "default": "8.16.1-debian-12-r0",
+                  "enum": [
+                    "8.16.1-debian-12-r0",
+                    "8.16.0-debian-12-r0",
+                    "8.15.3-debian-12-r0"
+                  ]
+                }
+              }
+            },
             "elasticsearch": {
               "type": "object",
               "properties": {
diff --git a/charts/elastic/values.yaml b/charts/elastic/values.yaml
index 1c693323..cc656578 100644
--- a/charts/elastic/values.yaml
+++ b/charts/elastic/values.yaml
@@ -5,7 +5,7 @@ elasticsearch:
   image:
     registry: docker.io
     repository: bitnami/elasticsearch
-    tag: 8.15.1-debian-12-r2
+    tag: 8.16.1-debian-12-r0
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -31,6 +31,8 @@ elasticsearch:
       autoGenerated: true
 
   kibana:
+    image:
+      tag: 8.16.1-debian-12-r0
     elasticsearch:
       security:
         auth: