Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added DBVersions default objects && Removed '--docker-registry' and '--exporter-tag' from operator flags #259

Merged
merged 10 commits into from
Aug 14, 2018
Merged

Added DBVersions default objects && Removed '--docker-registry' and '--exporter-tag' from operator flags #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9153b94
Added ElasticsearchVersion, MongoDBVersion, MySQLVersion, MemcachedVe…
the-redback Aug 6, 2018
ed95fc3
Remove docker-registry and exporter-tag flag
the-redback Aug 6, 2018
c9ec1bf
use `--ignore-not-found=true` istead of `|| true`
the-redback Aug 6, 2018
c09895a
Check if length is 8 before taking the suffix of length 8
the-redback Aug 9, 2018
8f433b2
added-all
the-redback Aug 9, 2018
1ea5e34
added-all
the-redback Aug 9, 2018
6ec9e6c
refactored kubedb-catalog installation
the-redback Aug 14, 2018
9703f34
added-all
the-redback Aug 14, 2018
7dc8cd8
added-all
the-redback Aug 14, 2018
0381800
Fix catalog installer
tamalsaha Aug 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 109 additions & 0 deletions chart/kubedb-catalog/templates/elasticsearch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
{{ if .Values.catalog.elasticsearch }}
---
apiVersion: kubedb.com/v1alpha1
kind: ElasticsearchVersion
metadata:
name: "5.6"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/elasticsearch:5.6"
exporter:
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"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/elasticsearch:5.6.4"
exporter:
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"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/elasticsearch:6.2.4"
exporter:
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"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/elasticsearch:6.2"
exporter:
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"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/elasticsearch:6.3.0"
exporter:
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"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/elasticsearch:6.3"
exporter:
image: "{{ .Values.dockerRegistry }}/operator:0.8.0"
tools:
image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3"
{{ end }}
33 changes: 33 additions & 0 deletions chart/kubedb-catalog/templates/memcached.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{{ if .Values.catalog.memcached }}
---
apiVersion: kubedb.com/v1alpha1
kind: MemcachedVersion
metadata:
name: "1.5"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
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"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/memcached:1.5.4"
exporter:
image: "{{ .Values.dockerRegistry }}/operator:0.8.0"
{{ end }}
37 changes: 37 additions & 0 deletions chart/kubedb-catalog/templates/mongodb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{{ if .Values.catalog.mongo }}
---
apiVersion: kubedb.com/v1alpha1
kind: MongoDBVersion
metadata:
name: "3.4"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/mongo:3.4"
exporter:
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"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/mongo:3.6"
exporter:
image: "{{ .Values.dockerRegistry }}/operator:0.8.0"
tools:
image: "{{ .Values.dockerRegistry }}/mongo-tools:3.6"
{{ end }}
55 changes: 55 additions & 0 deletions chart/kubedb-catalog/templates/mysql.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{{ if .Values.catalog.mysql }}
---
apiVersion: kubedb.com/v1alpha1
kind: MySQLVersion
metadata:
name: "8.0"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/mysql:8.0"
exporter:
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"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/mysql:5.7"
exporter:
image: "{{ .Values.dockerRegistry }}/operator:0.8.0"
tools:
image: "{{ .Values.dockerRegistry }}/mysql-tools:5.7"

---
apiVersion: kubedb.com/v1alpha1
kind: MySQLVersion
metadata:
name: "5"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/mysql:5"
exporter:
image: "{{ .Values.dockerRegistry }}/operator:0.8.0"
tools:
image: "{{ .Values.dockerRegistry }}/mysql-tools:5"
{{ end }}
2 changes: 2 additions & 0 deletions chart/kubedb-catalog/templates/postgres.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{ if .Values.catalog.postgres }}
---
apiVersion: kubedb.com/v1alpha1
kind: PostgresVersion
Expand Down Expand Up @@ -51,3 +52,4 @@ spec:
image: "{{ .Values.dockerRegistry }}/operator:0.8.0"
tools:
image: "{{ .Values.dockerRegistry }}/postgres-tools:10.2"
{{ end }}
49 changes: 49 additions & 0 deletions chart/kubedb-catalog/templates/redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{{ if .Values.catalog.redis }}
---
apiVersion: kubedb.com/v1alpha1
kind: RedisVersion
metadata:
name: "4.0.6"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
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"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/redis:4.0"
exporter:
image: "{{ .Values.dockerRegistry }}/operator:0.8.0"

---
apiVersion: kubedb.com/v1alpha1
kind: RedisVersion
metadata:
name: "4"
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "kubedb-catalog.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
db:
image: "{{ .Values.dockerRegistry }}/redis:4"
exporter:
image: "{{ .Values.dockerRegistry }}/operator:0.8.0"
{{ end }}
8 changes: 8 additions & 0 deletions chart/kubedb-catalog/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
dockerRegistry: "kubedb"
catalog:
elasticsearch: true
etcd: true
memcached: true
mongo: true
mysql: true
postgres: true
redis: true
2 changes: 0 additions & 2 deletions chart/kubedb/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ spec:
args:
- run
- --v=3
- --docker-registry={{ .Values.kubedb.registry }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be removed from chart values.yaml, README.md

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

used in Operator Deployment. https://github.com/kubedb/cli/blob/add-catalog/chart/kubedb/templates/deployment.yaml#L34

- --exporter-tag={{ .Values.kubedb.tag }}
- --governing-service=kubedb
- --rbac={{ .Values.rbac.create }}
- --secure-port=8443
Expand Down
8 changes: 4 additions & 4 deletions docs/setup/install.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ options:
--run-on-master run KubeDB operator on master
--enable-validating-webhook enable/disable validating webhooks for KubeDB CRDs
--enable-mutating-webhook enable/disable mutating webhooks for KubeDB CRDs
--enable-status-subresource If enabled, uses status sub resource for crds
--enable-status-subresource if enabled, uses status sub resource for crds
--enable-analytics send usage events to Google Analytics (default: true)
--enable-catalog If enabled, installs kubedb database version catalog (default: true)
--install-catalog installs KubeDB database version catalog (default: all)
--uninstall uninstall KubeDB
--purge purges KubeDB crd objects and crds
```
Expand Down Expand Up @@ -107,11 +107,11 @@ $ curl -fsSL https://raw.githubusercontent.com/kubedb/cli/0.8.0/hack/deploy/kube

KubeDB 0.9.0 or later releases can use status sub resource for CustomResourceDefintions. This is enabled by default for Kubernetes 1.11.0 or later releases. To disable this feature, pass the `--enable-status-subresource=false` flag.

KubeDB 0.9.0 or later installs a catalog of database versions. To disable this pass the `--enable-catalog=false` flag.
KubeDB 0.9.0 or later installs a catalog of database versions. To disable this pass the `--install-catalog=none` flag.

```console
$ curl -fsSL https://raw.githubusercontent.com/kubedb/cli/0.8.0/hack/deploy/kubedb.sh \
| bash -s -- --enable-catalog=false [--rbac]
| bash -s -- --install-catalog=none [--rbac]
```

</div>
Expand Down
Loading