Add support for ES 8.11.0 & OS 2.11.0

Signed-off-by: raihankhan <[email protected]>
kubedb · Nov 27, 2023 · 77324d6 · 77324d6
1 parent 101e8c4
commit 77324d6
Show file tree

Hide file tree

Showing 7 changed files with 152 additions and 0 deletions.
diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json
@@ -1,5 +1,6 @@
 {
   "Elasticsearch": [
+    "xpack-8.11.0",
     "xpack-8.8.0",
     "xpack-8.6.2",
     "xpack-8.5.2",
@@ -67,6 +68,7 @@
     "searchguard-6.8.1-v1",
     "searchguard-6.8.1",
     "kubedb-searchguard-5.6.16",
+    "opensearch-2.11.0",
     "opensearch-2.8.0",
     "opensearch-2.5.0",
     "opensearch-2.0.1",

diff --git a/catalog/kubedb/backup_tasks.json b/catalog/kubedb/backup_tasks.json
@@ -13,6 +13,7 @@
     "xpack-7.17.10",
     "xpack-7.17.3",
     "xpack-7.16.2",
+    "opensearch-2.11.0",
     "opensearch-2.8.0",
     "opensearch-2.5.0",
     "opensearch-2.0.1",
@@ -79,6 +80,7 @@
     "kubedb-xpack-7.12.0"
   ],
   "elasticsearch-backup-8.2.0": [
+    "xpack-8.11.0",
     "xpack-8.8.0",
     "xpack-8.6.2",
     "xpack-8.5.2",

diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-2.11.0-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-2.11.0-opensearch.yaml
@@ -0,0 +1,33 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: opensearch-2.11.0
+spec:
+  authPlugin: OpenSearch
+  dashboard:
+    image: opensearchproject/opensearch-dashboards:2.11.0
+  dashboardInitContainer:
+    yqImage: ghcr.io/kubedb/elasticsearch-dashboard-init:2.11.0-opensearch-v2023.11.27
+  db:
+    image: opensearchproject/opensearch:2.11.0
+  distribution: OpenSearch
+  exporter:
+    image: prometheuscommunity/elasticsearch-exporter:v1.3.0
+  initContainer:
+    image: tianon/toybox:0.8.4
+    yqImage: ghcr.io/kubedb/elasticsearch-init:2.11.0-opensearch-v2023.11.27
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  stash:
+    addon:
+      backupTask:
+        name: elasticsearch-backup-7.14.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+      restoreTask:
+        name: elasticsearch-restore-7.14.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+  version: 2.11.0
diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-8.11.0-elasticstack.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-8.11.0-elasticstack.yaml
@@ -0,0 +1,36 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: xpack-8.11.0
+spec:
+  authPlugin: X-Pack
+  dashboard:
+    image: kibana:8.11.0
+  dashboardInitContainer:
+    yqImage: ghcr.io/kubedb/elasticsearch-dashboard-init:8.11.0-xpack-v2023.11.27
+  db:
+    image: elasticsearch:8.11.0
+  distribution: ElasticStack
+  exporter:
+    image: prometheuscommunity/elasticsearch-exporter:v1.3.0
+  initContainer:
+    image: tianon/toybox:0.8.4
+    yqImage: ghcr.io/kubedb/elasticsearch-init:8.11.0-xpack-v2023.11.27
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  securityContext:
+    runAsAnyNonRoot: true
+    runAsUser: 1000
+  stash:
+    addon:
+      backupTask:
+        name: elasticsearch-backup-8.2.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+
+      restoreTask:
+        name: elasticsearch-restore-8.2.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+
+  version: 8.11.0
diff --git a/catalog/kubedb/restore_tasks.json b/catalog/kubedb/restore_tasks.json
@@ -13,6 +13,7 @@
     "xpack-7.17.10",
     "xpack-7.17.3",
     "xpack-7.16.2",
+    "opensearch-2.11.0",
     "opensearch-2.8.0",
     "opensearch-2.5.0",
     "opensearch-2.0.1",
@@ -79,6 +80,7 @@
     "kubedb-xpack-7.12.0"
   ],
   "elasticsearch-restore-8.2.0": [
+    "xpack-8.11.0",
     "xpack-8.8.0",
     "xpack-8.6.2",
     "xpack-8.5.2",

diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.11.0-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.11.0-opensearch.yaml
@@ -0,0 +1,37 @@
+{{ if .Values.catalog.elasticsearch }}
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: 'opensearch-2.11.0'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  authPlugin: OpenSearch
+  dashboard:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "opensearchproject/opensearch-dashboards") $) }}:2.11.0'
+  dashboardInitContainer:
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:2.11.0-opensearch-v2023.11.27'
+  db:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "opensearchproject/opensearch") $) }}:2.11.0'
+  distribution: OpenSearch
+  exporter:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "prometheuscommunity/elasticsearch-exporter") $) }}:v1.3.0'
+  initContainer:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "tianon/toybox") $) }}:0.8.4'
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:2.11.0-opensearch-v2023.11.27'
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  stash:
+    addon:
+      backupTask:
+        name: elasticsearch-backup-7.14.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+      restoreTask:
+        name: elasticsearch-restore-7.14.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+  version: 2.11.0
+{{ end }}
diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.11.0-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.11.0-elasticstack.yaml
@@ -0,0 +1,40 @@
+{{ if .Values.catalog.elasticsearch }}
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: 'xpack-8.11.0'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  authPlugin: X-Pack
+  dashboard:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "kibana") $) }}:8.11.0'
+  dashboardInitContainer:
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:8.11.0-xpack-v2023.11.27'
+  db:
+    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "elasticsearch") $) }}:8.11.0'
+  distribution: ElasticStack
+  exporter:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "prometheuscommunity/elasticsearch-exporter") $) }}:v1.3.0'
+  initContainer:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "tianon/toybox") $) }}:0.8.4'
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:8.11.0-xpack-v2023.11.27'
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  securityContext:
+    runAsAnyNonRoot: true
+    runAsUser: 1000
+  stash:
+    addon:
+      backupTask:
+        name: elasticsearch-backup-8.2.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+
+      restoreTask:
+        name: elasticsearch-restore-8.2.0
+        params:
+        - name: args
+          value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+
+  version: 8.11.0
+{{ end }}