From f2180442a46e6f26354bdc14a364c8211546e819 Mon Sep 17 00:00:00 2001 From: emruz-hossain Date: Wed, 3 Oct 2018 18:33:27 +0600 Subject: [PATCH 1/3] Add Support for Elasticsearch 6.4 --- .../templates/elasticsearch.yaml | 39 +++++++++++++++++++ hack/deploy/kubedb-catalog/elasticsearch.yaml | 32 +++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/chart/kubedb-catalog/templates/elasticsearch.yaml b/chart/kubedb-catalog/templates/elasticsearch.yaml index 1b19ad2ee..93c918d76 100644 --- a/chart/kubedb-catalog/templates/elasticsearch.yaml +++ b/chart/kubedb-catalog/templates/elasticsearch.yaml @@ -233,3 +233,42 @@ spec: tools: image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3-v1" {{ end }} + +--- +apiVersion: catalog.kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.4.0-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "6.4.0" + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.4.0-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.4.0-v1" + +--- +apiVersion: catalog.kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.4-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "6.4" + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.4-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.4-v1" + {{ end }} diff --git a/hack/deploy/kubedb-catalog/elasticsearch.yaml b/hack/deploy/kubedb-catalog/elasticsearch.yaml index 6f027d175..2a906e48b 100644 --- a/hack/deploy/kubedb-catalog/elasticsearch.yaml +++ b/hack/deploy/kubedb-catalog/elasticsearch.yaml @@ -195,3 +195,35 @@ spec: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2-v1" tools: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3.0-v1" + +--- +apiVersion: catalog.kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.4-v1" + labels: + app: kubedb +spec: + version: "6.4" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.4-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.4-v1" + +--- +apiVersion: catalog.kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.4.0-v1" + labels: + app: kubedb +spec: + version: "6.4.0" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.4.0-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2-v1" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.4.0-v1" From 1bad288b284a4d75688162474866fd7af9833aea Mon Sep 17 00:00:00 2001 From: emruz-hossain Date: Thu, 4 Oct 2018 18:04:03 +0600 Subject: [PATCH 2/3] removed suffix for new database --- .../templates/elasticsearch.yaml | 12 ++++++------ hack/deploy/kubedb-catalog/elasticsearch.yaml | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/chart/kubedb-catalog/templates/elasticsearch.yaml b/chart/kubedb-catalog/templates/elasticsearch.yaml index 93c918d76..488fbabc5 100644 --- a/chart/kubedb-catalog/templates/elasticsearch.yaml +++ b/chart/kubedb-catalog/templates/elasticsearch.yaml @@ -238,7 +238,7 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.4.0-v1" + name: "6.4.0" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" @@ -247,17 +247,17 @@ metadata: spec: version: "6.4.0" db: - image: "{{ .Values.dockerRegistry }}/elasticsearch:6.4.0-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.4.0" exporter: image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" tools: - image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.4.0-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.4.0" --- apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.4-v1" + name: "6.4" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" @@ -266,9 +266,9 @@ metadata: spec: version: "6.4" db: - image: "{{ .Values.dockerRegistry }}/elasticsearch:6.4-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.4" exporter: image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" tools: - image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.4-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.4" {{ end }} diff --git a/hack/deploy/kubedb-catalog/elasticsearch.yaml b/hack/deploy/kubedb-catalog/elasticsearch.yaml index 2a906e48b..6aeddb2ee 100644 --- a/hack/deploy/kubedb-catalog/elasticsearch.yaml +++ b/hack/deploy/kubedb-catalog/elasticsearch.yaml @@ -52,17 +52,17 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "5.6.4-v1" + name: "5.6.4" labels: app: kubedb spec: version: "5.6.4" db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6.4-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6.4" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6.4-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6.4" --- apiVersion: catalog.kubedb.com/v1alpha1 @@ -200,30 +200,30 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.4-v1" + name: "6.4" labels: app: kubedb spec: version: "6.4" db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.4-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.4" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.4-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.4" --- apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.4.0-v1" + name: "6.4.0" labels: app: kubedb spec: version: "6.4.0" db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.4.0-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.4.0" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2-v1" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.4.0-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.4.0" From 3ce7c3e0afcf8cb9effbddf8a7f7381eefe6758f Mon Sep 17 00:00:00 2001 From: emruz-hossain Date: Fri, 5 Oct 2018 09:43:59 +0600 Subject: [PATCH 3/3] fixed accidental v1 suffix deletion from 5.6.4 --- hack/deploy/kubedb-catalog/elasticsearch.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/deploy/kubedb-catalog/elasticsearch.yaml b/hack/deploy/kubedb-catalog/elasticsearch.yaml index 6aeddb2ee..841b906e3 100644 --- a/hack/deploy/kubedb-catalog/elasticsearch.yaml +++ b/hack/deploy/kubedb-catalog/elasticsearch.yaml @@ -52,17 +52,17 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "5.6.4" + name: "5.6.4-v1" labels: app: kubedb spec: version: "5.6.4" db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6.4" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6.4-v1" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6.4" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6.4-v1" --- apiVersion: catalog.kubedb.com/v1alpha1