Change Elasticsearch catalog naming format (#272)

Format: `{distribution}-{version}-{modification-tag}` Signed-off-by: kamolhasan <kamol@appscode.com>
kubedb · Mar 10, 2021 · d9adea3 · d9adea3
1 parent 98ce374
commit d9adea3
Show file tree

Hide file tree

Showing 60 changed files with 272 additions and 286 deletions.
diff --git a/catalog/active_versions.json b/catalog/active_versions.json
@@ -1,59 +1,59 @@
 {
   "Elasticsearch": [
-    "1.12.0-opendistro",
-    "7.9.3-searchguard",
-    "7.9.1-xpack-v1",
-    "7.9.1-xpack",
-    "1.11.0-opendistro",
-    "1.10.1-opendistro",
-    "7.8.1-searchguard",
-    "7.8.0-xpack-v1",
-    "7.8.0-xpack",
-    "1.9.0-opendistro-v1",
-    "1.9.0-opendistro",
-    "7.7.1-xpack-v1",
-    "7.7.1-xpack",
-    "1.8.0-opendistro-v1",
-    "1.8.0-opendistro",
-    "7.6.2-xpack-v1",
-    "7.6.2-xpack",
-    "1.7.0-opendistro-v1",
-    "1.7.0-opendistro",
-    "1.6.0-opendistro-v1",
-    "1.6.0-opendistro",
-    "7.5.2-xpack-v1",
-    "7.5.2-xpack",
-    "7.5.2-searchguard-v1",
-    "7.5.2-searchguard",
-    "7.4.2-xpack-v1",
-    "7.4.2-xpack",
-    "1.4.0-opendistro-v1",
-    "1.4.0-opendistro",
-    "7.3.2-xpack-v1",
-    "7.3.2-xpack",
-    "7.3.2-searchguard",
-    "1.3.0-opendistro-v1",
-    "1.3.0-opendistro",
-    "7.2.1-xpack-v1",
-    "7.2.1-xpack",
-    "1.2.1-opendistro-v1",
-    "1.2.1-opendistro",
-    "7.1.1-xpack-v1",
-    "7.1.1-xpack",
-    "7.1.1-searchguard-v1",
-    "7.1.1-searchguard",
-    "1.1.0-opendistro-v1",
-    "1.1.0-opendistro",
-    "7.0.1-xpack-v1",
-    "7.0.1-xpack",
-    "7.0.1-searchguard-v1",
-    "7.0.1-searchguard",
-    "1.0.2-opendistro-v1",
-    "1.0.2-opendistro",
-    "6.8.10-xpack-v1",
-    "6.8.10-xpack",
-    "6.8.1-searchguard-v1",
-    "6.8.1-searchguard"
+    "opendistro-1.12.0",
+    "searchguard-7.9.3",
+    "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.10-v1",
+    "xpack-6.8.10",
+    "searchguard-6.8.1-v1",
+    "searchguard-6.8.1"
   ],
   "Etcd": [
     "3.2.13"

diff --git a/catalog/backup_tasks.json b/catalog/backup_tasks.json
@@ -1,63 +1,63 @@
 {
   "elasticsearch-backup-6.8.0-v7": [
-    "6.8.10-xpack-v1",
-    "6.8.10-xpack",
-    "6.8.1-searchguard-v1",
-    "6.8.1-searchguard"
+    "xpack-6.8.10-v1",
+    "xpack-6.8.10",
+    "searchguard-6.8.1-v1",
+    "searchguard-6.8.1"
   ],
   "elasticsearch-backup-7.2.0-v7": [
-    "7.2.1-xpack-v1",
-    "7.2.1-xpack",
-    "7.1.1-xpack-v1",
-    "7.1.1-xpack",
-    "7.1.1-searchguard-v1",
-    "7.1.1-searchguard",
-    "7.0.1-xpack-v1",
-    "7.0.1-xpack",
-    "7.0.1-searchguard-v1",
-    "7.0.1-searchguard",
-    "1.2.1-opendistro-v1",
-    "1.2.1-opendistro",
-    "1.1.0-opendistro-v1",
-    "1.1.0-opendistro",
-    "1.0.2-opendistro-v1",
-    "1.0.2-opendistro"
+    "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",
+    "searchguard-7.0.1",
+    "opendistro-1.2.1-v1",
+    "opendistro-1.2.1",
+    "opendistro-1.1.0-v1",
+    "opendistro-1.1.0",
+    "opendistro-1.0.2-v1",
+    "opendistro-1.0.2"
   ],
   "elasticsearch-backup-7.3.2-v7": [
-    "7.9.3-searchguard",
-    "7.9.1-xpack-v1",
-    "7.9.1-xpack",
-    "7.8.1-searchguard",
-    "7.8.0-xpack-v1",
-    "7.8.0-xpack",
-    "7.7.1-xpack-v1",
-    "7.7.1-xpack",
-    "7.6.2-xpack-v1",
-    "7.6.2-xpack",
-    "7.5.2-xpack-v1",
-    "7.5.2-xpack",
-    "7.5.2-searchguard-v1",
-    "7.5.2-searchguard",
-    "7.4.2-xpack-v1",
-    "7.4.2-xpack",
-    "7.3.2-xpack-v1",
-    "7.3.2-xpack",
-    "7.3.2-searchguard",
-    "1.12.0-opendistro",
-    "1.11.0-opendistro",
-    "1.10.1-opendistro",
-    "1.9.0-opendistro-v1",
-    "1.9.0-opendistro",
-    "1.8.0-opendistro-v1",
-    "1.8.0-opendistro",
-    "1.7.0-opendistro-v1",
-    "1.7.0-opendistro",
-    "1.6.0-opendistro-v1",
-    "1.6.0-opendistro",
-    "1.4.0-opendistro-v1",
-    "1.4.0-opendistro",
-    "1.3.0-opendistro-v1",
-    "1.3.0-opendistro"
+    "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.9.3",
+    "searchguard-7.8.1",
+    "searchguard-7.5.2-v1",
+    "searchguard-7.5.2",
+    "searchguard-7.3.2",
+    "opendistro-1.9.0-v1",
+    "opendistro-1.9.0",
+    "opendistro-1.8.0-v1",
+    "opendistro-1.8.0",
+    "opendistro-1.7.0-v1",
+    "opendistro-1.7.0",
+    "opendistro-1.6.0-v1",
+    "opendistro-1.6.0",
+    "opendistro-1.4.0-v1",
+    "opendistro-1.4.0",
+    "opendistro-1.3.0-v1",
+    "opendistro-1.3.0",
+    "opendistro-1.12.0",
+    "opendistro-1.11.0",
+    "opendistro-1.10.1"
   ],
   "mariadb-backup-10.5.8-v1": [
     "10.5.8",

diff --git a/catalog/raw/elasticsearch/elasticsearch-6.8.1-searchguard.yaml b/catalog/raw/elasticsearch/elasticsearch-6.8.1-searchguard.yaml
@@ -1,7 +1,7 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 6.8.1-searchguard
+  name: searchguard-6.8.1
   namespace: default
 spec:
   authPlugin: SearchGuard
@@ -30,7 +30,7 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 6.8.1-searchguard-v1
+  name: searchguard-6.8.1-v1
   namespace: default
 spec:
   authPlugin: SearchGuard

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: 6.8.10-xpack
+  name: xpack-6.8.10
   namespace: default
 spec:
   authPlugin: X-Pack
@@ -27,7 +27,7 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 6.8.10-xpack-v1
+  name: xpack-6.8.10-v1
   namespace: default
 spec:
   authPlugin: X-Pack

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: 7.0.1-xpack
+  name: xpack-7.0.1
   namespace: default
 spec:
   authPlugin: X-Pack
@@ -27,7 +27,7 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 7.0.1-xpack-v1
+  name: xpack-7.0.1-v1
   namespace: default
 spec:
   authPlugin: X-Pack

diff --git a/catalog/raw/elasticsearch/elasticsearch-7.0.1-opendistro.yaml b/catalog/raw/elasticsearch/elasticsearch-7.0.1-opendistro.yaml
@@ -1,7 +1,7 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 1.0.2-opendistro
+  name: opendistro-1.0.2
   namespace: default
 spec:
   authPlugin: OpenDistro
@@ -30,7 +30,7 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 1.0.2-opendistro-v1
+  name: opendistro-1.0.2-v1
   namespace: default
 spec:
   authPlugin: OpenDistro

diff --git a/catalog/raw/elasticsearch/elasticsearch-7.0.1-searchguard.yaml b/catalog/raw/elasticsearch/elasticsearch-7.0.1-searchguard.yaml
@@ -1,7 +1,7 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 7.0.1-searchguard
+  name: searchguard-7.0.1
   namespace: default
 spec:
   authPlugin: SearchGuard
@@ -30,7 +30,7 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 7.0.1-searchguard-v1
+  name: searchguard-7.0.1-v1
   namespace: default
 spec:
   authPlugin: SearchGuard

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: 7.1.1-xpack
+  name: xpack-7.1.1
   namespace: default
 spec:
   authPlugin: X-Pack
@@ -27,7 +27,7 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 7.1.1-xpack-v1
+  name: xpack-7.1.1-v1
   namespace: default
 spec:
   authPlugin: X-Pack

diff --git a/catalog/raw/elasticsearch/elasticsearch-7.1.1-opendistro.yaml b/catalog/raw/elasticsearch/elasticsearch-7.1.1-opendistro.yaml
@@ -1,7 +1,7 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 1.1.0-opendistro
+  name: opendistro-1.1.0
   namespace: default
 spec:
   authPlugin: OpenDistro
@@ -30,7 +30,7 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 1.1.0-opendistro-v1
+  name: opendistro-1.1.0-v1
   namespace: default
 spec:
   authPlugin: OpenDistro

diff --git a/catalog/raw/elasticsearch/elasticsearch-7.1.1-searchguard.yaml b/catalog/raw/elasticsearch/elasticsearch-7.1.1-searchguard.yaml
@@ -1,7 +1,7 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 7.1.1-searchguard
+  name: searchguard-7.1.1
   namespace: default
 spec:
   authPlugin: SearchGuard
@@ -30,7 +30,7 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 7.1.1-searchguard-v1
+  name: searchguard-7.1.1-v1
   namespace: default
 spec:
   authPlugin: SearchGuard

diff --git a/catalog/raw/elasticsearch/elasticsearch-7.10.0-opendistro.yaml b/catalog/raw/elasticsearch/elasticsearch-7.10.0-opendistro.yaml
@@ -1,7 +1,7 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: ElasticsearchVersion
 metadata:
-  name: 1.12.0-opendistro
+  name: opendistro-1.12.0
   namespace: default
 spec:
   authPlugin: OpenDistro