Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
tamalsaha committed Oct 14, 2018
1 parent b5a97a6 commit f803ca5
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions docs/concepts/catalog/elasticsearch.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ spec:
We follow this convention for naming ElasticsearchVersion crd:
- Name format: `{Original Elasticsearch version}-{modification tag}`

We modify original Elasticsearch docker image to support additional features like Search Guard plugin integration, custom configuration etc. and re-tag the image with v1,v2 etc. modification tag. An image with higher modification tag will have more feature than the images with lower modification tag. Hence, it is recommended to use ElasticsearchVersion crd with highest modification tag to enjoy latest features.
We modify original Elasticsearch docker image to support additional features like Search Guard plugin integration, custom configuration etc. and re-tag the image with v1, v2 etc. modification tag. An image with higher modification tag will have more feature than the images with lower modification tag. Hence, it is recommended to use ElasticsearchVersion crd with highest modification tag to take advantage of the latest features.

### spec.version

`spec.version` is a required field that specifies the original version of Elasticsearch database that has been used to build the docker image specified in `spec.db.image` field.

### spec.deprecated

`spec.deprecated` is an optional field that specifies whether the docker images specified here is supported by the current KubeDB operator. For example, we have modified `kubedb/elasticsearch:6.2.4` docker image to support custom configuration and re-tagged as `kubedb/elasticsearch:6.2.4-v1`. Now, KubeDB `0.9.0` supports providing custom configuration which required `kubedb/elasticsearch:6.2.4-v1` docker image. So, we have marked `kubedb/elasticsearch:6.2.4` as deprecated for KubeDB `0.9.0`.
`spec.deprecated` is an optional field that specifies whether the docker images specified here is supported by the current KubeDB operator. For example, we have modified `kubedb/elasticsearch:6.2.4` docker image to support custom configuration and re-tagged as `kubedb/elasticsearch:6.2.4-v1`. Now, KubeDB `0.9.0` supports providing custom configuration which required `kubedb/elasticsearch:6.2.4-v1` docker image. So, we have marked `kubedb/elasticsearch:6.2.4` version has been marked deprecated in KubeDB `0.9.0`.

The default value of this field is `false`. If `spec.depcrecated` is set `true`, KubeDB operator will not create the database and other respective resources for this version.

Expand Down
2 changes: 1 addition & 1 deletion docs/guides/elasticsearch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ aliases:
| -------------- | :---------------: | :---------------: | :---------------: | :---------------: | :---------------: |
| 0.1.0 - 0.7.0 | ✓ | ✗ | ✗ | ✗ | ✗ |
| 0.8.0 | ✗ | ✓ | ✓ | ✗ | ✗ |
| 0.9.0-beta.1 | ✗ | ✓ | ✓ | ✓ | ✗ |
| 0.9.0-beta.1 | ✗ | ✓ | ✓ | ✓ | ✓ |

## Supported ElasticsearchVersion CRD

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ prometheus.io/port=56790
prometheus.io/scrape=true
```

The prometheus server will discover the service endpoint using these specifications and will scrap metrics from exporter.
The prometheus server will discover the service endpoint using these specifications and will scrape metrics from exporter.

## Deploy and configure Prometheus server

Expand Down Expand Up @@ -233,7 +233,7 @@ deployment.apps/prometheus-server created
service/prometheus-service created
```

Wait for running Deployment’s Pods.
Wait until pods of the Deployment is running.

```console
$ kubectl get pods -n demo --selector=app=prometheus-server
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ section_menu_id: guides
# Using private Docker registry

KubeDB operator supports using private Docker registry. This tutorial will show you how to run Elasticsearch database in KubeDB using private Docker images.
KubeDB operator supports using private Docker registry. This tutorial will show you how to run KubeDB managed Elasticsearch database using private Docker images.

## Before You Begin

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ prometheus.io/port=56790
prometheus.io/scrape=true
```

The prometheus server will discover the service endpoint aka PostgreSQL Exporter using these specifications and will scrap metrics from exporter.
The prometheus server will discover the service endpoint aka PostgreSQL Exporter using these specifications and will scrape metrics from exporter.

## Deploy and configure Prometheus Server

Expand Down

0 comments on commit f803ca5

Please sign in to comment.