From 4dadb1446a6763d91a564092f95d44a251a83d00 Mon Sep 17 00:00:00 2001 From: the-redback Date: Wed, 12 Sep 2018 18:04:04 +0600 Subject: [PATCH 1/5] Use suffix for updated DBImage --- hack/deploy/kubedb-catalog/elasticsearch.yaml | 114 +++++++++++++++++- 1 file changed, 108 insertions(+), 6 deletions(-) diff --git a/hack/deploy/kubedb-catalog/elasticsearch.yaml b/hack/deploy/kubedb-catalog/elasticsearch.yaml index c966ef88d..21d7ba566 100644 --- a/hack/deploy/kubedb-catalog/elasticsearch.yaml +++ b/hack/deploy/kubedb-catalog/elasticsearch.yaml @@ -1,3 +1,19 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "5.6-v1" + labels: + app: kubedb +spec: + version: "5.6" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -6,14 +22,31 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "5.6" db: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "5.6.4-v1" + labels: + app: kubedb +spec: + version: "5.6.4" + db: + 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-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -22,14 +55,31 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "5.6.4" db: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6.4" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6.4" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.2-v1" + labels: + app: kubedb +spec: + version: "6.2" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -38,14 +88,31 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "6.2" db: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.2.4-v1" + labels: + app: kubedb +spec: + version: "6.2.4" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2.4-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2.4-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -54,14 +121,31 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "6.2.4" db: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2.4" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2.4" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.3.0-v1" + labels: + app: kubedb +spec: + version: "6.3.0" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3.0-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2-v1" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3.0-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -70,14 +154,31 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "6.3.0" db: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3.0" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3.0" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.3-v1" + labels: + app: kubedb +spec: + version: "6.3" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -86,10 +187,11 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "6.3" db: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3" From fca2f6822c4d3869c7754514e0847f6f512c6e08 Mon Sep 17 00:00:00 2001 From: the-redback Date: Thu, 13 Sep 2018 10:53:28 +0600 Subject: [PATCH 2/5] Updated catalogs of all dbs --- .../templates/elasticsearch.yaml | 133 +++++++++++++++++- chart/kubedb-catalog/templates/memcached.yaml | 39 ++++- chart/kubedb-catalog/templates/mongodb.yaml | 45 +++++- chart/kubedb-catalog/templates/mysql.yaml | 67 ++++++++- chart/kubedb-catalog/templates/postgres.yaml | 67 ++++++++- chart/kubedb-catalog/templates/redis.yaml | 56 +++++++- hack/deploy/kubedb-catalog/memcached.yaml | 32 ++++- hack/deploy/kubedb-catalog/mongodb.yaml | 38 ++++- hack/deploy/kubedb-catalog/mysql.yaml | 76 +++++++++- hack/deploy/kubedb-catalog/postgres.yaml | 57 +++++++- hack/deploy/kubedb-catalog/redis.yaml | 49 ++++++- 11 files changed, 631 insertions(+), 28 deletions(-) diff --git a/chart/kubedb-catalog/templates/elasticsearch.yaml b/chart/kubedb-catalog/templates/elasticsearch.yaml index 05a3b6e52..f35d9dc92 100644 --- a/chart/kubedb-catalog/templates/elasticsearch.yaml +++ b/chart/kubedb-catalog/templates/elasticsearch.yaml @@ -1,4 +1,23 @@ {{ if .Values.catalog.elasticsearch }} +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "5.6-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "5.6" + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:5.6-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -10,14 +29,34 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "5.6" db: image: "{{ .Values.dockerRegistry }}/elasticsearch:5.6" exporter: - image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "5.6.4-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "5.6.4" + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:5.6.4-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6.4-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -29,14 +68,34 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "5.6.4" db: image: "{{ .Values.dockerRegistry }}/elasticsearch:5.6.4" exporter: - image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6.4" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.2.4-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "6.2.4" + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.2.4-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2.4-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -48,14 +107,34 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "6.2.4" db: image: "{{ .Values.dockerRegistry }}/elasticsearch:6.2.4" exporter: - image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2.4" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.2-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "6.2" + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.2-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -67,14 +146,34 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "6.2" db: image: "{{ .Values.dockerRegistry }}/elasticsearch:6.2" exporter: - image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.3.0-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "6.3.0" + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.3.0-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3.0-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -86,14 +185,35 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "6.3.0" db: image: "{{ .Values.dockerRegistry }}/elasticsearch:6.3.0" exporter: - image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3.0" +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.3-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "6.3" + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.3-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3-v1" +{{ end }} + --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -105,11 +225,12 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "6.3" db: image: "{{ .Values.dockerRegistry }}/elasticsearch:6.3" exporter: - image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3" {{ end }} diff --git a/chart/kubedb-catalog/templates/memcached.yaml b/chart/kubedb-catalog/templates/memcached.yaml index a2a808859..d575351a0 100644 --- a/chart/kubedb-catalog/templates/memcached.yaml +++ b/chart/kubedb-catalog/templates/memcached.yaml @@ -1,4 +1,21 @@ {{ if .Values.catalog.memcached }} +--- +apiVersion: kubedb.com/v1alpha1 +kind: MemcachedVersion +metadata: + name: "1.5-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "1.5" + db: + image: "{{ .Values.dockerRegistry }}/memcached:1.5-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/memcached-exporter:v0.4.1" + --- apiVersion: kubedb.com/v1alpha1 kind: MemcachedVersion @@ -10,11 +27,30 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "1.5" db: image: "{{ .Values.dockerRegistry }}/memcached:1.5" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: MemcachedVersion +metadata: + name: "1.5.4-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "1.5.4" + db: + image: "{{ .Values.dockerRegistry }}/memcached:1.5.4-v1" exporter: image: "{{ .Values.dockerRegistry }}/memcached-exporter:v0.4.1" +{{ end }} --- apiVersion: kubedb.com/v1alpha1 @@ -27,9 +63,10 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "1.5.4" db: image: "{{ .Values.dockerRegistry }}/memcached:1.5.4" exporter: - image: "{{ .Values.dockerRegistry }}/memcached-exporter:v0.4.1" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" {{ end }} diff --git a/chart/kubedb-catalog/templates/mongodb.yaml b/chart/kubedb-catalog/templates/mongodb.yaml index 8c4a117a3..1fc8bcaa7 100644 --- a/chart/kubedb-catalog/templates/mongodb.yaml +++ b/chart/kubedb-catalog/templates/mongodb.yaml @@ -1,4 +1,23 @@ {{ if .Values.catalog.mongo }} +--- +apiVersion: kubedb.com/v1alpha1 +kind: MongoDBVersion +metadata: + name: "3.4-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "3.4" + db: + image: "{{ .Values.dockerRegistry }}/mongo:3.4-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/mongodb_exporter:v1.0.0" + tools: + image: "{{ .Values.dockerRegistry }}/mongo-tools:3.4-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion @@ -10,14 +29,35 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "3.4" db: image: "{{ .Values.dockerRegistry }}/mongo:3.4" exporter: - image: "{{ .Values.dockerRegistry }}/mongodb_exporter:v1.0.0" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/mongo-tools:3.4" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MongoDBVersion +metadata: + name: "3.6-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "3.6" + db: + image: "{{ .Values.dockerRegistry }}/mongo:3.6-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/mongodb_exporter:v1.0.0" + tools: + image: "{{ .Values.dockerRegistry }}/mongo-tools:3.6-v1" +{{ end }} + --- apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion @@ -29,11 +69,12 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "3.6" db: image: "{{ .Values.dockerRegistry }}/mongo:3.6" exporter: - image: "{{ .Values.dockerRegistry }}/mongodb_exporter:v1.0.0" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/mongo-tools:3.6" {{ end }} diff --git a/chart/kubedb-catalog/templates/mysql.yaml b/chart/kubedb-catalog/templates/mysql.yaml index 2117edd2e..f47cd4019 100644 --- a/chart/kubedb-catalog/templates/mysql.yaml +++ b/chart/kubedb-catalog/templates/mysql.yaml @@ -1,4 +1,23 @@ {{ if .Values.catalog.mysql }} +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "8.0-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "8.0" + db: + image: "{{ .Values.dockerRegistry }}/mysql:8.0-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" + tools: + image: "{{ .Values.dockerRegistry }}/mysql-tools:8.0-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion @@ -10,14 +29,34 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "8.0" db: image: "{{ .Values.dockerRegistry }}/mysql:8.0" exporter: - image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/mysql-tools:8.0" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "5.7-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "5.7" + db: + image: "{{ .Values.dockerRegistry }}/mysql:5.7-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" + tools: + image: "{{ .Values.dockerRegistry }}/mysql-tools:5.7-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion @@ -29,14 +68,35 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "5.7" db: image: "{{ .Values.dockerRegistry }}/mysql:5.7" exporter: - image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/mysql-tools:5.7" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "5-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "5" + db: + image: "{{ .Values.dockerRegistry }}/mysql:5-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" + tools: + image: "{{ .Values.dockerRegistry }}/mysql-tools:5-v1" +{{ end }} + --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion @@ -48,11 +108,12 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "5" db: image: "{{ .Values.dockerRegistry }}/mysql:5" exporter: - image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/mysql-tools:5" {{ end }} diff --git a/chart/kubedb-catalog/templates/postgres.yaml b/chart/kubedb-catalog/templates/postgres.yaml index a089852a7..f66fceb9c 100644 --- a/chart/kubedb-catalog/templates/postgres.yaml +++ b/chart/kubedb-catalog/templates/postgres.yaml @@ -1,4 +1,23 @@ {{ if .Values.catalog.postgres }} +--- +apiVersion: kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: "9.6-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "9.6" + db: + image: "{{ .Values.dockerRegistry }}/postgres:9.6-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6" + tools: + image: "{{ .Values.dockerRegistry }}/postgres-tools:9.6-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion @@ -10,14 +29,34 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "9.6" db: image: "{{ .Values.dockerRegistry }}/postgres:9.6" exporter: - image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/postgres-tools:9.6" +--- +apiVersion: kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: "9.6.7-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "9.6.7" + db: + image: "{{ .Values.dockerRegistry }}/postgres:9.6.7-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6" + tools: + image: "{{ .Values.dockerRegistry }}/postgres-tools:9.6.7-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion @@ -29,14 +68,35 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "9.6.7" db: image: "{{ .Values.dockerRegistry }}/postgres:9.6.7" exporter: - image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/postgres-tools:9.6.7" +--- +apiVersion: kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: "10.2-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "10.2" + db: + image: "{{ .Values.dockerRegistry }}/postgres:10.2-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6" + tools: + image: "{{ .Values.dockerRegistry }}/postgres-tools:10.2-v1" +{{ end }} + --- apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion @@ -48,11 +108,12 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "10.2" db: image: "{{ .Values.dockerRegistry }}/postgres:10.2" exporter: - image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/postgres-tools:10.2" {{ end }} diff --git a/chart/kubedb-catalog/templates/redis.yaml b/chart/kubedb-catalog/templates/redis.yaml index 804194e3f..3ad513255 100644 --- a/chart/kubedb-catalog/templates/redis.yaml +++ b/chart/kubedb-catalog/templates/redis.yaml @@ -1,4 +1,21 @@ {{ if .Values.catalog.redis }} +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4.0.6-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "4.0.6" + db: + image: "{{ .Values.dockerRegistry }}/redis:4.0.6-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/redis_exporter:v0.21.1" + --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion @@ -10,9 +27,27 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "4.0.6" db: image: "{{ .Values.dockerRegistry }}/redis:4.0.6" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4.0-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "4.0" + db: + image: "{{ .Values.dockerRegistry }}/redis:4.0-v1" exporter: image: "{{ .Values.dockerRegistry }}/redis_exporter:v0.21.1" @@ -27,11 +62,30 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "4.0" db: image: "{{ .Values.dockerRegistry }}/redis:4.0" + exporter: + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "4" + db: + image: "{{ .Values.dockerRegistry }}/redis:4-v1" exporter: image: "{{ .Values.dockerRegistry }}/redis_exporter:v0.21.1" +{{ end }} --- apiVersion: kubedb.com/v1alpha1 @@ -48,5 +102,5 @@ spec: db: image: "{{ .Values.dockerRegistry }}/redis:4" exporter: - image: "{{ .Values.dockerRegistry }}/redis_exporter:v0.21.1" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" {{ end }} diff --git a/hack/deploy/kubedb-catalog/memcached.yaml b/hack/deploy/kubedb-catalog/memcached.yaml index e9e31ec17..dfc0e0c8d 100644 --- a/hack/deploy/kubedb-catalog/memcached.yaml +++ b/hack/deploy/kubedb-catalog/memcached.yaml @@ -1,3 +1,17 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: MemcachedVersion +metadata: + name: "1.5-v1" + labels: + app: kubedb +spec: + version: "1.5" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/memcached-exporter:v0.4.1" + --- apiVersion: kubedb.com/v1alpha1 kind: MemcachedVersion @@ -6,9 +20,24 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "1.5" db: image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: MemcachedVersion +metadata: + name: "1.5.4-v1" + labels: + app: kubedb +spec: + version: "1.5.4" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5.4-v1" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/memcached-exporter:v0.4.1" @@ -20,8 +49,9 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "1.5.4" db: image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5.4" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/memcached-exporter:v0.4.1" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" diff --git a/hack/deploy/kubedb-catalog/mongodb.yaml b/hack/deploy/kubedb-catalog/mongodb.yaml index 99740faaa..e80681d9c 100644 --- a/hack/deploy/kubedb-catalog/mongodb.yaml +++ b/hack/deploy/kubedb-catalog/mongodb.yaml @@ -1,3 +1,19 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: MongoDBVersion +metadata: + name: "3.4-v1" + labels: + app: kubedb +spec: + version: "3.4" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.4-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/mongodb_exporter:v1.0.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.4-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion @@ -6,14 +22,31 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "3.4" db: image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.4" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/mongodb_exporter:v1.0.0" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.4" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MongoDBVersion +metadata: + name: "3.6-v1" + labels: + app: kubedb +spec: + version: "3.6" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.6-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/mongodb_exporter:v1.0.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.6-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion @@ -22,10 +55,11 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "3.6" db: image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.6" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/mongodb_exporter:v1.0.0" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.6" diff --git a/hack/deploy/kubedb-catalog/mysql.yaml b/hack/deploy/kubedb-catalog/mysql.yaml index fb126ff3d..09ad29531 100644 --- a/hack/deploy/kubedb-catalog/mysql.yaml +++ b/hack/deploy/kubedb-catalog/mysql.yaml @@ -1,3 +1,19 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "8.0-v1" + labels: + app: kubedb +spec: + version: "8.0" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8.0-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8.0-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion @@ -6,14 +22,31 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "8.0" db: image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8.0" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8.0" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "8-v1" + labels: + app: kubedb +spec: + version: "8" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion @@ -22,14 +55,31 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "8" db: image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "5.7-v1" + labels: + app: kubedb +spec: + version: "5.7" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5.7-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5.7-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion @@ -38,14 +88,31 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "5.7" db: image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5.7" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5.7" +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "5-v1" + labels: + app: kubedb +spec: + version: "5" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion @@ -54,10 +121,11 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "5" db: image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5" diff --git a/hack/deploy/kubedb-catalog/postgres.yaml b/hack/deploy/kubedb-catalog/postgres.yaml index 0509c885c..b1f083ee5 100644 --- a/hack/deploy/kubedb-catalog/postgres.yaml +++ b/hack/deploy/kubedb-catalog/postgres.yaml @@ -1,3 +1,19 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: "9.6-v1" + labels: + app: kubedb +spec: + version: "9.6" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres:9.6-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion @@ -6,14 +22,31 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "9.6" db: image: "${KUBEDB_DOCKER_REGISTRY}/postgres:9.6" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6" +--- +apiVersion: kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: "9.6.7-v1" + labels: + app: kubedb +spec: + version: "9.6.7" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres:9.6.7-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6.7-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion @@ -22,14 +55,31 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "9.6.7" db: image: "${KUBEDB_DOCKER_REGISTRY}/postgres:9.6.7" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6.7" +--- +apiVersion: kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: "10.2-v1" + labels: + app: kubedb +spec: + version: "10.2" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres:10.2-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:10.2-v1" + --- apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion @@ -38,10 +88,11 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "10.2" db: image: "${KUBEDB_DOCKER_REGISTRY}/postgres:10.2" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:10.2" diff --git a/hack/deploy/kubedb-catalog/redis.yaml b/hack/deploy/kubedb-catalog/redis.yaml index 51ec99010..2b8fec20f 100644 --- a/hack/deploy/kubedb-catalog/redis.yaml +++ b/hack/deploy/kubedb-catalog/redis.yaml @@ -1,3 +1,17 @@ +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4.0.6-v1" + labels: + app: kubedb +spec: + version: "4.0.6" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0.6-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/redis_exporter:v0.21.1" + --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion @@ -6,9 +20,24 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "4.0.6" db: - image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0.6" + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0.6-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4.0-v1" + labels: + app: kubedb +spec: + version: "4.0" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0-v1" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/redis_exporter:v0.21.1" @@ -20,9 +49,24 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "4.0" db: image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: "4-v1" + labels: + app: kubedb +spec: + version: "4" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4-v1" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/redis_exporter:v0.21.1" @@ -34,8 +78,9 @@ metadata: labels: app: kubedb spec: + deprecated: true version: "4" db: image: "${KUBEDB_DOCKER_REGISTRY}/redis:4" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/redis_exporter:v0.21.1" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" From b3430fd2c9b3bc0dcc17047b1ab25db6a26d9ac4 Mon Sep 17 00:00:00 2001 From: the-redback Date: Thu, 13 Sep 2018 10:58:52 +0600 Subject: [PATCH 3/5] added-all --- chart/kubedb-catalog/templates/redis.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/chart/kubedb-catalog/templates/redis.yaml b/chart/kubedb-catalog/templates/redis.yaml index 3ad513255..348ffa7de 100644 --- a/chart/kubedb-catalog/templates/redis.yaml +++ b/chart/kubedb-catalog/templates/redis.yaml @@ -98,6 +98,7 @@ metadata: heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "4" db: image: "{{ .Values.dockerRegistry }}/redis:4" From 6206506996e33b53b48808329abd53e86073d150 Mon Sep 17 00:00:00 2001 From: the-redback Date: Thu, 13 Sep 2018 11:28:56 +0600 Subject: [PATCH 4/5] Sorted in ascending order --- .../templates/elasticsearch.yaml | 79 +++++++++--------- chart/kubedb-catalog/templates/etcd.yaml | 3 +- chart/kubedb-catalog/templates/memcached.yaml | 29 ++++--- chart/kubedb-catalog/templates/mongodb.yaml | 37 ++++----- chart/kubedb-catalog/templates/mysql.yaml | 65 ++++++++------- chart/kubedb-catalog/templates/postgres.yaml | 57 +++++++------ chart/kubedb-catalog/templates/redis.yaml | 51 ++++++------ hack/deploy/kubedb-catalog/elasticsearch.yaml | 82 +++++++++---------- hack/deploy/kubedb-catalog/memcached.yaml | 28 +++---- hack/deploy/kubedb-catalog/mongodb.yaml | 37 +++++---- hack/deploy/kubedb-catalog/mysql.yaml | 80 +++++++++--------- hack/deploy/kubedb-catalog/postgres.yaml | 48 +++++------ hack/deploy/kubedb-catalog/redis.yaml | 51 ++++++------ 13 files changed, 321 insertions(+), 326 deletions(-) diff --git a/chart/kubedb-catalog/templates/elasticsearch.yaml b/chart/kubedb-catalog/templates/elasticsearch.yaml index f35d9dc92..289f15c48 100644 --- a/chart/kubedb-catalog/templates/elasticsearch.yaml +++ b/chart/kubedb-catalog/templates/elasticsearch.yaml @@ -1,23 +1,4 @@ {{ if .Values.catalog.elasticsearch }} ---- -apiVersion: kubedb.com/v1alpha1 -kind: ElasticsearchVersion -metadata: - name: "5.6-v1" - labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - app: "{{ template "kubedb-catalog.name" . }}" - heritage: "{{ .Release.Service }}" - release: "{{ .Release.Name }}" -spec: - version: "5.6" - db: - image: "{{ .Values.dockerRegistry }}/elasticsearch:5.6-v1" - exporter: - image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" - tools: - image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6-v1" - --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -42,20 +23,20 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "5.6.4-v1" + name: "5.6-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - version: "5.6.4" + version: "5.6" db: - image: "{{ .Values.dockerRegistry }}/elasticsearch:5.6.4-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch:5.6-v1" exporter: image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" tools: - image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6.4-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6-v1" --- apiVersion: kubedb.com/v1alpha1 @@ -81,20 +62,20 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.2.4-v1" + name: "5.6.4-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - version: "6.2.4" + version: "5.6.4" db: - image: "{{ .Values.dockerRegistry }}/elasticsearch:6.2.4-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch:5.6.4-v1" exporter: image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" tools: - image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2.4-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6.4-v1" --- apiVersion: kubedb.com/v1alpha1 @@ -120,20 +101,20 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.2-v1" + name: "6.2.4-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - version: "6.2" + version: "6.2.4" db: - image: "{{ .Values.dockerRegistry }}/elasticsearch:6.2-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.2.4-v1" exporter: image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" tools: - image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2.4-v1" --- apiVersion: kubedb.com/v1alpha1 @@ -159,20 +140,20 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.3.0-v1" + name: "6.2-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - version: "6.3.0" + version: "6.2" db: - image: "{{ .Values.dockerRegistry }}/elasticsearch:6.3.0-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.2-v1" exporter: image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" tools: - image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3.0-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2-v1" --- apiVersion: kubedb.com/v1alpha1 @@ -198,21 +179,20 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.3-v1" + name: "6.3.0-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - version: "6.3" + version: "6.3.0" db: - image: "{{ .Values.dockerRegistry }}/elasticsearch:6.3-v1" + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.3.0-v1" exporter: image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" tools: - image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3-v1" -{{ end }} + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3.0-v1" --- apiVersion: kubedb.com/v1alpha1 @@ -233,4 +213,23 @@ spec: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.3-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "6.3" + db: + image: "{{ .Values.dockerRegistry }}/elasticsearch:6.3-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2" + tools: + image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3-v1" {{ end }} diff --git a/chart/kubedb-catalog/templates/etcd.yaml b/chart/kubedb-catalog/templates/etcd.yaml index 1a383e21d..f651af08d 100644 --- a/chart/kubedb-catalog/templates/etcd.yaml +++ b/chart/kubedb-catalog/templates/etcd.yaml @@ -17,5 +17,4 @@ spec: image: "{{ .Values.dockerRegistry }}/etcd:v3.2.13" tools: image: "{{ .Values.dockerRegistry }}/etcd-tools:3.2.13" - ---- +{{ end }} diff --git a/chart/kubedb-catalog/templates/memcached.yaml b/chart/kubedb-catalog/templates/memcached.yaml index d575351a0..a52ece515 100644 --- a/chart/kubedb-catalog/templates/memcached.yaml +++ b/chart/kubedb-catalog/templates/memcached.yaml @@ -3,70 +3,69 @@ apiVersion: kubedb.com/v1alpha1 kind: MemcachedVersion metadata: - name: "1.5-v1" + name: "1.5" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "1.5" db: - image: "{{ .Values.dockerRegistry }}/memcached:1.5-v1" + image: "{{ .Values.dockerRegistry }}/memcached:1.5" exporter: - image: "{{ .Values.dockerRegistry }}/memcached-exporter:v0.4.1" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" --- apiVersion: kubedb.com/v1alpha1 kind: MemcachedVersion metadata: - name: "1.5" + name: "1.5-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - deprecated: true version: "1.5" db: - image: "{{ .Values.dockerRegistry }}/memcached:1.5" + image: "{{ .Values.dockerRegistry }}/memcached:1.5-v1" exporter: - image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + image: "{{ .Values.dockerRegistry }}/memcached-exporter:v0.4.1" --- apiVersion: kubedb.com/v1alpha1 kind: MemcachedVersion metadata: - name: "1.5.4-v1" + name: "1.5.4" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "1.5.4" db: - image: "{{ .Values.dockerRegistry }}/memcached:1.5.4-v1" + image: "{{ .Values.dockerRegistry }}/memcached:1.5.4" exporter: - image: "{{ .Values.dockerRegistry }}/memcached-exporter:v0.4.1" -{{ end }} + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" --- apiVersion: kubedb.com/v1alpha1 kind: MemcachedVersion metadata: - name: "1.5.4" + name: "1.5.4-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - deprecated: true version: "1.5.4" db: - image: "{{ .Values.dockerRegistry }}/memcached:1.5.4" + image: "{{ .Values.dockerRegistry }}/memcached:1.5.4-v1" exporter: - image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + image: "{{ .Values.dockerRegistry }}/memcached-exporter:v0.4.1" {{ end }} diff --git a/chart/kubedb-catalog/templates/mongodb.yaml b/chart/kubedb-catalog/templates/mongodb.yaml index 1fc8bcaa7..f4eb86d3c 100644 --- a/chart/kubedb-catalog/templates/mongodb.yaml +++ b/chart/kubedb-catalog/templates/mongodb.yaml @@ -3,78 +3,77 @@ apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion metadata: - name: "3.4-v1" + name: "3.4" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "3.4" db: - image: "{{ .Values.dockerRegistry }}/mongo:3.4-v1" + image: "{{ .Values.dockerRegistry }}/mongo:3.4" exporter: - image: "{{ .Values.dockerRegistry }}/mongodb_exporter:v1.0.0" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: - image: "{{ .Values.dockerRegistry }}/mongo-tools:3.4-v1" + image: "{{ .Values.dockerRegistry }}/mongo-tools:3.4" --- apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion metadata: - name: "3.4" + name: "3.4-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - deprecated: true version: "3.4" db: - image: "{{ .Values.dockerRegistry }}/mongo:3.4" + image: "{{ .Values.dockerRegistry }}/mongo:3.4-v1" exporter: - image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + image: "{{ .Values.dockerRegistry }}/mongodb_exporter:v1.0.0" tools: - image: "{{ .Values.dockerRegistry }}/mongo-tools:3.4" + image: "{{ .Values.dockerRegistry }}/mongo-tools:3.4-v1" --- apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion metadata: - name: "3.6-v1" + name: "3.6" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "3.6" db: - image: "{{ .Values.dockerRegistry }}/mongo:3.6-v1" + image: "{{ .Values.dockerRegistry }}/mongo:3.6" exporter: - image: "{{ .Values.dockerRegistry }}/mongodb_exporter:v1.0.0" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: - image: "{{ .Values.dockerRegistry }}/mongo-tools:3.6-v1" -{{ end }} + image: "{{ .Values.dockerRegistry }}/mongo-tools:3.6" --- apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion metadata: - name: "3.6" + name: "3.6-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - deprecated: true version: "3.6" db: - image: "{{ .Values.dockerRegistry }}/mongo:3.6" + image: "{{ .Values.dockerRegistry }}/mongo:3.6-v1" exporter: - image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + image: "{{ .Values.dockerRegistry }}/mongodb_exporter:v1.0.0" tools: - image: "{{ .Values.dockerRegistry }}/mongo-tools:3.6" + image: "{{ .Values.dockerRegistry }}/mongo-tools:3.6-v1" {{ end }} diff --git a/chart/kubedb-catalog/templates/mysql.yaml b/chart/kubedb-catalog/templates/mysql.yaml index f47cd4019..d935a3090 100644 --- a/chart/kubedb-catalog/templates/mysql.yaml +++ b/chart/kubedb-catalog/templates/mysql.yaml @@ -3,117 +3,116 @@ apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: "8.0-v1" + name: "5" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - version: "8.0" + deprecated: true + version: "5" db: - image: "{{ .Values.dockerRegistry }}/mysql:8.0-v1" + image: "{{ .Values.dockerRegistry }}/mysql:5" exporter: - image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: - image: "{{ .Values.dockerRegistry }}/mysql-tools:8.0-v1" + image: "{{ .Values.dockerRegistry }}/mysql-tools:5" --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: "8.0" + name: "5-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - deprecated: true - version: "8.0" + version: "5" db: - image: "{{ .Values.dockerRegistry }}/mysql:8.0" + image: "{{ .Values.dockerRegistry }}/mysql:5-v1" exporter: - image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" tools: - image: "{{ .Values.dockerRegistry }}/mysql-tools:8.0" + image: "{{ .Values.dockerRegistry }}/mysql-tools:5-v1" --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: "5.7-v1" + name: "5.7" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "5.7" db: - image: "{{ .Values.dockerRegistry }}/mysql:5.7-v1" + image: "{{ .Values.dockerRegistry }}/mysql:5.7" exporter: - image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: - image: "{{ .Values.dockerRegistry }}/mysql-tools:5.7-v1" + image: "{{ .Values.dockerRegistry }}/mysql-tools:5.7" --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: "5.7" + name: "5.7-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - deprecated: true version: "5.7" db: - image: "{{ .Values.dockerRegistry }}/mysql:5.7" + image: "{{ .Values.dockerRegistry }}/mysql:5.7-v1" exporter: - image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" tools: - image: "{{ .Values.dockerRegistry }}/mysql-tools:5.7" + image: "{{ .Values.dockerRegistry }}/mysql-tools:5.7-v1" --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: "5-v1" + name: "8.0" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - version: "5" + deprecated: true + version: "8.0" db: - image: "{{ .Values.dockerRegistry }}/mysql:5-v1" + image: "{{ .Values.dockerRegistry }}/mysql:8.0" exporter: - image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: - image: "{{ .Values.dockerRegistry }}/mysql-tools:5-v1" -{{ end }} + image: "{{ .Values.dockerRegistry }}/mysql-tools:8.0" --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: "5" + name: "8.0-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - deprecated: true - version: "5" + version: "8.0" db: - image: "{{ .Values.dockerRegistry }}/mysql:5" + image: "{{ .Values.dockerRegistry }}/mysql:8.0-v1" exporter: - image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" tools: - image: "{{ .Values.dockerRegistry }}/mysql-tools:5" -{{ end }} + image: "{{ .Values.dockerRegistry }}/mysql-tools:8.0-v1" +{{ end }} \ No newline at end of file diff --git a/chart/kubedb-catalog/templates/postgres.yaml b/chart/kubedb-catalog/templates/postgres.yaml index f66fceb9c..28ab6c01c 100644 --- a/chart/kubedb-catalog/templates/postgres.yaml +++ b/chart/kubedb-catalog/templates/postgres.yaml @@ -1,23 +1,4 @@ {{ if .Values.catalog.postgres }} ---- -apiVersion: kubedb.com/v1alpha1 -kind: PostgresVersion -metadata: - name: "9.6-v1" - labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - app: "{{ template "kubedb-catalog.name" . }}" - heritage: "{{ .Release.Service }}" - release: "{{ .Release.Name }}" -spec: - version: "9.6" - db: - image: "{{ .Values.dockerRegistry }}/postgres:9.6-v1" - exporter: - image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6" - tools: - image: "{{ .Values.dockerRegistry }}/postgres-tools:9.6-v1" - --- apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion @@ -42,20 +23,20 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion metadata: - name: "9.6.7-v1" + name: "9.6-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - version: "9.6.7" + version: "9.6" db: - image: "{{ .Values.dockerRegistry }}/postgres:9.6.7-v1" + image: "{{ .Values.dockerRegistry }}/postgres:9.6-v1" exporter: image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6" tools: - image: "{{ .Values.dockerRegistry }}/postgres-tools:9.6.7-v1" + image: "{{ .Values.dockerRegistry }}/postgres-tools:9.6-v1" --- apiVersion: kubedb.com/v1alpha1 @@ -81,21 +62,20 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion metadata: - name: "10.2-v1" + name: "9.6.7-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - version: "10.2" + version: "9.6.7" db: - image: "{{ .Values.dockerRegistry }}/postgres:10.2-v1" + image: "{{ .Values.dockerRegistry }}/postgres:9.6.7-v1" exporter: image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6" tools: - image: "{{ .Values.dockerRegistry }}/postgres-tools:10.2-v1" -{{ end }} + image: "{{ .Values.dockerRegistry }}/postgres-tools:9.6.7-v1" --- apiVersion: kubedb.com/v1alpha1 @@ -116,4 +96,23 @@ spec: image: "{{ .Values.dockerRegistry }}/operator:0.8.0" tools: image: "{{ .Values.dockerRegistry }}/postgres-tools:10.2" -{{ end }} + +--- +apiVersion: kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: "10.2-v1" + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "kubedb-catalog.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" +spec: + version: "10.2" + db: + image: "{{ .Values.dockerRegistry }}/postgres:10.2-v1" + exporter: + image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6" + tools: + image: "{{ .Values.dockerRegistry }}/postgres-tools:10.2-v1" + {{ end }} diff --git a/chart/kubedb-catalog/templates/redis.yaml b/chart/kubedb-catalog/templates/redis.yaml index 348ffa7de..ef2b7afd9 100644 --- a/chart/kubedb-catalog/templates/redis.yaml +++ b/chart/kubedb-catalog/templates/redis.yaml @@ -3,105 +3,104 @@ apiVersion: kubedb.com/v1alpha1 kind: RedisVersion metadata: - name: "4.0.6-v1" + name: "4" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - version: "4.0.6" + deprecated: true + version: "4" db: - image: "{{ .Values.dockerRegistry }}/redis:4.0.6-v1" + image: "{{ .Values.dockerRegistry }}/redis:4" exporter: - image: "{{ .Values.dockerRegistry }}/redis_exporter:v0.21.1" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion metadata: - name: "4.0.6" + name: "4-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - deprecated: true - version: "4.0.6" + version: "4" db: - image: "{{ .Values.dockerRegistry }}/redis:4.0.6" + image: "{{ .Values.dockerRegistry }}/redis:4-v1" exporter: - image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + image: "{{ .Values.dockerRegistry }}/redis_exporter:v0.21.1" --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion metadata: - name: "4.0-v1" + name: "4.0" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: + deprecated: true version: "4.0" db: - image: "{{ .Values.dockerRegistry }}/redis:4.0-v1" + image: "{{ .Values.dockerRegistry }}/redis:4.0" exporter: - image: "{{ .Values.dockerRegistry }}/redis_exporter:v0.21.1" + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion metadata: - name: "4.0" + name: "4.0-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - deprecated: true version: "4.0" db: - image: "{{ .Values.dockerRegistry }}/redis:4.0" + image: "{{ .Values.dockerRegistry }}/redis:4.0-v1" exporter: - image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + image: "{{ .Values.dockerRegistry }}/redis_exporter:v0.21.1" --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion metadata: - name: "4-v1" + name: "4.0.6" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - version: "4" + deprecated: true + version: "4.0.6" db: - image: "{{ .Values.dockerRegistry }}/redis:4-v1" + image: "{{ .Values.dockerRegistry }}/redis:4.0.6" exporter: - image: "{{ .Values.dockerRegistry }}/redis_exporter:v0.21.1" -{{ end }} + image: "{{ .Values.dockerRegistry }}/operator:0.8.0" --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion metadata: - name: "4" + name: "4.0.6-v1" labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: "{{ template "kubedb-catalog.name" . }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" spec: - deprecated: true - version: "4" + version: "4.0.6" db: - image: "{{ .Values.dockerRegistry }}/redis:4" + image: "{{ .Values.dockerRegistry }}/redis:4.0.6-v1" exporter: - image: "{{ .Values.dockerRegistry }}/operator:0.8.0" + image: "{{ .Values.dockerRegistry }}/redis_exporter:v0.21.1" {{ end }} diff --git a/hack/deploy/kubedb-catalog/elasticsearch.yaml b/hack/deploy/kubedb-catalog/elasticsearch.yaml index 21d7ba566..104fa6e0b 100644 --- a/hack/deploy/kubedb-catalog/elasticsearch.yaml +++ b/hack/deploy/kubedb-catalog/elasticsearch.yaml @@ -1,19 +1,3 @@ ---- -apiVersion: kubedb.com/v1alpha1 -kind: ElasticsearchVersion -metadata: - name: "5.6-v1" - labels: - app: kubedb -spec: - version: "5.6" - db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6-v1" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6-v1" - --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion @@ -35,17 +19,17 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "5.6.4-v1" + name: "5.6-v1" labels: app: kubedb spec: - version: "5.6.4" + version: "5.6" db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6.4-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:5.6-v1" 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-v1" --- apiVersion: kubedb.com/v1alpha1 @@ -68,17 +52,17 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.2-v1" + name: "5.6.4-v1" labels: app: kubedb spec: - version: "6.2" + version: "5.6.4" db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2-v1" + 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:6.2-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6.4-v1" --- apiVersion: kubedb.com/v1alpha1 @@ -101,17 +85,17 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.2.4-v1" + name: "6.2-v1" labels: app: kubedb spec: - version: "6.2.4" + version: "6.2" db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2.4-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2-v1" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2.4-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2-v1" --- apiVersion: kubedb.com/v1alpha1 @@ -134,34 +118,34 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.3.0-v1" + name: "6.2.4-v1" labels: app: kubedb spec: - version: "6.3.0" + version: "6.2.4" db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3.0-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.2.4-v1" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3.0-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2.4-v1" --- apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.3.0" + name: "6.3" labels: app: kubedb spec: deprecated: true - version: "6.3.0" + version: "6.3" db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3.0" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3.0" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3" --- apiVersion: kubedb.com/v1alpha1 @@ -183,15 +167,31 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: - name: "6.3" + name: "6.3.0" labels: app: kubedb spec: deprecated: true - version: "6.3" + version: "6.3.0" db: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3.0" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3" + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: "6.3.0-v1" + labels: + app: kubedb +spec: + version: "6.3.0" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch:6.3.0-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2-v1" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3.0-v1" diff --git a/hack/deploy/kubedb-catalog/memcached.yaml b/hack/deploy/kubedb-catalog/memcached.yaml index dfc0e0c8d..d10391644 100644 --- a/hack/deploy/kubedb-catalog/memcached.yaml +++ b/hack/deploy/kubedb-catalog/memcached.yaml @@ -2,56 +2,56 @@ apiVersion: kubedb.com/v1alpha1 kind: MemcachedVersion metadata: - name: "1.5-v1" + name: "1.5" labels: app: kubedb spec: + deprecated: true version: "1.5" db: - image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/memcached-exporter:v0.4.1" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" --- apiVersion: kubedb.com/v1alpha1 kind: MemcachedVersion metadata: - name: "1.5" + name: "1.5-v1" labels: app: kubedb spec: - deprecated: true version: "1.5" db: - image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5" + image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5-v1" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + image: "${KUBEDB_DOCKER_REGISTRY}/memcached-exporter:v0.4.1" --- apiVersion: kubedb.com/v1alpha1 kind: MemcachedVersion metadata: - name: "1.5.4-v1" + name: "1.5.4" labels: app: kubedb spec: + deprecated: true version: "1.5.4" db: - image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5.4-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5.4" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/memcached-exporter:v0.4.1" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" --- apiVersion: kubedb.com/v1alpha1 kind: MemcachedVersion metadata: - name: "1.5.4" + name: "1.5.4-v1" labels: app: kubedb spec: - deprecated: true version: "1.5.4" db: - image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5.4" + image: "${KUBEDB_DOCKER_REGISTRY}/memcached:1.5.4-v1" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + image: "${KUBEDB_DOCKER_REGISTRY}/memcached-exporter:v0.4.1" diff --git a/hack/deploy/kubedb-catalog/mongodb.yaml b/hack/deploy/kubedb-catalog/mongodb.yaml index e80681d9c..8bad4990d 100644 --- a/hack/deploy/kubedb-catalog/mongodb.yaml +++ b/hack/deploy/kubedb-catalog/mongodb.yaml @@ -2,64 +2,65 @@ apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion metadata: - name: "3.4-v1" + name: "3.4" labels: app: kubedb spec: + deprecated: true version: "3.4" db: - image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.4-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.4" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/mongodb_exporter:v1.0.0" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.4-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.4" --- apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion metadata: - name: "3.4" + name: "3.4-v1" labels: app: kubedb spec: - deprecated: true version: "3.4" db: - image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.4" + image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.4-v1" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + image: "${KUBEDB_DOCKER_REGISTRY}/mongodb_exporter:v1.0.0" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.4" + image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.4-v1" --- apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion metadata: - name: "3.6-v1" + name: "3.6" labels: app: kubedb spec: + deprecated: true version: "3.6" db: - image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.6-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.6" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/mongodb_exporter:v1.0.0" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.6-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.6" --- apiVersion: kubedb.com/v1alpha1 kind: MongoDBVersion metadata: - name: "3.6" + name: "3.6-v1" labels: app: kubedb spec: - deprecated: true version: "3.6" db: - image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.6" + image: "${KUBEDB_DOCKER_REGISTRY}/mongo:3.6-v1" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + image: "${KUBEDB_DOCKER_REGISTRY}/mongodb_exporter:v1.0.0" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.6" + image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.6-v1" + diff --git a/hack/deploy/kubedb-catalog/mysql.yaml b/hack/deploy/kubedb-catalog/mysql.yaml index 09ad29531..58795f0bc 100644 --- a/hack/deploy/kubedb-catalog/mysql.yaml +++ b/hack/deploy/kubedb-catalog/mysql.yaml @@ -2,67 +2,51 @@ apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: "8.0-v1" - labels: - app: kubedb -spec: - version: "8.0" - db: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8.0-v1" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8.0-v1" - ---- -apiVersion: kubedb.com/v1alpha1 -kind: MySQLVersion -metadata: - name: "8.0" + name: "5" labels: app: kubedb spec: deprecated: true - version: "8.0" + version: "5" db: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8.0" + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8.0" + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5" --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: "8-v1" + name: "5-v1" labels: app: kubedb spec: - version: "8" + version: "5" db: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5-v1" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5-v1" --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: "8" + name: "5.7" labels: app: kubedb spec: deprecated: true - version: "8" + version: "5.7" db: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8" + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5.7" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8" + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5.7" --- apiVersion: kubedb.com/v1alpha1 @@ -84,48 +68,64 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: "5.7" + name: "8" labels: app: kubedb spec: deprecated: true - version: "5.7" + version: "8" db: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5.7" + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5.7" + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8" --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: "5-v1" + name: "8-v1" labels: app: kubedb spec: - version: "5" + version: "8" db: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8-v1" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8-v1" --- apiVersion: kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: "5" + name: "8.0" labels: app: kubedb spec: deprecated: true - version: "5" + version: "8.0" db: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql:5" + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8.0" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5" + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8.0" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: MySQLVersion +metadata: + name: "8.0-v1" + labels: + app: kubedb +spec: + version: "8.0" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql:8.0-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8.0-v1" diff --git a/hack/deploy/kubedb-catalog/postgres.yaml b/hack/deploy/kubedb-catalog/postgres.yaml index b1f083ee5..9264d6a1f 100644 --- a/hack/deploy/kubedb-catalog/postgres.yaml +++ b/hack/deploy/kubedb-catalog/postgres.yaml @@ -1,19 +1,3 @@ ---- -apiVersion: kubedb.com/v1alpha1 -kind: PostgresVersion -metadata: - name: "9.6-v1" - labels: - app: kubedb -spec: - version: "9.6" - db: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres:9.6-v1" - exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6" - tools: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6-v1" - --- apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion @@ -35,17 +19,17 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion metadata: - name: "9.6.7-v1" + name: "9.6-v1" labels: app: kubedb spec: - version: "9.6.7" + version: "9.6" db: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres:9.6.7-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/postgres:9.6-v1" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6.7-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6-v1" --- apiVersion: kubedb.com/v1alpha1 @@ -68,17 +52,17 @@ spec: apiVersion: kubedb.com/v1alpha1 kind: PostgresVersion metadata: - name: "10.2-v1" + name: "9.6.7-v1" labels: app: kubedb spec: - version: "10.2" + version: "9.6.7" db: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres:10.2-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/postgres:9.6.7-v1" exporter: image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6" tools: - image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:10.2-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6.7-v1" --- apiVersion: kubedb.com/v1alpha1 @@ -96,3 +80,19 @@ spec: image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" tools: image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:10.2" + +--- +apiVersion: kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: "10.2-v1" + labels: + app: kubedb +spec: + version: "10.2" + db: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres:10.2-v1" + exporter: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6" + tools: + image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:10.2-v1" diff --git a/hack/deploy/kubedb-catalog/redis.yaml b/hack/deploy/kubedb-catalog/redis.yaml index 2b8fec20f..53614abbb 100644 --- a/hack/deploy/kubedb-catalog/redis.yaml +++ b/hack/deploy/kubedb-catalog/redis.yaml @@ -2,85 +2,86 @@ apiVersion: kubedb.com/v1alpha1 kind: RedisVersion metadata: - name: "4.0.6-v1" + name: "4" labels: app: kubedb spec: - version: "4.0.6" + deprecated: true + version: "4" db: - image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0.6-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/redis_exporter:v0.21.1" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion metadata: - name: "4.0.6" + name: "4-v1" labels: app: kubedb spec: - deprecated: true - version: "4.0.6" + version: "4" db: - image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0.6-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4-v1" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + image: "${KUBEDB_DOCKER_REGISTRY}/redis_exporter:v0.21.1" --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion metadata: - name: "4.0-v1" + name: "4.0" labels: app: kubedb spec: + deprecated: true version: "4.0" db: - image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/redis_exporter:v0.21.1" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion metadata: - name: "4.0" + name: "4.0-v1" labels: app: kubedb spec: - deprecated: true version: "4.0" db: - image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0" + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0-v1" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + image: "${KUBEDB_DOCKER_REGISTRY}/redis_exporter:v0.21.1" --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion metadata: - name: "4-v1" + name: "4.0.6" labels: app: kubedb spec: - version: "4" + deprecated: true + version: "4.0.6" db: - image: "${KUBEDB_DOCKER_REGISTRY}/redis:4-v1" + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0.6-v1" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/redis_exporter:v0.21.1" + image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" --- apiVersion: kubedb.com/v1alpha1 kind: RedisVersion metadata: - name: "4" + name: "4.0.6-v1" labels: app: kubedb spec: - deprecated: true - version: "4" + version: "4.0.6" db: - image: "${KUBEDB_DOCKER_REGISTRY}/redis:4" + image: "${KUBEDB_DOCKER_REGISTRY}/redis:4.0.6-v1" exporter: - image: "${KUBEDB_DOCKER_REGISTRY}/operator:0.8.0" + image: "${KUBEDB_DOCKER_REGISTRY}/redis_exporter:v0.21.1" + From e7b5c4cb6ee3c72595208aa2504a654f3fe99384 Mon Sep 17 00:00:00 2001 From: the-redback Date: Thu, 13 Sep 2018 11:32:37 +0600 Subject: [PATCH 5/5] added-all --- chart/kubedb-catalog/templates/mysql.yaml | 2 +- chart/kubedb-catalog/templates/postgres.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/kubedb-catalog/templates/mysql.yaml b/chart/kubedb-catalog/templates/mysql.yaml index d935a3090..dee4a1a50 100644 --- a/chart/kubedb-catalog/templates/mysql.yaml +++ b/chart/kubedb-catalog/templates/mysql.yaml @@ -115,4 +115,4 @@ spec: image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0" tools: image: "{{ .Values.dockerRegistry }}/mysql-tools:8.0-v1" -{{ end }} \ No newline at end of file +{{ end }} diff --git a/chart/kubedb-catalog/templates/postgres.yaml b/chart/kubedb-catalog/templates/postgres.yaml index 28ab6c01c..9735b05b8 100644 --- a/chart/kubedb-catalog/templates/postgres.yaml +++ b/chart/kubedb-catalog/templates/postgres.yaml @@ -115,4 +115,4 @@ spec: image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6" tools: image: "{{ .Values.dockerRegistry }}/postgres-tools:10.2-v1" - {{ end }} +{{ end }}