diff --git a/README.md b/README.md index bf3d46236..4b7e65310 100644 --- a/README.md +++ b/README.md @@ -38,12 +38,12 @@ versions. | Chart | Docker documentation | Latest 7 Version | Latest 6 Version | |--------------------------------------------|-----------------------------------------------------------------------------|----------------------------|-----------------------------| -| [APM-Server](./apm-server/README.md) | https://www.elastic.co/guide/en/apm/server/6.8/running-on-docker.html | [`7.8.0`][apm-7] | [`6.8.11`][apm-6] | -| [Elasticsearch](./elasticsearch/README.md) | https://www.elastic.co/guide/en/elasticsearch/reference/6.8/docker.html | [`7.8.0`][elasticsearch-7] | [`6.8.11`][elasticsearch-6] | -| [Filebeat](./filebeat/README.md) | https://www.elastic.co/guide/en/beats/filebeat/6.8/running-on-docker.html | [`7.8.0`][filebeat-7] | [`6.8.11`][filebeat-6] | -| [Kibana](./kibana/README.md) | https://www.elastic.co/guide/en/kibana/6.8/docker.html | [`7.8.0`][kibana-7] | [`6.8.11`][kibana-6] | -| [Logstash](./logstash/README.md) | https://www.elastic.co/guide/en/logstash/6.8/docker.html | [`7.8.0`][logstash-7] | [`6.8.11`][logstash-6] | -| [Metricbeat](./metricbeat/README.md) | https://www.elastic.co/guide/en/beats/metricbeat/6.8/running-on-docker.html | [`7.8.0`][metricbeat-7] | [`6.8.11`][metricbeat-6] | +| [APM-Server](./apm-server/README.md) | https://www.elastic.co/guide/en/apm/server/6.8/running-on-docker.html | [`7.9.0`][apm-7] | [`6.8.12`][apm-6] | +| [Elasticsearch](./elasticsearch/README.md) | https://www.elastic.co/guide/en/elasticsearch/reference/6.8/docker.html | [`7.9.0`][elasticsearch-7] | [`6.8.12`][elasticsearch-6] | +| [Filebeat](./filebeat/README.md) | https://www.elastic.co/guide/en/beats/filebeat/6.8/running-on-docker.html | [`7.9.0`][filebeat-7] | [`6.8.12`][filebeat-6] | +| [Kibana](./kibana/README.md) | https://www.elastic.co/guide/en/kibana/6.8/docker.html | [`7.9.0`][kibana-7] | [`6.8.12`][kibana-6] | +| [Logstash](./logstash/README.md) | https://www.elastic.co/guide/en/logstash/6.8/docker.html | [`7.9.0`][logstash-7] | [`6.8.12`][logstash-6] | +| [Metricbeat](./metricbeat/README.md) | https://www.elastic.co/guide/en/beats/metricbeat/6.8/running-on-docker.html | [`7.9.0`][metricbeat-7] | [`6.8.12`][metricbeat-6] | ## Supported Configurations @@ -102,15 +102,15 @@ Kubernetes. [operator pattern]: https://kubernetes.io/docs/concepts/extend-kubernetes/operator/ [elasticsearch-771]: https://github.com/elastic/helm-charts/tree/7.7.1/elasticsearch/ -[apm-7]: https://github.com/elastic/helm-charts/tree/7.8.0/apm-server/README.md -[apm-6]: https://github.com/elastic/helm-charts/tree/6.8.11/apm-server/README.md -[elasticsearch-7]: https://github.com/elastic/helm-charts/tree/7.8.0/elasticsearch/README.md -[elasticsearch-6]: https://github.com/elastic/helm-charts/tree/6.8.11/elasticsearch/README.md -[filebeat-7]: https://github.com/elastic/helm-charts/tree/7.8.0/filebeat/README.md -[filebeat-6]: https://github.com/elastic/helm-charts/tree/6.8.11/filebeat/README.md -[kibana-7]: https://github.com/elastic/helm-charts/tree/7.8.0/kibana/README.md -[kibana-6]: https://github.com/elastic/helm-charts/tree/6.8.11/kibana/README.md -[logstash-7]: https://github.com/elastic/helm-charts/tree/7.8.0/logstash/README.md -[logstash-6]: https://github.com/elastic/helm-charts/tree/6.8.11/logstash/README.md -[metricbeat-7]: https://github.com/elastic/helm-charts/tree/7.8.0/metricbeat/README.md -[metricbeat-6]: https://github.com/elastic/helm-charts/tree/6.8.11/metricbeat/README.md +[apm-7]: https://github.com/elastic/helm-charts/tree/7.9.0/apm-server/README.md +[apm-6]: https://github.com/elastic/helm-charts/tree/6.8.12/apm-server/README.md +[elasticsearch-7]: https://github.com/elastic/helm-charts/tree/7.9.0/elasticsearch/README.md +[elasticsearch-6]: https://github.com/elastic/helm-charts/tree/6.8.12/elasticsearch/README.md +[filebeat-7]: https://github.com/elastic/helm-charts/tree/7.9.0/filebeat/README.md +[filebeat-6]: https://github.com/elastic/helm-charts/tree/6.8.12/filebeat/README.md +[kibana-7]: https://github.com/elastic/helm-charts/tree/7.9.0/kibana/README.md +[kibana-6]: https://github.com/elastic/helm-charts/tree/6.8.12/kibana/README.md +[logstash-7]: https://github.com/elastic/helm-charts/tree/7.9.0/logstash/README.md +[logstash-6]: https://github.com/elastic/helm-charts/tree/6.8.12/logstash/README.md +[metricbeat-7]: https://github.com/elastic/helm-charts/tree/7.9.0/metricbeat/README.md +[metricbeat-6]: https://github.com/elastic/helm-charts/tree/6.8.12/metricbeat/README.md diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index 33c43ca61..43e8cb4ed 100755 --- a/apm-server/Chart.yaml +++ b/apm-server/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: apm-server -version: 6.8.12-SNAPSHOT -appVersion: 6.8.12-SNAPSHOT +version: 6.8.12 +appVersion: 6.8.12 sources: - https://github.com/elastic/apm icon: https://helm.elastic.co/icons/apm.png diff --git a/apm-server/README.md b/apm-server/README.md index 61a50082f..68846c118 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -8,9 +8,6 @@ The design and code is less mature than official GA features and is being provided as-is with no warranties. Alpha features are not subject to the support SLA of official GA features (see [supported configurations][] for more details). -**Warning**: This branch is used for development, please use [6.8.11][] release -for released version. - @@ -18,8 +15,6 @@ for released version. - [Requirements](#requirements) - [Installing](#installing) - - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 6.8 branch and 6.8.12-SNAPSHOT versions](#install-development-version-using-68-branch-and-6812-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -43,24 +38,14 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.12-SNAPSHOT versions. - -## Install released version using Helm repository +This chart is tested with the latest 6.8.12 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name apm-server --version 6.8.11 elastic/apm-server` - - with [Helm 3 (beta)][]: `helm install apm-server --version 6.8.11 elastic/apm-server` - -### Install development version using 6.8 branch and 6.8.12-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: - - with Helm 2: `helm install --name apm-server ./helm-charts/apm-server` - - with [Helm 3 (beta)][]: `helm install apm-server ./helm-charts/apm-server` + - with Helm 2: `helm install --name apm-server --version 6.8.12 elastic/apm-server` + - with [Helm 3 (beta)][]: `helm install apm-server --version 6.8.12 elastic/apm-server` ## Upgrading @@ -98,7 +83,7 @@ as a reference. They are also used in the automated testing of this chart. | `fullnameOverride` | Overrides the full name of the resources. If not set the name will default to `.Release.Name` - `.Values.nameOverride` or `.Chart.Name` | `""` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The APM Server Docker image tag | `6.8.12-SNAPSHOT` | +| `imageTag` | The APM Server Docker image tag | `6.8.12` | | `image` | The APM Server Docker image | `docker.elastic.co/apm/apm-server` | | `ingress` | Configurable [ingress][] to expose the APM Server service | see [values.yaml][] | | `labels` | Configurable [labels][] applied to all APM server pods | `{}` | @@ -147,7 +132,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[6.8.11]: https://github.com/elastic/helm-charts/blob/6.8.11/apm-server/README.md +[6.8.12]: https://github.com/elastic/helm-charts/blob/6.8.12/apm-server/README.md [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md diff --git a/apm-server/examples/default/README.md b/apm-server/examples/default/README.md index d8359682c..d58a088c5 100644 --- a/apm-server/examples/default/README.md +++ b/apm-server/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy APM Server 6.8.12-SNAPSHOT using [default values][]. +This example deploy APM Server 6.8.12 using [default values][]. ## Usage diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index c0ac1eb12..7d020d915 100644 --- a/apm-server/examples/oss/README.md +++ b/apm-server/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy APM Server 6.8.12-SNAPSHOT using [APM Server OSS][] version. +This example deploy APM Server 6.8.12 using [APM Server OSS][] version. ## Usage diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md index c434f3e55..b329e2fc9 100644 --- a/apm-server/examples/security/README.md +++ b/apm-server/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy APM Server 6.8.12-SNAPSHOT using authentication and TLS to connect to +This example deploy APM Server 6.8.12 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/apm-server/values.yaml b/apm-server/values.yaml index 838d88a90..a9a3faf97 100755 --- a/apm-server/values.yaml +++ b/apm-server/values.yaml @@ -62,7 +62,7 @@ extraVolumes: [] # emptyDir: {} image: "docker.elastic.co/apm/apm-server" -imageTag: "6.8.12-SNAPSHOT" +imageTag: "6.8.12" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 299d45edf..e3fdb1d08 100755 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: elasticsearch -version: 6.8.12-SNAPSHOT -appVersion: 6.8.12-SNAPSHOT +version: 6.8.12 +appVersion: 6.8.12 sources: - https://github.com/elastic/elasticsearch icon: https://helm.elastic.co/icons/elasticsearch.png diff --git a/elasticsearch/README.md b/elasticsearch/README.md index 52f18f8fa..c5085e737 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -8,9 +8,6 @@ The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features (see [supported configurations][] for more details). -**Warning**: This branch is used for development, please use [6.8.11][] release -for released version. - @@ -18,8 +15,6 @@ for released version. - [Requirements](#requirements) - [Installing](#installing) - - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 6.8 branch and 6.8.12-SNAPSHOT versions](#install-development-version-using-68-branch-and-6812-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -58,25 +53,14 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.12-SNAPSHOT versions. - -### Install released version using Helm repository +This chart is tested with the latest 6.8.12 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name elasticsearch --version 6.8.11 elastic/elasticsearch` - - with [Helm 3 (beta)][]: `helm install elasticsearch --version 6.8.11 elastic/elasticsearch` - -### Install development version using 6.8 branch and 6.8.12-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: - - with Helm 2: `helm install --name elasticsearch ./helm-charts/elasticsearch` - - with [Helm 3 (beta)][]: `helm install elasticsearch ./helm-charts/elasticsearch` - + - with Helm 2: `helm install --name elasticsearch --version 6.8.12 elastic/elasticsearch` + - with [Helm 3 (beta)][]: `helm install elasticsearch --version 6.8.12 elastic/elasticsearch` ## Upgrading @@ -131,7 +115,7 @@ support multiple versions with minimal changes. | `httpPort` | The http port that Kubernetes will use for the healthchecks and the service. If you change this you will also need to set [http.port][] in `extraEnvs` | `9200` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The Elasticsearch Docker image tag | `6.8.12-SNAPSHOT` | +| `imageTag` | The Elasticsearch Docker image tag | `6.8.12` | | `image` | The Elasticsearch Docker image | `docker.elastic.co/elasticsearch/elasticsearch` | | `ingress` | Configurable [ingress][] to expose the Elasticsearch service. See [values.yaml][] for an example | see [values.yaml][] | | `initResources` | Allows you to set the [resources][] for the `initContainer` in the StatefulSet | `{}` | @@ -393,7 +377,7 @@ about our development and testing process. [#63]: https://github.com/elastic/helm-charts/issues/63 -[6.8.11]: https://github.com/elastic/helm-charts/blob/6.8.11/elasticsearch/README.md +[6.8.12]: https://github.com/elastic/helm-charts/blob/6.8.12/elasticsearch/README.md [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md diff --git a/elasticsearch/examples/config/README.md b/elasticsearch/examples/config/README.md index e69694ad5..ef996a902 100644 --- a/elasticsearch/examples/config/README.md +++ b/elasticsearch/examples/config/README.md @@ -1,6 +1,6 @@ # Config -This example deploy a single node Elasticsearch 6.8.12-SNAPSHOT with authentication and +This example deploy a single node Elasticsearch 6.8.12 with authentication and custom [values][]. diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md index 1378d2640..3f1312f1c 100644 --- a/elasticsearch/examples/default/README.md +++ b/elasticsearch/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy a 3 nodes Elasticsearch 6.8.12-SNAPSHOT cluster using +This example deploy a 3 nodes Elasticsearch 6.8.12 cluster using [default values][]. diff --git a/elasticsearch/examples/docker-for-mac/README.md b/elasticsearch/examples/docker-for-mac/README.md index 8d6af7ce8..1924ca679 100644 --- a/elasticsearch/examples/docker-for-mac/README.md +++ b/elasticsearch/examples/docker-for-mac/README.md @@ -1,6 +1,6 @@ # Docker for Mac -This example deploy a 3 nodes Elasticsearch 6.8.12-SNAPSHOT cluster on [Docker for Mac][] +This example deploy a 3 nodes Elasticsearch 6.8.12 cluster on [Docker for Mac][] using [custom values][]. Note that this configuration should be used for test only and isn't recommended diff --git a/elasticsearch/examples/kubernetes-kind/README.md b/elasticsearch/examples/kubernetes-kind/README.md index 82a38d598..429193d83 100644 --- a/elasticsearch/examples/kubernetes-kind/README.md +++ b/elasticsearch/examples/kubernetes-kind/README.md @@ -1,6 +1,6 @@ # KIND -This example deploy a 3 nodes Elasticsearch 6.8.12-SNAPSHOT cluster on [Kind][] +This example deploy a 3 nodes Elasticsearch 6.8.12 cluster on [Kind][] using [custom values][]. Note that this configuration should be used for test only and isn't recommended diff --git a/elasticsearch/examples/microk8s/README.md b/elasticsearch/examples/microk8s/README.md index e54e80c82..5df76fb4c 100644 --- a/elasticsearch/examples/microk8s/README.md +++ b/elasticsearch/examples/microk8s/README.md @@ -1,6 +1,6 @@ # MicroK8S -This example deploy a 3 nodes Elasticsearch 6.8.12-SNAPSHOT cluster on [MicroK8S][] +This example deploy a 3 nodes Elasticsearch 6.8.12 cluster on [MicroK8S][] using [custom values][]. Note that this configuration should be used for test only and isn't recommended diff --git a/elasticsearch/examples/minikube/README.md b/elasticsearch/examples/minikube/README.md index b0dbc6f55..13aa9d513 100644 --- a/elasticsearch/examples/minikube/README.md +++ b/elasticsearch/examples/minikube/README.md @@ -1,6 +1,6 @@ # Minikube -This example deploy a 3 nodes Elasticsearch 6.8.12-SNAPSHOT cluster on [Minikube][] +This example deploy a 3 nodes Elasticsearch 6.8.12 cluster on [Minikube][] using [custom values][]. If helm or kubectl timeouts occur, you may consider creating a minikube VM with diff --git a/elasticsearch/examples/multi/README.md b/elasticsearch/examples/multi/README.md index 356d9e25b..c605abff4 100644 --- a/elasticsearch/examples/multi/README.md +++ b/elasticsearch/examples/multi/README.md @@ -1,6 +1,6 @@ # Multi -This example deploy an Elasticsearch 6.8.12-SNAPSHOT cluster composed of 2 different Helm +This example deploy an Elasticsearch 6.8.12 cluster composed of 2 different Helm releases: - `helm-es-multi-master` for the 3 master nodes using [master values][] diff --git a/elasticsearch/examples/openshift/README.md b/elasticsearch/examples/openshift/README.md index a32d7f0c7..0472afac0 100644 --- a/elasticsearch/examples/openshift/README.md +++ b/elasticsearch/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy a 3 nodes Elasticsearch 6.8.12-SNAPSHOT cluster on [OpenShift][] +This example deploy a 3 nodes Elasticsearch 6.8.12 cluster on [OpenShift][] using [custom values][]. ## Usage diff --git a/elasticsearch/examples/oss/README.md b/elasticsearch/examples/oss/README.md index 445a88145..07764113e 100644 --- a/elasticsearch/examples/oss/README.md +++ b/elasticsearch/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy a 3 nodes Elasticsearch 6.8.12-SNAPSHOT cluster using +This example deploy a 3 nodes Elasticsearch 6.8.12 cluster using [Elasticsearch OSS][] version. ## Usage diff --git a/elasticsearch/examples/security/README.md b/elasticsearch/examples/security/README.md index 98feac1b1..dee60618d 100644 --- a/elasticsearch/examples/security/README.md +++ b/elasticsearch/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy a 3 nodes Elasticsearch 6.8.12-SNAPSHOT with authentication and +This example deploy a 3 nodes Elasticsearch 6.8.12 with authentication and autogenerated certificates for TLS (see [values][]). Note that this configuration should be used for test only. For a production diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 9a2430110..5dae982a5 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -51,7 +51,7 @@ secretMounts: [] # defaultMode: 0755 image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "6.8.12-SNAPSHOT" +imageTag: "6.8.12" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index c485dbbfc..79e874cc4 100755 --- a/filebeat/Chart.yaml +++ b/filebeat/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: filebeat -version: 6.8.12-SNAPSHOT -appVersion: 6.8.12-SNAPSHOT +version: 6.8.12 +appVersion: 6.8.12 sources: - https://github.com/elastic/beats icon: https://helm.elastic.co/icons/beats.png diff --git a/filebeat/README.md b/filebeat/README.md index 06bf4648f..4a477f65e 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -8,9 +8,6 @@ The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features (see [supported configurations][] for more details). -**Warning**: This branch is used for development, please use [6.8.11][] release -for released version. - @@ -18,8 +15,6 @@ for released version. - [Requirements](#requirements) - [Installing](#installing) - - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 6.8 branch and 6.8.12-SNAPSHOT versions](#install-development-version-using-68-branch-and-6812-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -45,25 +40,15 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.12-SNAPSHOT versions. +This chart is tested with the latest 6.8.12 version. -### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name filebeat --version 6.8.11 elastic/filebeat` - - with [Helm 3 (beta)][]: `helm install filebeat --version 6.8.11 elastic/filebeat` - -### Install development version using 6.8 branch and 6.8.12-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: - - with Helm 2: `helm install --name filebeat ./helm-charts/filebeat` - - with [Helm 3 (beta)][]: `helm install filebeat ./helm-charts/filebeat` - + - with Helm 2: `helm install --name filebeat --version 6.8.12 elastic/filebeat` + - with [Helm 3 (beta)][]: `helm install filebeat --version 6.8.12 elastic/filebeat` ## Upgrading @@ -110,7 +95,7 @@ as a reference. They are also used in the automated testing of this chart. | `hostPathRoot` | Fully-qualified [hostPath][] that will be used to persist Filebeat registry data | `/var/lib` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The Filebeat Docker image tag | `6.8.12-SNAPSHOT` | +| `imageTag` | The Filebeat Docker image tag | `6.8.12` | | `image` | The Filebeat Docker image | `docker.elastic.co/beats/filebeat` | | `labels` | Configurable [labels][] applied to all Filebeat pods | `{}` | | `livenessProbe` | Parameters to pass to liveness [probe][] checks for values such as timeouts and thresholds | see [values.yaml][] | @@ -190,7 +175,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[6.8.11]: https://github.com/elastic/helm-charts/blob/6.8.11/filebeat/README.md +[6.8.12]: https://github.com/elastic/helm-charts/blob/6.8.12/filebeat/README.md [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md diff --git a/filebeat/examples/default/README.md b/filebeat/examples/default/README.md index 419c86e39..10676bb88 100644 --- a/filebeat/examples/default/README.md +++ b/filebeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 6.8.12-SNAPSHOT using [default values][]. +This example deploy Filebeat 6.8.12 using [default values][]. ## Usage diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index 435a3db9f..45f884119 100644 --- a/filebeat/examples/oss/README.md +++ b/filebeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Filebeat 6.8.12-SNAPSHOT using [Filebeat OSS][] version. +This example deploy Filebeat 6.8.12 using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index 75682861c..61b80a1cf 100644 --- a/filebeat/examples/security/README.md +++ b/filebeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Filebeat 6.8.12-SNAPSHOT using authentication and TLS to connect to +This example deploy Filebeat 6.8.12 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/filebeat/values.yaml b/filebeat/values.yaml index bd8804a94..ad05f5280 100755 --- a/filebeat/values.yaml +++ b/filebeat/values.yaml @@ -48,7 +48,7 @@ envFrom: [] hostPathRoot: /var/lib hostNetworking: false image: "docker.elastic.co/beats/filebeat" -imageTag: "6.8.12-SNAPSHOT" +imageTag: "6.8.12" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/bumper.py b/helpers/bumper.py index ee26e0f47..2ac7010a3 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -19,7 +19,7 @@ os.chdir(os.path.join(os.path.dirname(__file__), "..")) versions = { - 6: os.environ.get("BUMPER_VERSION_6", "6.8.11"), + 6: os.environ.get("BUMPER_VERSION_6", "6.8.12"), } chart_version = versions[6] diff --git a/helpers/examples.mk b/helpers/examples.mk index 81de3ac59..56ec248eb 100644 --- a/helpers/examples.mk +++ b/helpers/examples.mk @@ -1,7 +1,7 @@ GOSS_VERSION := v0.3.6 GOSS_FILE ?= goss.yaml GOSS_SELECTOR ?= release=$(RELEASE) -STACK_VERSION := 6.8.12-SNAPSHOT +STACK_VERSION := 6.8.12 .PHONY: help help: ## Display this help diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index b6f408689..f03f10721 100755 --- a/kibana/Chart.yaml +++ b/kibana/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: kibana -version: 6.8.12-SNAPSHOT -appVersion: 6.8.12-SNAPSHOT +version: 6.8.12 +appVersion: 6.8.12 sources: - https://github.com/elastic/kibana icon: https://helm.elastic.co/icons/kibana.png diff --git a/kibana/README.md b/kibana/README.md index d4b91aba0..0917158b9 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -8,8 +8,6 @@ The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features (see [supported configurations][] for more details). -**Warning**: This branch is used for development, please use [6.8.11][] release -for released version. @@ -18,8 +16,6 @@ for released version. - [Requirements](#requirements) - [Installing](#installing) - - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 6.8 branch and 6.8.12-SNAPSHOT versions](#install-development-version-using-68-branch-and-6812-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -46,24 +42,15 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.12-SNAPSHOT versions. +This chart is tested with the latest 6.8.12 version. -### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name kibana --version 6.8.11 elastic/kibana` - - with [Helm 3 (beta)][]: `helm install kibana --version 6.8.11 elastic/kibana` - -### Install development version using 6.8 branch and 6.8.12-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: - - with Helm 2: `helm install --name kibana ./helm-charts/kibana` - - with [Helm 3 (beta)][]: `helm install kibana ./helm-charts/kibana` + - with Helm 2: `helm install --name kibana --version 6.8.12 elastic/kibana` + - with [Helm 3 (beta)][]: `helm install kibana --version 6.8.12 elastic/kibana` ## Upgrading @@ -96,7 +83,7 @@ as a reference. They are also used in the automated testing of this chart. | `httpPort` | The http port that Kubernetes will use for the healthchecks and the service | `5601` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][]value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The Kibana Docker image tag | `6.8.12-SNAPSHOT` | +| `imageTag` | The Kibana Docker image tag | `6.8.12` | | `image` | The Kibana Docker image | `docker.elastic.co/kibana/kibana` | | `ingress` | Configurable [ingress][] to expose the Kibana service. | see [values.yaml][] | | `kibanaConfig` | Allows you to add any config files in `/usr/share/kibana/config/` such as `kibana.yml` See [values.yaml][] for an example of the formatting | `{}` | @@ -208,7 +195,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[6.8.11]: https://github.com/elastic/helm-charts/blob/6.8.11/kibana/README.md +[6.8.12]: https://github.com/elastic/helm-charts/blob/6.8.12/kibana/README.md [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md diff --git a/kibana/examples/default/README.md b/kibana/examples/default/README.md index f0e369c7b..cd12fb729 100644 --- a/kibana/examples/default/README.md +++ b/kibana/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Kibana 6.8.12-SNAPSHOT using [default values][]. +This example deploy Kibana 6.8.12 using [default values][]. ## Usage diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index afd328301..564070759 100644 --- a/kibana/examples/openshift/README.md +++ b/kibana/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy Kibana 6.8.12-SNAPSHOT on [OpenShift][] using [custom values][]. +This example deploy Kibana 6.8.12 on [OpenShift][] using [custom values][]. ## Usage diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md index f5f188ca3..ed85aaa66 100644 --- a/kibana/examples/oss/README.md +++ b/kibana/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Kibana 6.8.12-SNAPSHOT using [Kibana OSS][] version. +This example deploy Kibana 6.8.12 using [Kibana OSS][] version. ## Usage diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md index 1902eeb95..91bceca12 100644 --- a/kibana/examples/security/README.md +++ b/kibana/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Kibana 6.8.12-SNAPSHOT using authentication and TLS to connect to +This example deploy Kibana 6.8.12 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/kibana/values.yaml b/kibana/values.yaml index 7b577a4a7..c811255ca 100755 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -29,7 +29,7 @@ secretMounts: [] # subPath: kibana.keystore # optional image: "docker.elastic.co/kibana/kibana" -imageTag: "6.8.12-SNAPSHOT" +imageTag: "6.8.12" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index fc0a0aec2..7892dd47f 100755 --- a/logstash/Chart.yaml +++ b/logstash/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: logstash -version: 6.8.12-SNAPSHOT -appVersion: 6.8.12-SNAPSHOT +version: 6.8.12 +appVersion: 6.8.12 sources: - https://github.com/elastic/logstash icon: https://helm.elastic.co/icons/logstash.png diff --git a/logstash/README.md b/logstash/README.md index b6c3d0625..432f420b1 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -8,8 +8,6 @@ The design and code is less mature than official GA features and is being provided as-is with no warranties. Alpha features are not subject to the support SLA of official GA features (see [supported configurations][] for more details). -**Warning**: This branch is used for development, please use [6.8.11][] release -for released version. @@ -18,8 +16,6 @@ for released version. - [Requirements](#requirements) - [Installing](#installing) - - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 6.8 branch and 6.8.12-SNAPSHOT versions](#install-development-version-using-68-branch-and-6812-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -43,24 +39,15 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.12-SNAPSHOT versions. +This chart is tested with the latest 6.8.12 version. -### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name logstash --version 6.8.11 elastic/logstash` - - with [Helm 3 (beta)][]: `helm install logstash --version 6.8.11 elastic/logstash` - -### Install development version using 6.8 branch and 6.8.12-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: - - with Helm 2: `helm install --name logstash ./helm-charts/logstash` - - with [Helm 3 (beta)][]: `helm install logstash ./helm-charts/logstash` + - with Helm 2: `helm install --name logstash --version 6.8.12 elastic/logstash` + - with [Helm 3 (beta)][]: `helm install logstash --version 6.8.12 elastic/logstash` ## Upgrading @@ -114,7 +101,7 @@ using `http.host: 127.0.0.1`, default probes should be disabled or overrided | `httpPort` | The http port that Kubernetes will use for the healthchecks and the service | `9600` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The Logstash Docker image tag | `6.8.12-SNAPSHOT` | +| `imageTag` | The Logstash Docker image tag | `6.8.12` | | `image` | The Logstash Docker image | `docker.elastic.co/logstash/logstash` | | `labels` | Configurable [labels][] applied to all Logstash pods | `{}` | | `lifecycle` | Allows you to add lifecycle configuration. See [values.yaml][] for an example of the formatting | `{}` | @@ -188,7 +175,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[6.8.11]: https://github.com/elastic/helm-charts/blob/6.8.11/logstash/README.md +[6.8.12]: https://github.com/elastic/helm-charts/blob/6.8.12/logstash/README.md [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md diff --git a/logstash/examples/default/README.md b/logstash/examples/default/README.md index c9e72ec7e..91f62f561 100644 --- a/logstash/examples/default/README.md +++ b/logstash/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Logstash 6.8.12-SNAPSHOT using [default values][]. +This example deploy Logstash 6.8.12 using [default values][]. ## Usage diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md index 89eb23ae9..7f5f5746b 100644 --- a/logstash/examples/elasticsearch/README.md +++ b/logstash/examples/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -This example deploy Logstash 6.8.12-SNAPSHOT which connects to Elasticsearch (see +This example deploy Logstash 6.8.12 which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/oss/README.md b/logstash/examples/oss/README.md index 6aaac1d5b..ad75cb15e 100644 --- a/logstash/examples/oss/README.md +++ b/logstash/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Logstash 6.8.12-SNAPSHOT using [Logstash OSS][] version. +This example deploy Logstash 6.8.12 using [Logstash OSS][] version. ## Usage diff --git a/logstash/values.yaml b/logstash/values.yaml index fb91b4744..d3558c63c 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -60,7 +60,7 @@ secrets: [] secretMounts: [] image: "docker.elastic.co/logstash/logstash" -imageTag: "6.8.12-SNAPSHOT" +imageTag: "6.8.12" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index c0f21d277..afc0295cc 100755 --- a/metricbeat/Chart.yaml +++ b/metricbeat/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: metricbeat -version: 6.8.12-SNAPSHOT -appVersion: 6.8.12-SNAPSHOT +version: 6.8.12 +appVersion: 6.8.12 sources: - https://github.com/elastic/beats icon: https://helm.elastic.co/icons/beats.png diff --git a/metricbeat/README.md b/metricbeat/README.md index 20060db3e..8601f5b34 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -8,9 +8,6 @@ The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features (see [supported configurations][] for more details). -**Warning**: This branch is used for development, please use [6.8.11][] release -for released version. - @@ -18,8 +15,6 @@ for released version. - [Requirements](#requirements) - [Installing](#installing) - - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 6.8 branch and 6.8.12-SNAPSHOT versions](#install-development-version-using-68-branch-and-6812-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -45,24 +40,15 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.12-SNAPSHOT versions. +This chart is tested with the latest 6.8.12 version. -### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name apm-server --version 6.8.11 elastic/apm-server` - - with [Helm 3 (beta)][]: `helm install apm-server --version 6.8.11 elastic/apm-server` - -### Install development version using 6.8 branch and 6.8.12-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: - - with Helm 2: `helm install --name apm-server ./helm-charts/apm-server` - - with [Helm 3 (beta)][]: `helm install apm-server ./helm-charts/apm-server` + - with Helm 2: `helm install --name apm-server --version 6.8.12 elastic/apm-server` + - with [Helm 3 (beta)][]: `helm install apm-server --version 6.8.12 elastic/apm-server` ## Upgrading @@ -128,7 +114,7 @@ as a reference. They are also used in the automated testing of this chart. | `hostPathRoot` | Fully-qualified [hostPath][] that will be used to persist Metricbeat registry data | `/var/lib` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The Metricbeat Docker image tag | `6.8.12-SNAPSHOT` | +| `imageTag` | The Metricbeat Docker image tag | `6.8.12` | | `image` | The Metricbeat Docker image | `docker.elastic.co/beats/metricbeat` | | `kube_state_metrics.enabled` | Install [kube-state-metrics](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) as a dependency | `true` | | `kube_state_metrics.host` | Define kube-state-metrics endpoint for an existing deployment. Works only if `kube_state_metrics.enabled: false` | `""` | @@ -213,7 +199,7 @@ about our development and testing process. [#471]: https://github.com/elastic/helm-charts/pull/471 -[6.8.11]: https://github.com/elastic/helm-charts/blob/6.8.11/metricbeat/README.md +[6.8.12]: https://github.com/elastic/helm-charts/blob/6.8.12/metricbeat/README.md [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md diff --git a/metricbeat/examples/default/README.md b/metricbeat/examples/default/README.md index 7bf535e39..893a04b97 100644 --- a/metricbeat/examples/default/README.md +++ b/metricbeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Metricbeat 6.8.12-SNAPSHOT using [default values][]. +This example deploy Metricbeat 6.8.12 using [default values][]. ## Usage diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index 87a7bcc72..c4c1853e6 100644 --- a/metricbeat/examples/oss/README.md +++ b/metricbeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Metricbeat 6.8.12-SNAPSHOT using [Metricbeat OSS][] version. +This example deploy Metricbeat 6.8.12 using [Metricbeat OSS][] version. ## Usage diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index 4fdf770ea..ff7ff5cdc 100644 --- a/metricbeat/examples/security/README.md +++ b/metricbeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Metricbeat 6.8.12-SNAPSHOT using authentication and TLS to connect to +This example deploy Metricbeat 6.8.12 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index abe87a80f..4704d33c4 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -167,7 +167,7 @@ extraInitContainers: "" hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "6.8.12-SNAPSHOT" +imageTag: "6.8.12" imagePullPolicy: "IfNotPresent" imagePullSecrets: []