From ed2d044810125383d9992910e83fa82235485f88 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Fri, 8 Dec 2023 17:02:32 -0800 Subject: [PATCH] Reactivate searchguard-7.9.3 Signed-off-by: Tamal Saha --- catalog/kubedb/active_versions.json | 1 + catalog/kubedb/backup_tasks.json | 3 ++- ...3-searchguard.yaml => elasticsearch-7.9.3-searchguard.yaml} | 1 - catalog/kubedb/restore_tasks.json | 3 ++- ...3-searchguard.yaml => elasticsearch-7.9.3-searchguard.yaml} | 3 +-- 5 files changed, 6 insertions(+), 5 deletions(-) rename catalog/kubedb/raw/elasticsearch/{deprecated-elasticsearch-7.9.3-searchguard.yaml => elasticsearch-7.9.3-searchguard.yaml} (98%) rename charts/kubedb-catalog/templates/elasticsearch/{deprecated-elasticsearch-7.9.3-searchguard.yaml => elasticsearch-7.9.3-searchguard.yaml} (93%) diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index 8b36c53e4..fdd47e299 100644 --- 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 index 336bc341a..1bef346d1 100644 --- 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/catalog/kubedb/raw/elasticsearch/deprecated-elasticsearch-7.9.3-searchguard.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-7.9.3-searchguard.yaml similarity index 98% rename from catalog/kubedb/raw/elasticsearch/deprecated-elasticsearch-7.9.3-searchguard.yaml rename to catalog/kubedb/raw/elasticsearch/elasticsearch-7.9.3-searchguard.yaml index 3df22dad1..42cc8cd67 100644 --- a/catalog/kubedb/raw/elasticsearch/deprecated-elasticsearch-7.9.3-searchguard.yaml +++ b/catalog/kubedb/raw/elasticsearch/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 index feb023f03..8a65b54ba 100644 --- 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/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.3-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.9.3-searchguard.yaml similarity index 93% rename from charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.3-searchguard.yaml rename to charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.9.3-searchguard.yaml index 8e3da1440..b1e5cc22b 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.3-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/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'