Update Elasticsearch versions to support various node roles (#308)

Signed-off-by: kamolhasan <kamol@appscode.com>
kubedb · Jun 16, 2021 · 4c79e1a · 4c79e1a
1 parent 8e52114
commit 4c79e1a
Show file tree

Hide file tree

Showing 31 changed files with 454 additions and 227 deletions.
diff --git a/catalog/active_versions.json b/catalog/active_versions.json
@@ -1,59 +1,52 @@
 {
   "Elasticsearch": [
+    "xpack-7.13.1",
+    "xpack-7.12.0-v1",
     "xpack-7.12.0",
     "searchguard-7.10.2",
     "opendistro-1.12.0",
     "searchguard-7.9.3",
+    "xpack-7.9.1-v2",
     "xpack-7.9.1-v1",
-    "xpack-7.9.1",
     "opendistro-1.11.0",
     "opendistro-1.10.1",
     "searchguard-7.8.1",
     "xpack-7.8.0-v1",
-    "xpack-7.8.0",
     "opendistro-1.9.0-v1",
     "opendistro-1.9.0",
     "xpack-7.7.1-v1",
-    "xpack-7.7.1",
     "opendistro-1.8.0-v1",
     "opendistro-1.8.0",
     "xpack-7.6.2-v1",
-    "xpack-7.6.2",
     "opendistro-1.7.0-v1",
     "opendistro-1.7.0",
     "opendistro-1.6.0-v1",
     "opendistro-1.6.0",
     "xpack-7.5.2-v1",
-    "xpack-7.5.2",
     "searchguard-7.5.2-v1",
     "searchguard-7.5.2",
     "xpack-7.4.2-v1",
-    "xpack-7.4.2",
     "opendistro-1.4.0-v1",
     "opendistro-1.4.0",
     "xpack-7.3.2-v1",
-    "xpack-7.3.2",
     "searchguard-7.3.2",
     "opendistro-1.3.0-v1",
     "opendistro-1.3.0",
     "xpack-7.2.1-v1",
-    "xpack-7.2.1",
     "opendistro-1.2.1-v1",
     "opendistro-1.2.1",
     "xpack-7.1.1-v1",
-    "xpack-7.1.1",
     "searchguard-7.1.1-v1",
     "searchguard-7.1.1",
     "opendistro-1.1.0-v1",
     "opendistro-1.1.0",
     "xpack-7.0.1-v1",
-    "xpack-7.0.1",
     "searchguard-7.0.1-v1",
     "searchguard-7.0.1",
     "opendistro-1.0.2-v1",
     "opendistro-1.0.2",
+    "xpack-6.8.16",
     "xpack-6.8.10-v1",
-    "xpack-6.8.10",
     "searchguard-6.8.1-v1",
     "searchguard-6.8.1"
   ],

diff --git a/catalog/backup_tasks.json b/catalog/backup_tasks.json
@@ -1,17 +1,14 @@
 {
   "elasticsearch-backup-6.8.0": [
+    "xpack-6.8.16",
     "xpack-6.8.10-v1",
-    "xpack-6.8.10",
     "searchguard-6.8.1-v1",
     "searchguard-6.8.1"
   ],
   "elasticsearch-backup-7.2.0": [
     "xpack-7.2.1-v1",
-    "xpack-7.2.1",
     "xpack-7.1.1-v1",
-    "xpack-7.1.1",
     "xpack-7.0.1-v1",
-    "xpack-7.0.1",
     "searchguard-7.1.1-v1",
     "searchguard-7.1.1",
     "searchguard-7.0.1-v1",
@@ -24,21 +21,17 @@
     "opendistro-1.0.2"
   ],
   "elasticsearch-backup-7.3.2": [
+    "xpack-7.13.1",
+    "xpack-7.12.0-v1",
     "xpack-7.12.0",
+    "xpack-7.9.1-v2",
     "xpack-7.9.1-v1",
-    "xpack-7.9.1",
     "xpack-7.8.0-v1",
-    "xpack-7.8.0",
     "xpack-7.7.1-v1",
-    "xpack-7.7.1",
     "xpack-7.6.2-v1",
-    "xpack-7.6.2",
     "xpack-7.5.2-v1",
-    "xpack-7.5.2",
     "xpack-7.4.2-v1",
-    "xpack-7.4.2",
     "xpack-7.3.2-v1",
-    "xpack-7.3.2",
     "searchguard-7.10.2",
     "searchguard-7.9.3",
     "searchguard-7.8.1",

diff --git a/catalog/raw/elasticsearch/elasticsearch-6.8.10-elasticstack.yaml b/catalog/raw/elasticsearch/elasticsearch-6.8.10-elasticstack.yaml
@@ -1,7 +1,7 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: xpack-6.8.10
+  name: xpack-6.8.10-v1
 spec:
   authPlugin: X-Pack
   db:
@@ -10,8 +10,8 @@ spec:
   exporter:
     image: justwatch/elasticsearch_exporter:1.1.0
   initContainer:
-    image: busybox:1.32.0
-    yqImage: kubedb/elasticsearch-init:6.8.10-xpack
+    image: tianon/toybox:0.8.4
+    yqImage: kubedb/elasticsearch-init:6.8.10-xpack-v1
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   stash:
@@ -26,17 +26,18 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: xpack-6.8.10-v1
+  name: xpack-6.8.10
 spec:
   authPlugin: X-Pack
   db:
     image: elasticsearch:6.8.10
+  deprecated: true
   distribution: ElasticStack
   exporter:
     image: justwatch/elasticsearch_exporter:1.1.0
   initContainer:
-    image: tianon/toybox:0.8.4
-    yqImage: kubedb/elasticsearch-init:6.8.10-xpack-v1
+    image: busybox:1.32.0
+    yqImage: kubedb/elasticsearch-init:6.8.10-xpack
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   stash:

diff --git a/catalog/raw/elasticsearch/elasticsearch-6.8.16-elasticstack.yaml b/catalog/raw/elasticsearch/elasticsearch-6.8.16-elasticstack.yaml
@@ -0,0 +1,23 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: xpack-6.8.16
+spec:
+  authPlugin: X-Pack
+  db:
+    image: elasticsearch:6.8.16
+  distribution: ElasticStack
+  exporter:
+    image: justwatch/elasticsearch_exporter:1.1.0
+  initContainer:
+    image: tianon/toybox:0.8.4
+    yqImage: kubedb/elasticsearch-init:6.8.16-xpack
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  stash:
+    addon:
+      backupTask:
+        name: elasticsearch-backup-6.8.0
+      restoreTask:
+        name: elasticsearch-restore-6.8.0
+  version: 6.8.16
diff --git a/catalog/raw/elasticsearch/elasticsearch-7.0.1-elasticstack.yaml b/catalog/raw/elasticsearch/elasticsearch-7.0.1-elasticstack.yaml
@@ -1,7 +1,7 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: xpack-7.0.1
+  name: xpack-7.0.1-v1
 spec:
   authPlugin: X-Pack
   db:
@@ -10,8 +10,8 @@ spec:
   exporter:
     image: justwatch/elasticsearch_exporter:1.1.0
   initContainer:
-    image: busybox:1.32.0
-    yqImage: kubedb/elasticsearch-init:7.0.1-xpack
+    image: tianon/toybox:0.8.4
+    yqImage: kubedb/elasticsearch-init:7.0.1-xpack-v1
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   stash:
@@ -26,17 +26,18 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: xpack-7.0.1-v1
+  name: xpack-7.0.1
 spec:
   authPlugin: X-Pack
   db:
     image: elasticsearch:7.0.1
+  deprecated: true
   distribution: ElasticStack
   exporter:
     image: justwatch/elasticsearch_exporter:1.1.0
   initContainer:
-    image: tianon/toybox:0.8.4
-    yqImage: kubedb/elasticsearch-init:7.0.1-xpack-v1
+    image: busybox:1.32.0
+    yqImage: kubedb/elasticsearch-init:7.0.1-xpack
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   stash:

diff --git a/catalog/raw/elasticsearch/elasticsearch-7.1.1-elasticstack.yaml b/catalog/raw/elasticsearch/elasticsearch-7.1.1-elasticstack.yaml
@@ -1,7 +1,7 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: xpack-7.1.1
+  name: xpack-7.1.1-v1
 spec:
   authPlugin: X-Pack
   db:
@@ -10,8 +10,8 @@ spec:
   exporter:
     image: justwatch/elasticsearch_exporter:1.1.0
   initContainer:
-    image: busybox:1.32.0
-    yqImage: kubedb/elasticsearch-init:7.1.1-xpack
+    image: tianon/toybox:0.8.4
+    yqImage: kubedb/elasticsearch-init:7.1.1-xpack-v1
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   stash:
@@ -26,17 +26,18 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: xpack-7.1.1-v1
+  name: xpack-7.1.1
 spec:
   authPlugin: X-Pack
   db:
     image: elasticsearch:7.1.1
+  deprecated: true
   distribution: ElasticStack
   exporter:
     image: justwatch/elasticsearch_exporter:1.1.0
   initContainer:
-    image: tianon/toybox:0.8.4
-    yqImage: kubedb/elasticsearch-init:7.1.1-xpack-v1
+    image: busybox:1.32.0
+    yqImage: kubedb/elasticsearch-init:7.1.1-xpack
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   stash:

diff --git a/catalog/raw/elasticsearch/elasticsearch-7.12.0-elasticstack.yaml b/catalog/raw/elasticsearch/elasticsearch-7.12.0-elasticstack.yaml
@@ -24,3 +24,31 @@ spec:
       restoreTask:
         name: elasticsearch-restore-7.3.2
   version: 7.12.0
+
+---
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: xpack-7.12.0-v1
+spec:
+  authPlugin: X-Pack
+  db:
+    image: elasticsearch:7.12.0
+  distribution: ElasticStack
+  exporter:
+    image: justwatch/elasticsearch_exporter:1.1.0
+  initContainer:
+    image: tianon/toybox:0.8.4
+    yqImage: kubedb/elasticsearch-init:7.12.0-xpack-v1
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  securityContext:
+    runAsAnyNonRoot: true
+    runAsUser: 1000
+  stash:
+    addon:
+      backupTask:
+        name: elasticsearch-backup-7.3.2
+      restoreTask:
+        name: elasticsearch-restore-7.3.2
+  version: 7.12.0
diff --git a/catalog/raw/elasticsearch/elasticsearch-7.13.1-elasticstack.yaml b/catalog/raw/elasticsearch/elasticsearch-7.13.1-elasticstack.yaml
@@ -0,0 +1,26 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: ElasticsearchVersion
+metadata:
+  name: xpack-7.13.1
+spec:
+  authPlugin: X-Pack
+  db:
+    image: elasticsearch:7.13.1
+  distribution: ElasticStack
+  exporter:
+    image: justwatch/elasticsearch_exporter:1.1.0
+  initContainer:
+    image: tianon/toybox:0.8.4
+    yqImage: kubedb/elasticsearch-init:7.13.1-xpack
+  podSecurityPolicies:
+    databasePolicyName: elasticsearch-db
+  securityContext:
+    runAsAnyNonRoot: true
+    runAsUser: 1000
+  stash:
+    addon:
+      backupTask:
+        name: elasticsearch-backup-7.3.2
+      restoreTask:
+        name: elasticsearch-restore-7.3.2
+  version: 7.13.1
diff --git a/catalog/raw/elasticsearch/elasticsearch-7.2.1-elasticstack.yaml b/catalog/raw/elasticsearch/elasticsearch-7.2.1-elasticstack.yaml
@@ -1,7 +1,7 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: xpack-7.2.1
+  name: xpack-7.2.1-v1
 spec:
   authPlugin: X-Pack
   db:
@@ -10,8 +10,8 @@ spec:
   exporter:
     image: justwatch/elasticsearch_exporter:1.1.0
   initContainer:
-    image: busybox:1.32.0
-    yqImage: kubedb/elasticsearch-init:7.2.1-xpack
+    image: tianon/toybox:0.8.4
+    yqImage: kubedb/elasticsearch-init:7.2.1-xpack-v1
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   stash:
@@ -26,17 +26,18 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: xpack-7.2.1-v1
+  name: xpack-7.2.1
 spec:
   authPlugin: X-Pack
   db:
     image: elasticsearch:7.2.1
+  deprecated: true
   distribution: ElasticStack
   exporter:
     image: justwatch/elasticsearch_exporter:1.1.0
   initContainer:
-    image: tianon/toybox:0.8.4
-    yqImage: kubedb/elasticsearch-init:7.2.1-xpack-v1
+    image: busybox:1.32.0
+    yqImage: kubedb/elasticsearch-init:7.2.1-xpack
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   stash: