diff --git a/README.md b/README.md index 6b898975c..57384db9c 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/7.9/running-on-docker.html | [`7.9.1`][apm-7] | [`6.8.12`][apm-6] | -| [Elasticsearch](./elasticsearch/README.md) | https://www.elastic.co/guide/en/elasticsearch/reference/7.9/docker.html | [`7.9.1`][elasticsearch-7] | [`6.8.12`][elasticsearch-6] | -| [Filebeat](./filebeat/README.md) | https://www.elastic.co/guide/en/beats/filebeat/7.9/running-on-docker.html | [`7.9.1`][filebeat-7] | [`6.8.12`][filebeat-6] | -| [Kibana](./kibana/README.md) | https://www.elastic.co/guide/en/kibana/7.9/docker.html | [`7.9.1`][kibana-7] | [`6.8.12`][kibana-6] | -| [Logstash](./logstash/README.md) | https://www.elastic.co/guide/en/logstash/7.9/docker.html | [`7.9.1`][logstash-7] | [`6.8.12`][logstash-6] | -| [Metricbeat](./metricbeat/README.md) | https://www.elastic.co/guide/en/beats/metricbeat/7.9/running-on-docker.html | [`7.9.1`][metricbeat-7] | [`6.8.12`][metricbeat-6] | +| [APM-Server](./apm-server/README.md) | https://www.elastic.co/guide/en/apm/server/7.9/running-on-docker.html | [`7.9.2`][apm-7] | [`6.8.12`][apm-6] | +| [Elasticsearch](./elasticsearch/README.md) | https://www.elastic.co/guide/en/elasticsearch/reference/7.9/docker.html | [`7.9.2`][elasticsearch-7] | [`6.8.12`][elasticsearch-6] | +| [Filebeat](./filebeat/README.md) | https://www.elastic.co/guide/en/beats/filebeat/7.9/running-on-docker.html | [`7.9.2`][filebeat-7] | [`6.8.12`][filebeat-6] | +| [Kibana](./kibana/README.md) | https://www.elastic.co/guide/en/kibana/7.9/docker.html | [`7.9.2`][kibana-7] | [`6.8.12`][kibana-6] | +| [Logstash](./logstash/README.md) | https://www.elastic.co/guide/en/logstash/7.9/docker.html | [`7.9.2`][logstash-7] | [`6.8.12`][logstash-6] | +| [Metricbeat](./metricbeat/README.md) | https://www.elastic.co/guide/en/beats/metricbeat/7.9/running-on-docker.html | [`7.9.2`][metricbeat-7] | [`6.8.12`][metricbeat-6] | ## Supported Configurations diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index 8a0e5dae7..0fb71dc46 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: 7.9.2-SNAPSHOT -appVersion: 7.9.2-SNAPSHOT +version: 7.9.2 +appVersion: 7.9.2 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 2c8e14b94..e371df224 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -8,7 +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 [7.9.1][] release for released version. @@ -18,7 +17,6 @@ SLA of official GA features (see [supported configurations][] for more details). - [Requirements](#requirements) - [Installing](#installing) - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 7.9 branch and 7.9.2-SNAPSHOT versions](#install-development-version-using-79-branch-and-792-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -42,7 +40,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.9.2-SNAPSHOT version. +This chart is tested with the latest 7.9.2 version. ### Install released version using Helm repository @@ -51,16 +49,7 @@ This chart is tested with the latest 7.9.2-SNAPSHOT version. * Install it: - with Helm 2: `helm install --name apm-server elastic/apm-server` - - with [Helm 3 (beta)][]: `helm install apm-server elastic/apm-server` - - -### Install development version using 7.9 branch and 7.9.2-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 --set imageTag=7.9.2-SNAPSHOT` - - with [Helm 3 (beta)][]: `helm install apm-server ./helm-charts/apm-server --set imageTag=7.9.2-SNAPSHOT` + - with [Helm 3 (beta)][]: `helm install apm-server --version 7.9.2 elastic/apm-server` ## Upgrading @@ -98,7 +87,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 | `7.9.2-SNAPSHOT` | +| `imageTag` | The APM Server Docker image tag | `7.9.2` | | `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 | `{}` | diff --git a/apm-server/examples/default/README.md b/apm-server/examples/default/README.md index ce757cb1e..380b0656c 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 7.9.2-SNAPSHOT using [default values][]. +This example deploy APM Server 7.9.2 using [default values][]. ## Usage diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index 40c701bf3..579fac20a 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 7.9.2-SNAPSHOT using [APM Server OSS][] version. +This example deploy APM Server 7.9.2 using [APM Server OSS][] version. ## Usage diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md index ce8e5f710..d0c3a9b10 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 7.9.2-SNAPSHOT using authentication and TLS to connect to +This example deploy APM Server 7.9.2 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/apm-server/values.yaml b/apm-server/values.yaml index d7b65f3a7..54c1c11c1 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: "7.9.2-SNAPSHOT" +imageTag: "7.9.2" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 6026f5c5c..c7ff7b56b 100755 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: elasticsearch -version: 7.9.2-SNAPSHOT -appVersion: 7.9.2-SNAPSHOT +version: 7.9.2 +appVersion: 7.9.2 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 b7e6f05ae..569718a74 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -3,7 +3,6 @@ This Helm chart is a lightweight way to configure and run our official [Elasticsearch Docker image][]. -**Warning**: This branch is used for development, please use [7.9.1][] release for released version. @@ -13,7 +12,6 @@ This Helm chart is a lightweight way to configure and run our official - [Requirements](#requirements) - [Installing](#installing) - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 7.9 branch and 7.9.2-SNAPSHOT versions](#install-development-version-using-79-branch-and-792-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -52,7 +50,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.9.2-SNAPSHOT version. +This chart is tested with the latest 7.9.2 version. ### Install released version using Helm repository @@ -64,15 +62,6 @@ This chart is tested with the latest 7.9.2-SNAPSHOT version. - with [Helm 3 (beta)][]: `helm install elasticsearch elastic/elasticsearch` -### Install development version using 7.9 branch and 7.9.2-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 --set imageTag=7.9.2-SNAPSHOT` - - with [Helm 3 (beta)][]: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=7.9.2-SNAPSHOT` - - ## Upgrading Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before @@ -126,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 | `7.9.2-SNAPSHOT` | +| `imageTag` | The Elasticsearch Docker image tag | `7.9.2` | | `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 | `{}` | diff --git a/elasticsearch/examples/config/README.md b/elasticsearch/examples/config/README.md index 980b3ce23..dbd0c0f28 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 7.9.2-SNAPSHOT with authentication and +This example deploy a single node Elasticsearch 7.9.2 with authentication and custom [values][]. diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md index c370fac2e..16f9c113a 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 7.9.2-SNAPSHOT cluster using +This example deploy a 3 nodes Elasticsearch 7.9.2 cluster using [default values][]. diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml index af4f6c296..664b74156 100644 --- a/elasticsearch/examples/default/test/goss.yaml +++ b/elasticsearch/examples/default/test/goss.yaml @@ -15,7 +15,7 @@ http: status: 200 timeout: 2000 body: - - '"number" : "7.9.2-SNAPSHOT"' + - '"number" : "7.9.2"' - '"cluster_name" : "elasticsearch"' - '"name" : "elasticsearch-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/docker-for-mac/README.md b/elasticsearch/examples/docker-for-mac/README.md index 78320aee7..90f3977a0 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 7.9.2-SNAPSHOT cluster on [Docker for Mac][] +This example deploy a 3 nodes Elasticsearch 7.9.2 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 dbb457b3e..56cfab0f2 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 7.9.2-SNAPSHOT cluster on [Kind][] +This example deploy a 3 nodes Elasticsearch 7.9.2 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 79ea0ed09..42e6995c6 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 7.9.2-SNAPSHOT cluster on [MicroK8S][] +This example deploy a 3 nodes Elasticsearch 7.9.2 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 29fed1ee2..d879208fd 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 7.9.2-SNAPSHOT cluster on [Minikube][] +This example deploy a 3 nodes Elasticsearch 7.9.2 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 db1b90de9..c0735c290 100644 --- a/elasticsearch/examples/multi/README.md +++ b/elasticsearch/examples/multi/README.md @@ -1,6 +1,6 @@ # Multi -This example deploy an Elasticsearch 7.9.2-SNAPSHOT cluster composed of 2 different Helm +This example deploy an Elasticsearch 7.9.2 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 91a46270a..61f666a69 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 7.9.2-SNAPSHOT cluster on [OpenShift][] +This example deploy a 3 nodes Elasticsearch 7.9.2 cluster on [OpenShift][] using [custom values][]. ## Usage diff --git a/elasticsearch/examples/oss/README.md b/elasticsearch/examples/oss/README.md index 32043185f..a6303ff8d 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 7.9.2-SNAPSHOT cluster using +This example deploy a 3 nodes Elasticsearch 7.9.2 cluster using [Elasticsearch OSS][] version. ## Usage diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml index db7605a2c..53f9272d3 100644 --- a/elasticsearch/examples/oss/test/goss.yaml +++ b/elasticsearch/examples/oss/test/goss.yaml @@ -11,7 +11,7 @@ http: status: 200 timeout: 2000 body: - - '"number" : "7.9.2-SNAPSHOT"' + - '"number" : "7.9.2"' - '"cluster_name" : "oss"' - '"name" : "oss-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/security/README.md b/elasticsearch/examples/security/README.md index 2f245036e..ecb59a1ae 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 7.9.2-SNAPSHOT with authentication and +This example deploy a 3 nodes Elasticsearch 7.9.2 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/examples/upgrade/README.md b/elasticsearch/examples/upgrade/README.md index 42eb55e88..492d4c051 100644 --- a/elasticsearch/examples/upgrade/README.md +++ b/elasticsearch/examples/upgrade/README.md @@ -1,7 +1,7 @@ # Upgrade This example will deploy a 3 node Elasticsearch cluster using an old chart version, -then upgrade it to version 7.9.2-SNAPSHOT. +then upgrade it to version 7.9.2. The following upgrades are tested: - Upgrade from [7.0.0-alpha1][] version on K8S <1.16 @@ -11,7 +11,7 @@ not compatible with K8S >= 1.16) ## Usage -Running `make install` command will do first install and 7.9.2-SNAPSHOT upgrade. +Running `make install` command will do first install and 7.9.2 upgrade. Note: [jq][] is a requirement for this make target. diff --git a/elasticsearch/examples/upgrade/test/goss.yaml b/elasticsearch/examples/upgrade/test/goss.yaml index 30de171d8..f6406f690 100644 --- a/elasticsearch/examples/upgrade/test/goss.yaml +++ b/elasticsearch/examples/upgrade/test/goss.yaml @@ -11,7 +11,7 @@ http: status: 200 timeout: 2000 body: - - '"number" : "7.9.2-SNAPSHOT"' + - '"number" : "7.9.2"' - '"cluster_name" : "upgrade"' - '"name" : "upgrade-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 21bb22658..fd21af68c 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -51,7 +51,7 @@ secretMounts: [] # defaultMode: 0755 image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "7.9.2-SNAPSHOT" +imageTag: "7.9.2" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index da7ed20c7..bad60dbbf 100755 --- a/filebeat/Chart.yaml +++ b/filebeat/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: filebeat -version: 7.9.2-SNAPSHOT -appVersion: 7.9.2-SNAPSHOT +version: 7.9.2 +appVersion: 7.9.2 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 2fdc4d86a..e53e0cc70 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -3,7 +3,6 @@ This Helm chart is a lightweight way to configure and run our official [Filebeat Docker image][]. -**Warning**: This branch is used for development, please use [7.9.1][] release for released version. @@ -13,7 +12,6 @@ This Helm chart is a lightweight way to configure and run our official - [Requirements](#requirements) - [Installing](#installing) - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 7.9 branch and 7.9.2-SNAPSHOT versions](#install-development-version-using-79-branch-and-792-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -39,7 +37,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.9.2-SNAPSHOT version. +This chart is tested with the latest 7.9.2 version. ### Install released version using Helm repository @@ -51,15 +49,6 @@ This chart is tested with the latest 7.9.2-SNAPSHOT version. - with [Helm 3 (beta)][]: `helm install filebeat elastic/filebeat` -### Install development version using 7.9 branch and 7.9.2-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 --set imageTag=7.9.2-SNAPSHOT` - - with [Helm 3 (beta)][]: `helm install filebeat ./helm-charts/filebeat --set imageTag=7.9.2-SNAPSHOT` - - ## Upgrading Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before @@ -105,7 +94,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 | `7.9.2-SNAPSHOT` | +| `imageTag` | The Filebeat Docker image tag | `7.9.2` | | `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][] | diff --git a/filebeat/examples/default/README.md b/filebeat/examples/default/README.md index 70f23edab..10c506995 100644 --- a/filebeat/examples/default/README.md +++ b/filebeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 7.9.2-SNAPSHOT using [default values][]. +This example deploy Filebeat 7.9.2 using [default values][]. ## Usage diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index 7a9d6b647..030faa89d 100644 --- a/filebeat/examples/oss/README.md +++ b/filebeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Filebeat 7.9.2-SNAPSHOT using [Filebeat OSS][] version. +This example deploy Filebeat 7.9.2 using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index f33edf51e..c1c7c356b 100644 --- a/filebeat/examples/security/README.md +++ b/filebeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Filebeat 7.9.2-SNAPSHOT using authentication and TLS to connect to +This example deploy Filebeat 7.9.2 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/filebeat/values.yaml b/filebeat/values.yaml index e0eeef326..267a4f9b4 100755 --- a/filebeat/values.yaml +++ b/filebeat/values.yaml @@ -52,7 +52,7 @@ envFrom: [] hostPathRoot: /var/lib hostNetworking: false image: "docker.elastic.co/beats/filebeat" -imageTag: "7.9.2-SNAPSHOT" +imageTag: "7.9.2" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/examples.mk b/helpers/examples.mk index 13fc425e9..8044386d6 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 := 7.9.2-SNAPSHOT +STACK_VERSION := 7.9.2 .PHONY: help help: ## Display this help diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index b8aced0e1..ae0a81ac8 100755 --- a/kibana/Chart.yaml +++ b/kibana/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: kibana -version: 7.9.2-SNAPSHOT -appVersion: 7.9.2-SNAPSHOT +version: 7.9.2 +appVersion: 7.9.2 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 4ea257e55..81c0e6125 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -3,7 +3,6 @@ This Helm chart is a lightweight way to configure and run our official [Kibana Docker image][]. -**Warning**: This branch is used for development, please use [7.9.1][] release for released version. @@ -13,7 +12,6 @@ This Helm chart is a lightweight way to configure and run our official - [Requirements](#requirements) - [Installing](#installing) - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 7.9 branch and 7.9.2-SNAPSHOT versions](#install-development-version-using-79-branch-and-792-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -40,7 +38,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.9.2-SNAPSHOT version. +This chart is tested with the latest 7.9.2 version. ### Install released version using Helm repository @@ -52,15 +50,6 @@ This chart is tested with the latest 7.9.2-SNAPSHOT version. - with [Helm 3 (beta)][]: `helm install kibana elastic/kibana` -### Install development version using 7.9 branch and 7.9.2-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 --set imageTag=7.9.2-SNAPSHOT` - - with [Helm 3 (beta)][]: `helm install kibana ./helm-charts/kibana --set imageTag=7.9.2-SNAPSHOT` - - ## Upgrading Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before @@ -91,7 +80,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 | `7.9.2-SNAPSHOT` | +| `imageTag` | The Kibana Docker image tag | `7.9.2` | | `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 | `{}` | diff --git a/kibana/examples/default/README.md b/kibana/examples/default/README.md index efb5622f2..251384e59 100644 --- a/kibana/examples/default/README.md +++ b/kibana/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Kibana 7.9.2-SNAPSHOT using [default values][]. +This example deploy Kibana 7.9.2 using [default values][]. ## Usage diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index 041153e02..2957e5aae 100644 --- a/kibana/examples/openshift/README.md +++ b/kibana/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy Kibana 7.9.2-SNAPSHOT on [OpenShift][] using [custom values][]. +This example deploy Kibana 7.9.2 on [OpenShift][] using [custom values][]. ## Usage diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md index cf7e1d53e..00c09d802 100644 --- a/kibana/examples/oss/README.md +++ b/kibana/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Kibana 7.9.2-SNAPSHOT using [Kibana OSS][] version. +This example deploy Kibana 7.9.2 using [Kibana OSS][] version. ## Usage diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md index d964de33e..dc37845c9 100644 --- a/kibana/examples/security/README.md +++ b/kibana/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Kibana 7.9.2-SNAPSHOT using authentication and TLS to connect to +This example deploy Kibana 7.9.2 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/kibana/values.yaml b/kibana/values.yaml index 69121a47a..e964e9faf 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: "7.9.2-SNAPSHOT" +imageTag: "7.9.2" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index 2cd543d21..c1497adf0 100755 --- a/logstash/Chart.yaml +++ b/logstash/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: logstash -version: 7.9.2-SNAPSHOT -appVersion: 7.9.2-SNAPSHOT +version: 7.9.2 +appVersion: 7.9.2 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 769b5be6f..ce4ec1c8e 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -8,7 +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 [7.9.1][] release for released version. @@ -18,7 +17,6 @@ SLA of official GA features (see [supported configurations][] for more details). - [Requirements](#requirements) - [Installing](#installing) - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 7.9 branch and 7.9.2-SNAPSHOT versions](#install-development-version-using-79-branch-and-792-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -42,7 +40,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.9.2-SNAPSHOT version. +This chart is tested with the latest 7.9.2 version. ### Install released version using Helm repository @@ -54,15 +52,6 @@ This chart is tested with the latest 7.9.2-SNAPSHOT version. - with [Helm 3 (beta)][]: `helm install logstash elastic/logstash` -### Install development version using 7.9 branch and 7.9.2-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 --set imageTag=7.9.2-SNAPSHOT` - - with [Helm 3 (beta)][]: `helm install logstash ./helm-charts/logstash --set imageTag=7.9.2-SNAPSHOT` - - ## Upgrading Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before @@ -114,7 +103,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 | `7.9.2-SNAPSHOT` | +| `imageTag` | The Logstash Docker image tag | `7.9.2` | | `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 | `{}` | diff --git a/logstash/examples/default/README.md b/logstash/examples/default/README.md index 100d39be7..a6da29950 100644 --- a/logstash/examples/default/README.md +++ b/logstash/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Logstash 7.9.2-SNAPSHOT using [default values][]. +This example deploy Logstash 7.9.2 using [default values][]. ## Usage diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md index d1d7b6377..fe1582d57 100644 --- a/logstash/examples/elasticsearch/README.md +++ b/logstash/examples/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -This example deploy Logstash 7.9.2-SNAPSHOT which connects to Elasticsearch (see +This example deploy Logstash 7.9.2 which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/oss/README.md b/logstash/examples/oss/README.md index 35b641abf..62d335a6c 100644 --- a/logstash/examples/oss/README.md +++ b/logstash/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Logstash 7.9.2-SNAPSHOT using [Logstash OSS][] version. +This example deploy Logstash 7.9.2 using [Logstash OSS][] version. ## Usage diff --git a/logstash/examples/security/README.md b/logstash/examples/security/README.md index 6abdfc9ac..ef2365029 100644 --- a/logstash/examples/security/README.md +++ b/logstash/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Logstash 7.9.2-SNAPSHOT which connects to Elasticsearch using TLS +This example deploy Logstash 7.9.2 which connects to Elasticsearch using TLS (see [values][]). diff --git a/logstash/values.yaml b/logstash/values.yaml index 1f7c43abb..a29187d4d 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -60,7 +60,7 @@ secrets: [] secretMounts: [] image: "docker.elastic.co/logstash/logstash" -imageTag: "7.9.2-SNAPSHOT" +imageTag: "7.9.2" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index 72bab1916..e4fe4361b 100755 --- a/metricbeat/Chart.yaml +++ b/metricbeat/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: metricbeat -version: 7.9.2-SNAPSHOT -appVersion: 7.9.2-SNAPSHOT +version: 7.9.2 +appVersion: 7.9.2 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 dceec703d..8014f5d57 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -3,7 +3,6 @@ This Helm chart is a lightweight way to configure and run our official [Metricbeat Docker image][]. -**Warning**: This branch is used for development, please use [7.9.1][] release for released version. @@ -13,7 +12,6 @@ This Helm chart is a lightweight way to configure and run our official - [Requirements](#requirements) - [Installing](#installing) - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 7.9 branch and 7.9.2-SNAPSHOT versions](#install-development-version-using-79-branch-and-792-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -39,7 +37,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.9.2-SNAPSHOT version. +This chart is tested with the latest 7.9.2 version. ### Install released version using Helm repository @@ -51,15 +49,6 @@ This chart is tested with the latest 7.9.2-SNAPSHOT version. - with [Helm 3 (beta)][]: `helm install metricbeat elastic/metricbeat` -### Install development version using 7.9 branch and 7.9.2-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: - - with Helm 2: `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=7.9.2-SNAPSHOT` - - with [Helm 3 (beta)][]: `helm install metricbeat ./helm-charts/metricbeat --set imageTag=7.9.2-SNAPSHOT` - - ## Upgrading Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before @@ -123,7 +112,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 | `7.9.2-SNAPSHOT` | +| `imageTag` | The Metricbeat Docker image tag | `7.9.2` | | `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` | `""` | diff --git a/metricbeat/examples/default/README.md b/metricbeat/examples/default/README.md index 3aad7ae32..362ab0948 100644 --- a/metricbeat/examples/default/README.md +++ b/metricbeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Metricbeat 7.9.2-SNAPSHOT using [default values][]. +This example deploy Metricbeat 7.9.2 using [default values][]. ## Usage diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index cc5fc2c8e..dbc45bfb6 100644 --- a/metricbeat/examples/oss/README.md +++ b/metricbeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Metricbeat 7.9.2-SNAPSHOT using [Metricbeat OSS][] version. +This example deploy Metricbeat 7.9.2 using [Metricbeat OSS][] version. ## Usage diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index e9e459d16..6ba88b90d 100644 --- a/metricbeat/examples/security/README.md +++ b/metricbeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Metricbeat 7.9.2-SNAPSHOT using authentication and TLS to connect to +This example deploy Metricbeat 7.9.2 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 02c759954..313acba5e 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -167,7 +167,7 @@ extraInitContainers: "" hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "7.9.2-SNAPSHOT" +imageTag: "7.9.2" imagePullPolicy: "IfNotPresent" imagePullSecrets: []