Reactivate searchguard-7.9.3

Signed-off-by: Tamal Saha <[email protected]>
kubedb · Dec 9, 2023 · ed2d044 · ed2d044
1 parent 7ae7b76
commit ed2d044
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json
@@ -9,6 +9,7 @@
     "xpack-7.16.3",
     "xpack-7.14.2",
     "xpack-7.13.4",
+    "searchguard-7.9.3",
     "xpack-6.8.23",
     "opensearch-2.11.1",
     "opensearch-2.8.0",

diff --git a/catalog/kubedb/backup_tasks.json b/catalog/kubedb/backup_tasks.json
@@ -15,7 +15,8 @@
   ],
   "elasticsearch-backup-7.3.2": [
     "xpack-7.14.2",
-    "xpack-7.13.4"
+    "xpack-7.13.4",
+    "searchguard-7.9.3"
   ],
   "elasticsearch-backup-8.2.0": [
     "xpack-8.11.1",

diff --git a/...ated-elasticsearch-7.9.3-searchguard.yaml → ...arch/elasticsearch-7.9.3-searchguard.yaml b/...ated-elasticsearch-7.9.3-searchguard.yaml → ...arch/elasticsearch-7.9.3-searchguard.yaml
@@ -6,7 +6,6 @@ spec:
   authPlugin: SearchGuard
   db:
     image: floragunncom/sg-elasticsearch:7.9.3-oss-47.1.0
-  deprecated: true
   distribution: SearchGuard
   exporter:
     image: prometheuscommunity/elasticsearch-exporter:v1.3.0

diff --git a/catalog/kubedb/restore_tasks.json b/catalog/kubedb/restore_tasks.json
@@ -15,7 +15,8 @@
   ],
   "elasticsearch-restore-7.3.2": [
     "xpack-7.14.2",
-    "xpack-7.13.4"
+    "xpack-7.13.4",
+    "searchguard-7.9.3"
   ],
   "elasticsearch-restore-8.2.0": [
     "xpack-8.11.1",

diff --git a/...ated-elasticsearch-7.9.3-searchguard.yaml → ...arch/elasticsearch-7.9.3-searchguard.yaml b/...ated-elasticsearch-7.9.3-searchguard.yaml → ...arch/elasticsearch-7.9.3-searchguard.yaml
@@ -1,4 +1,4 @@
-{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }}
+{{ if .Values.catalog.elasticsearch }}
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
@@ -9,7 +9,6 @@ spec:
   authPlugin: SearchGuard
   db:
     image: '{{ include "image.dockerHub" (merge (dict "_repo" "floragunncom/sg-elasticsearch") $) }}:7.9.3-oss-47.1.0'
-  deprecated: true
   distribution: SearchGuard
   exporter:
     image: '{{ include "image.dockerHub" (merge (dict "_repo" "prometheuscommunity/elasticsearch-exporter") $) }}:v1.3.0'