Add new version for ES, OS and Solr

Signed-off-by: pritamdas99 <[email protected]>
kubedb · Dec 12, 2024 · 15cd7eb · 15cd7eb
1 parent 5e0ec07
commit 15cd7eb
Show file tree

Hide file tree

Showing 30 changed files with 416 additions and 44 deletions.
diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json
@@ -11,6 +11,8 @@
     "28.0.1"
   ],
   "Elasticsearch": [
+    "xpack-8.16.0",
+    "xpack-8.15.4",
     "xpack-8.15.0",
     "xpack-8.14.3",
     "xpack-8.14.1",
@@ -21,19 +23,23 @@
     "xpack-8.6.2",
     "xpack-8.5.3",
     "xpack-8.2.3",
+    "xpack-7.17.25",
     "xpack-7.17.23",
     "xpack-7.17.15",
     "xpack-7.16.3",
     "xpack-7.14.2",
     "xpack-7.13.4",
     "searchguard-7.9.3",
     "xpack-6.8.23",
+    "opensearch-2.18.0",
+    "opensearch-2.17.1",
     "opensearch-2.16.0",
     "opensearch-2.14.0",
     "opensearch-2.11.1",
     "opensearch-2.8.0",
     "opensearch-2.5.0",
     "opensearch-2.0.1",
+    "opensearch-1.3.19",
     "opensearch-1.3.18",
     "opensearch-1.3.13",
     "opensearch-1.2.4",
@@ -187,9 +193,10 @@
     "8.1.32"
   ],
   "Solr": [
+    "9.7.0",
     "9.6.1",
     "9.4.1",
-    "8.11.2"
+    "8.11.4"
   ],
   "ZooKeeper": [
     "3.9.1",

diff --git a/catalog/kubedb/backup_tasks.json b/catalog/kubedb/backup_tasks.json
@@ -3,15 +3,19 @@
     "xpack-6.8.23"
   ],
   "elasticsearch-backup-7.14.0": [
+    "xpack-7.17.25",
     "xpack-7.17.23",
     "xpack-7.17.15",
     "xpack-7.16.3",
+    "opensearch-2.18.0",
+    "opensearch-2.17.1",
     "opensearch-2.16.0",
     "opensearch-2.14.0",
     "opensearch-2.11.1",
     "opensearch-2.8.0",
     "opensearch-2.5.0",
     "opensearch-2.0.1",
+    "opensearch-1.3.19",
     "opensearch-1.3.18",
     "opensearch-1.3.13",
     "opensearch-1.2.4",
@@ -23,6 +27,8 @@
     "searchguard-7.9.3"
   ],
   "elasticsearch-backup-8.2.0": [
+    "xpack-8.16.0",
+    "xpack-8.15.4",
     "xpack-8.15.0",
     "xpack-8.14.3",
     "xpack-8.14.1",

diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.18-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.18-opensearch.yaml
@@ -35,5 +35,5 @@ spec:
           value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
   updateConstraints:
     allowlist:
-      - '> 1.3.18, < 1.3.20'
+    - '> 1.3.18, < 1.3.20'
   version: 1.3.18
diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.19-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.19-opensearch.yaml
@@ -26,14 +26,14 @@ spec:
       backupTask:
         name: elasticsearch-backup-7.14.0
         params:
-          - name: args
-            value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
       restoreTask:
         name: elasticsearch-restore-7.14.0
         params:
-          - name: args
-            value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
   updateConstraints:
     allowlist:
-      - '> 1.3.19, < 2.0.2'
+    - '> 1.3.19, < 2.0.2'
   version: 1.3.19
diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-2.17.1-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-2.17.1-opensearch.yaml
@@ -26,14 +26,14 @@ spec:
       backupTask:
         name: elasticsearch-backup-7.14.0
         params:
-          - name: args
-            value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
       restoreTask:
         name: elasticsearch-restore-7.14.0
         params:
-          - name: args
-            value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
   updateConstraints:
     allowlist:
-      - '> 2.17.1, < 2.18.1'
+    - '> 2.17.1, < 2.18.1'
   version: 2.17.1
diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-2.18.0-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-2.18.0-opensearch.yaml
@@ -26,14 +26,14 @@ spec:
       backupTask:
         name: elasticsearch-backup-7.14.0
         params:
-          - name: args
-            value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
       restoreTask:
         name: elasticsearch-restore-7.14.0
         params:
-          - name: args
-            value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+        - name: args
+          value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
   updateConstraints:
     allowlist:
-      - '> 2.18.0, < 3.0.0'
+    - '> 2.18.0, < 3.0.0'
   version: 2.18.0
diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.23-elasticstack.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.23-elasticstack.yaml
@@ -35,5 +35,5 @@ spec:
           value: --match=^(?![.])(?!kubedb-system).+
   updateConstraints:
     allowlist:
-      - '> 7.17.23, < 7.17.26'
+    - '> 7.17.23, < 7.17.26'
   version: 7.17.23
diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.25-elasticstack.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.25-elasticstack.yaml
@@ -26,14 +26,14 @@ spec:
       backupTask:
         name: elasticsearch-backup-7.14.0
         params:
-          - name: args
-            value: --match=^(?![.])(?!kubedb-system).+
+        - name: args
+          value: --match=^(?![.])(?!kubedb-system).+
       restoreTask:
         name: elasticsearch-restore-7.14.0
         params:
-          - name: args
-            value: --match=^(?![.])(?!kubedb-system).+
+        - name: args
+          value: --match=^(?![.])(?!kubedb-system).+
   updateConstraints:
     allowlist:
-      - '> 7.17.25, < 8.2.4'
+    - '> 7.17.25, < 8.2.4'
   version: 7.17.25
diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-8.15.4-elasticstack.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-8.15.4-elasticstack.yaml
@@ -26,14 +26,14 @@ spec:
       backupTask:
         name: elasticsearch-backup-8.2.0
         params:
-          - name: args
-            value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+
+        - 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).+
+        - name: args
+          value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+
   updateConstraints:
     allowlist:
-      - '> 8.15.4, < 8.16.1'
+    - '> 8.15.4, < 8.16.1'
   version: 8.15.4
diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-8.16.0-elasticstack.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-8.16.0-elasticstack.yaml
@@ -26,14 +26,14 @@ spec:
       backupTask:
         name: elasticsearch-backup-8.2.0
         params:
-          - name: args
-            value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+
+        - 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).+
+        - name: args
+          value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+
   updateConstraints:
     allowlist:
-      - '> 8.16.0, < 9.0.0'
+    - '> 8.16.0, < 9.0.0'
   version: 8.16.0
diff --git a/catalog/kubedb/raw/solr/solr-8.11.2.yaml → ...bedb/raw/solr/deprecated-solr-8.11.2.yaml b/catalog/kubedb/raw/solr/solr-8.11.2.yaml → ...bedb/raw/solr/deprecated-solr-8.11.2.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   db:
     image: ghcr.io/appscode-images/solr:8.11.2
+  deprecated: true
   initContainer:
     image: ghcr.io/kubedb/solr-init:8.11.2
   securityContext:

diff --git a/catalog/kubedb/raw/solr/solr-8.11.4.yaml b/catalog/kubedb/raw/solr/solr-8.11.4.yaml
@@ -11,5 +11,5 @@ spec:
     runAsUser: 8983
   updateConstraints:
     allowlist:
-      - '> 8.11.2, < 9.4.2'
+    - '> 8.11.2, < 9.4.2'
   version: 8.11.4
diff --git a/catalog/kubedb/raw/solr/solr-9.7.0.yaml b/catalog/kubedb/raw/solr/solr-9.7.0.yaml
@@ -11,5 +11,5 @@ spec:
     runAsUser: 8983
   updateConstraints:
     allowlist:
-      - '> 9.7.0, < 9.8.0'
+    - '> 9.7.0, < 9.8.0'
   version: 9.7.0
diff --git a/catalog/kubedb/restore_tasks.json b/catalog/kubedb/restore_tasks.json
@@ -3,15 +3,19 @@
     "xpack-6.8.23"
   ],
   "elasticsearch-restore-7.14.0": [
+    "xpack-7.17.25",
     "xpack-7.17.23",
     "xpack-7.17.15",
     "xpack-7.16.3",
+    "opensearch-2.18.0",
+    "opensearch-2.17.1",
     "opensearch-2.16.0",
     "opensearch-2.14.0",
     "opensearch-2.11.1",
     "opensearch-2.8.0",
     "opensearch-2.5.0",
     "opensearch-2.0.1",
+    "opensearch-1.3.19",
     "opensearch-1.3.18",
     "opensearch-1.3.13",
     "opensearch-1.2.4",
@@ -23,6 +27,8 @@
     "searchguard-7.9.3"
   ],
   "elasticsearch-restore-8.2.0": [
+    "xpack-8.16.0",
+    "xpack-8.15.4",
     "xpack-8.15.0",
     "xpack-8.14.3",
     "xpack-8.14.1",

diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.13-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.13-opensearch.yaml
@@ -44,6 +44,6 @@ spec:
           value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
   updateConstraints:
     allowlist:
-    - '> 1.3.13, < 2.0.2'
+    - '> 1.3.13, < 1.3.20'
   version: 1.3.13
 {{ end }}
diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.18-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.18-opensearch.yaml
@@ -42,5 +42,8 @@ spec:
         params:
         - name: args
           value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
+  updateConstraints:
+    allowlist:
+    - '> 1.3.18, < 1.3.20'
   version: 1.3.18
 {{ end }}
diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.19-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.19-opensearch.yaml
@@ -0,0 +1,49 @@
+{{ $featureGates := .Values.featureGates }}
+{{- if .Values.global }}
+  {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}
+{{- end }}
+
+{{ if $featureGates.Elasticsearch }}
+
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: 'opensearch-1.3.19'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  authPlugin: OpenSearch
+  dashboard:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch-dashboards") $) }}:1.3.19'
+  dashboardInitContainer:
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:1.3.19-opensearch-v2024.11.22'
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch") $) }}:1.3.19'
+  distribution: OpenSearch
+  exporter:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "prometheuscommunity/elasticsearch-exporter") $) }}:v1.7.0'
+  initContainer:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "tianon/toybox") $) }}:0.8.4'
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:1.3.19-opensearch-v2024.11.22'
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  securityContext:
+    runAsAnyNonRoot: true
+    runAsUser: 1000
+  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).+
+  updateConstraints:
+    allowlist:
+    - '> 1.3.19, < 2.0.2'
+  version: 1.3.19
+{{ end }}
diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.16.0-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.16.0-opensearch.yaml
@@ -44,6 +44,6 @@ spec:
           value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+
   updateConstraints:
     allowlist:
-    - '> 2.16.0, < 3.0.0'
+    - '> 2.16.0, < 2.18.1'
   version: 2.16.0
 {{ end }}
diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.17.1-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.17.1-opensearch.yaml
@@ -0,0 +1,49 @@
+{{ $featureGates := .Values.featureGates }}
+{{- if .Values.global }}
+  {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}
+{{- end }}
+
+{{ if $featureGates.Elasticsearch }}
+
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: 'opensearch-2.17.1'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  authPlugin: OpenSearch
+  dashboard:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch-dashboards") $) }}:2.17.1'
+  dashboardInitContainer:
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:2.17.1-opensearch-v2024.11.22'
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch") $) }}:2.17.1'
+  distribution: OpenSearch
+  exporter:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "prometheuscommunity/elasticsearch-exporter") $) }}:v1.7.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.17.1-opensearch-v2024.11.22'
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  securityContext:
+    runAsAnyNonRoot: true
+    runAsUser: 1000
+  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).+
+  updateConstraints:
+    allowlist:
+    - '> 2.17.1, < 2.18.1'
+  version: 2.17.1
+{{ end }}