From 235786d7e3545bad4868cb5416e4eb676566633a Mon Sep 17 00:00:00 2001 From: Elastic Machine Date: Mon, 20 Dec 2021 13:51:54 -0800 Subject: [PATCH] Bump version to 6.8.22 (#1511) --- apm-server/Chart.yaml | 4 ++-- apm-server/README.md | 15 +++++++-------- apm-server/examples/default/README.md | 2 +- apm-server/examples/oss/README.md | 2 +- apm-server/examples/security/README.md | 2 +- apm-server/values.yaml | 2 +- elasticsearch/Chart.yaml | 4 ++-- elasticsearch/README.md | 15 +++++++-------- elasticsearch/examples/config/README.md | 2 +- elasticsearch/examples/default/README.md | 2 +- elasticsearch/examples/docker-for-mac/README.md | 2 +- elasticsearch/examples/kubernetes-kind/README.md | 2 +- elasticsearch/examples/microk8s/README.md | 2 +- elasticsearch/examples/minikube/README.md | 2 +- elasticsearch/examples/multi/README.md | 2 +- elasticsearch/examples/openshift/README.md | 2 +- elasticsearch/examples/oss/README.md | 2 +- elasticsearch/examples/security/README.md | 2 +- elasticsearch/values.yaml | 2 +- filebeat/Chart.yaml | 4 ++-- filebeat/README.md | 15 +++++++-------- filebeat/examples/default/README.md | 2 +- filebeat/examples/deployment/README.md | 2 +- filebeat/examples/oss/README.md | 2 +- filebeat/examples/security/README.md | 2 +- filebeat/values.yaml | 2 +- helpers/examples.mk | 2 +- kibana/Chart.yaml | 4 ++-- kibana/README.md | 15 +++++++-------- kibana/examples/default/README.md | 2 +- kibana/examples/openshift/README.md | 2 +- kibana/examples/oss/README.md | 2 +- kibana/examples/security/README.md | 2 +- kibana/values.yaml | 2 +- logstash/Chart.yaml | 4 ++-- logstash/README.md | 15 +++++++-------- logstash/examples/default/README.md | 2 +- logstash/examples/elasticsearch/README.md | 2 +- logstash/examples/oss/README.md | 2 +- logstash/values.yaml | 2 +- metricbeat/Chart.yaml | 4 ++-- metricbeat/README.md | 15 +++++++-------- metricbeat/examples/default/README.md | 2 +- metricbeat/examples/oss/README.md | 2 +- metricbeat/examples/security/README.md | 2 +- metricbeat/values.yaml | 2 +- 46 files changed, 88 insertions(+), 94 deletions(-) diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index f493c6113..8235819ce 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.22-SNAPSHOT -appVersion: 6.8.22-SNAPSHOT +version: 6.8.22 +appVersion: 6.8.22 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 073cf00a4..0b9e87139 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -11,7 +11,6 @@ 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 the latest [6.x][] release for released version. @@ -19,7 +18,7 @@ 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 6.8 branch and 6.8.22-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) + - [Install development version using 6.8 branch and 6.8.22 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -43,7 +42,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.22-SNAPSHOT version. +This chart is tested with the latest 6.8.22 version. ### Install released version using Helm repository @@ -54,15 +53,15 @@ This chart is tested with the latest 6.8.22-SNAPSHOT version. - with Helm 3: `helm install apm-server --version elastic/apm-server` - with Helm 2 (deprecated): `helm install --name apm-server --version elastic/apm-server` -### Install development version using 6.8 branch and 6.8.22-SNAPSHOT versions +### Install development version using 6.8 branch and 6.8.22 versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` * Checkout the branch : git checkout 6.8 * Install it: - - with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=6.8.22-SNAPSHOT` - - with Helm 2 (deprecated): `helm install --name apm-server ./helm-charts/apm-server --set imageTag=6.8.22-SNAPSHOT` + - with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=6.8.22` + - with Helm 2 (deprecated): `helm install --name apm-server ./helm-charts/apm-server --set imageTag=6.8.22` ## Upgrading @@ -101,7 +100,7 @@ as a reference. They are also used in the automated testing of this chart. | `hostAliases` | Configurable [hostAliases][] | `[]` | | `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.22-SNAPSHOT` | +| `imageTag` | The APM Server Docker image tag | `6.8.22` | | `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 | `{}` | @@ -150,7 +149,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. [6.x]: https://github.com/elastic/helm-charts/releases -[6.8.22-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.22-SNAPSHOT/apm-server/README.md +[6.8.22]: https://github.com/elastic/helm-charts/blob/6.8.22/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 a2271a521..741b80c91 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.22-SNAPSHOT using [default values][]. +This example deploy APM Server 6.8.22 using [default values][]. ## Usage diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index 6d2d52f93..e3235edb2 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.22-SNAPSHOT using [APM Server OSS][] version. +This example deploy APM Server 6.8.22 using [APM Server OSS][] version. ## Usage diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md index 5ef2e79bb..5d0aa4e02 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.22-SNAPSHOT using authentication and TLS to connect to +This example deploy APM Server 6.8.22 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/apm-server/values.yaml b/apm-server/values.yaml index 36933fda0..2534704ef 100755 --- a/apm-server/values.yaml +++ b/apm-server/values.yaml @@ -68,7 +68,7 @@ hostAliases: [] # - "bar.local" image: "docker.elastic.co/apm/apm-server" -imageTag: "6.8.22-SNAPSHOT" +imageTag: "6.8.22" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index e7e018ff9..869ee1d4e 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.22-SNAPSHOT -appVersion: 6.8.22-SNAPSHOT +version: 6.8.22 +appVersion: 6.8.22 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 9a0aa3e7e..f7df6f72b 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -6,7 +6,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 the latest [6.x][] release for released version. @@ -14,7 +13,7 @@ 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 6.8 branch and 6.8.22-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) + - [Install development version using 6.8 branch and 6.8.22 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -54,7 +53,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.22-SNAPSHOT version. +This chart is tested with the latest 6.8.22 version. ### Install released version using Helm repository @@ -66,15 +65,15 @@ This chart is tested with the latest 6.8.22-SNAPSHOT version. - with Helm 2 (deprecated): `helm install --name elasticsearch --version elastic/elasticsearch` -### Install development version using 6.8 branch and 6.8.22-SNAPSHOT versions +### Install development version using 6.8 branch and 6.8.22 versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` * Checkout the branch : git checkout 6.8 * Install it: - - with Helm 3: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=6.8.22-SNAPSHOT` - - with Helm 2 (deprecated): `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=6.8.22-SNAPSHOT` + - with Helm 3: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=6.8.22` + - with Helm 2 (deprecated): `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=6.8.22` ## Upgrading @@ -132,7 +131,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.22-SNAPSHOT` | +| `imageTag` | The Elasticsearch Docker image tag | `6.8.22` | | `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 | `{}` | @@ -398,7 +397,7 @@ about our development and testing process. [6.x]: https://github.com/elastic/helm-charts/releases [#63]: https://github.com/elastic/helm-charts/issues/63 -[6.8.22-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.22-SNAPSHOT/elasticsearch/README.md +[6.8.22]: https://github.com/elastic/helm-charts/blob/6.8.22/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 fc7c79b86..5994e26a8 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.22-SNAPSHOT with authentication and +This example deploy a single node Elasticsearch 6.8.22 with authentication and custom [values][]. diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md index 77c1c868b..5de84d8b5 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.22-SNAPSHOT cluster using +This example deploy a 3 nodes Elasticsearch 6.8.22 cluster using [default values][]. diff --git a/elasticsearch/examples/docker-for-mac/README.md b/elasticsearch/examples/docker-for-mac/README.md index f94f32b00..fa550bceb 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.22-SNAPSHOT cluster on [Docker for Mac][] +This example deploy a 3 nodes Elasticsearch 6.8.22 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 20cdd49af..c0a90f777 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.22-SNAPSHOT cluster on [Kind][] +This example deploy a 3 nodes Elasticsearch 6.8.22 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 40cbfb43a..470005487 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.22-SNAPSHOT cluster on [MicroK8S][] +This example deploy a 3 nodes Elasticsearch 6.8.22 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 c64f58525..48eb228e6 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.22-SNAPSHOT cluster on [Minikube][] +This example deploy a 3 nodes Elasticsearch 6.8.22 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 5c531dc45..43aa72ca1 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.22-SNAPSHOT cluster composed of 3 different Helm +This example deploy an Elasticsearch 6.8.22 cluster composed of 3 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 e87f4c619..d8ec3432c 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.22-SNAPSHOT cluster on [OpenShift][] +This example deploy a 3 nodes Elasticsearch 6.8.22 cluster on [OpenShift][] using [custom values][]. ## Usage diff --git a/elasticsearch/examples/oss/README.md b/elasticsearch/examples/oss/README.md index f3af4fe8a..1fd4222db 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.22-SNAPSHOT cluster using +This example deploy a 3 nodes Elasticsearch 6.8.22 cluster using [Elasticsearch OSS][] version. ## Usage diff --git a/elasticsearch/examples/security/README.md b/elasticsearch/examples/security/README.md index a1e4d9c27..d353f4139 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.22-SNAPSHOT with authentication and +This example deploy a 3 nodes Elasticsearch 6.8.22 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 d4fda9fd2..22cb1ed8f 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -57,7 +57,7 @@ hostAliases: [] # - "bar.local" image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "6.8.22-SNAPSHOT" +imageTag: "6.8.22" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index ea8e97c72..84e0301cf 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.22-SNAPSHOT -appVersion: 6.8.22-SNAPSHOT +version: 6.8.22 +appVersion: 6.8.22 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 dd51cd1ac..e1aae9873 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -6,7 +6,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 the latest [6.x][] release for released version. @@ -14,7 +13,7 @@ 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 6.8 branch and 6.8.22-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) + - [Install development version using 6.8 branch and 6.8.22 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -42,7 +41,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.22-SNAPSHOT version. +This chart is tested with the latest 6.8.22 version. ### Install released version using Helm repository @@ -54,15 +53,15 @@ This chart is tested with the latest 6.8.22-SNAPSHOT version. - with Helm 2 (deprecated): `helm install --name filebeat --version elastic/filebeat` -### Install development version using 6.8 branch and 6.8.22-SNAPSHOT versions +### Install development version using 6.8 branch and 6.8.22 versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` * Checkout the branch : git checkout 6.8 * Install it: - - with Helm 3: `helm install filebeat ./helm-charts/filebeat --set imageTag=6.8.22-SNAPSHOT` - - with Helm 2 (deprecated): `helm install --name filebeat ./helm-charts/filebeat --set imageTag=6.8.22-SNAPSHOT` + - with Helm 3: `helm install filebeat ./helm-charts/filebeat --set imageTag=6.8.22` + - with Helm 2 (deprecated): `helm install --name filebeat ./helm-charts/filebeat --set imageTag=6.8.22` ## Upgrading @@ -137,7 +136,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.22-SNAPSHOT-SNAPSHOT` | +| `imageTag` | The filebeat Docker image tag | `6.8.22-SNAPSHOT` | | `image` | The filebeat Docker image | `docker.elastic.co/beats/filebeat` | | `livenessProbe` | Parameters to pass to liveness [probe][] checks for values such as timeouts and thresholds | see [values.yaml][] | | `managedServiceAccount` | Whether the `serviceAccount` should be managed by this helm chart. Set this to `false` in order to manage your own service account and related roles | `true` | @@ -236,7 +235,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. [6.x]: https://github.com/elastic/helm-charts/releases -[6.8.22-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.22-SNAPSHOT/filebeat/README.md +[6.8.22]: https://github.com/elastic/helm-charts/blob/6.8.22/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 f16310b5c..a9aad70cd 100644 --- a/filebeat/examples/default/README.md +++ b/filebeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 6.8.22-SNAPSHOT using [default values][]. +This example deploy Filebeat 6.8.22 using [default values][]. ## Usage diff --git a/filebeat/examples/deployment/README.md b/filebeat/examples/deployment/README.md index 7fe878e69..2b40f177d 100644 --- a/filebeat/examples/deployment/README.md +++ b/filebeat/examples/deployment/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 6.8.22-SNAPSHOT-SNAPSHOT using [default values][] as a Kubernetes Deployment. +This example deploy Filebeat 6.8.22-SNAPSHOT using [default values][] as a Kubernetes Deployment. ## Usage diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index cb54f6c3b..ada22a768 100644 --- a/filebeat/examples/oss/README.md +++ b/filebeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Filebeat 6.8.22-SNAPSHOT using [Filebeat OSS][] version. +This example deploy Filebeat 6.8.22 using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index 4d5eb0948..da5c8df9c 100644 --- a/filebeat/examples/security/README.md +++ b/filebeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Filebeat 6.8.22-SNAPSHOT using authentication and TLS to connect to +This example deploy Filebeat 6.8.22 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/filebeat/values.yaml b/filebeat/values.yaml index 52d39a47a..d4ce190dd 100755 --- a/filebeat/values.yaml +++ b/filebeat/values.yaml @@ -157,7 +157,7 @@ hostAliases: [] # - "foo.local" # - "bar.local" image: "docker.elastic.co/beats/filebeat" -imageTag: "6.8.22-SNAPSHOT" +imageTag: "6.8.22" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/examples.mk b/helpers/examples.mk index b9455ceb4..90b40f76e 100644 --- a/helpers/examples.mk +++ b/helpers/examples.mk @@ -2,7 +2,7 @@ SHELL := /bin/bash GOSS_VERSION := v0.3.6 GOSS_FILE ?= goss.yaml GOSS_SELECTOR ?= release=$(RELEASE) -STACK_VERSION := 6.8.22-SNAPSHOT +STACK_VERSION := 6.8.22 TIMEOUT := 900s .PHONY: help diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index 5bed6c905..faf5deca2 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.22-SNAPSHOT -appVersion: 6.8.22-SNAPSHOT +version: 6.8.22 +appVersion: 6.8.22 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 71f25d9ed..78eb3b614 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -6,14 +6,13 @@ 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 the latest [6.x][] release 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.22-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) + - [Install development version using 6.8 branch and 6.8.22 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -40,7 +39,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.22-SNAPSHOT version. +This chart is tested with the latest 6.8.22 version. ### Install released version using Helm repository @@ -51,15 +50,15 @@ This chart is tested with the latest 6.8.22-SNAPSHOT version. - with Helm 3: `helm install kibana --version elastic/kibana` - with Helm 2 (deprecated): `helm install --name kibana --version elastic/kibana` -### Install development version using 6.8 branch and 6.8.22-SNAPSHOT versions +### Install development version using 6.8 branch and 6.8.22 versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` * Checkout the branch : git checkout 6.8 * Install it: - - with Helm 3: `helm install kibana ./helm-charts/kibana --set imageTag=6.8.22-SNAPSHOT` - - with Helm 2 (deprecated): `helm install --name kibana ./helm-charts/kibana --set imageTag=6.8.22-SNAPSHOT` + - with Helm 3: `helm install kibana ./helm-charts/kibana --set imageTag=6.8.22` + - with Helm 2 (deprecated): `helm install --name kibana ./helm-charts/kibana --set imageTag=6.8.22` ## Upgrading @@ -95,7 +94,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.22-SNAPSHOT` | +| `imageTag` | The Kibana Docker image tag | `6.8.22` | | `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 | `{}` | @@ -207,7 +206,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. [6.x]: https://github.com/elastic/helm-charts/releases -[6.8.22-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.22-SNAPSHOT/kibana/README.md +[6.8.22]: https://github.com/elastic/helm-charts/blob/6.8.22/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 55eb8c5c3..93661de9b 100644 --- a/kibana/examples/default/README.md +++ b/kibana/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Kibana 6.8.22-SNAPSHOT using [default values][]. +This example deploy Kibana 6.8.22 using [default values][]. ## Usage diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index 8aef78231..33f53e56b 100644 --- a/kibana/examples/openshift/README.md +++ b/kibana/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy Kibana 6.8.22-SNAPSHOT on [OpenShift][] using [custom values][]. +This example deploy Kibana 6.8.22 on [OpenShift][] using [custom values][]. ## Usage diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md index 877a759f4..5d18c8e7b 100644 --- a/kibana/examples/oss/README.md +++ b/kibana/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Kibana 6.8.22-SNAPSHOT using [Kibana OSS][] version. +This example deploy Kibana 6.8.22 using [Kibana OSS][] version. ## Usage diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md index 94465255f..bc71afc22 100644 --- a/kibana/examples/security/README.md +++ b/kibana/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Kibana 6.8.22-SNAPSHOT using authentication and TLS to connect to +This example deploy Kibana 6.8.22 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/kibana/values.yaml b/kibana/values.yaml index f879ee0d5..6452d469d 100755 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -35,7 +35,7 @@ hostAliases: [] # - "bar.local" image: "docker.elastic.co/kibana/kibana" -imageTag: "6.8.22-SNAPSHOT" +imageTag: "6.8.22" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index a7f851dcf..7513b506b 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.22-SNAPSHOT -appVersion: 6.8.22-SNAPSHOT +version: 6.8.22 +appVersion: 6.8.22 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 b9b5cf621..97cf1d6ff 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -11,7 +11,6 @@ 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 the latest [6.x][] release for released version. @@ -19,7 +18,7 @@ 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 6.8 branch and 6.8.22-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) + - [Install development version using 6.8 branch and 6.8.22 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -42,7 +41,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.22-SNAPSHOT version. +This chart is tested with the latest 6.8.22 version. ### Install released version using Helm repository @@ -54,15 +53,15 @@ This chart is tested with the latest 6.8.22-SNAPSHOT version. - with Helm 2 (deprecated): `helm install --name logstash --version elastic/logstash` -### Install development version using 6.8 branch and 6.8.22-SNAPSHOT versions +### Install development version using 6.8 branch and 6.8.22 versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` * Checkout the branch : git checkout 6.8 * Install it: - - with Helm 3: `helm install logstash ./helm-charts/logstash --set imageTag=6.8.22-SNAPSHOT` - - with Helm 2 (deprecated): `helm install --name logstash ./helm-charts/logstash --set imageTag=6.8.22-SNAPSHOT` + - with Helm 3: `helm install logstash ./helm-charts/logstash --set imageTag=6.8.22` + - with Helm 2 (deprecated): `helm install --name logstash ./helm-charts/logstash --set imageTag=6.8.22` ## Upgrading @@ -119,7 +118,7 @@ useful for the [http input plugin][], for instance. | `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.22-SNAPSHOT` | +| `imageTag` | The Logstash Docker image tag | `6.8.22` | | `image` | The Logstash Docker image | `docker.elastic.co/logstash/logstash` | | `labels` | Configurable [labels][] applied to all Logstash pods | `{}` | | `ingress` | Configurable [ingress][] for external access to Logstash HTTP port. | see [values.yaml][] | @@ -197,7 +196,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. [6.x]: https://github.com/elastic/helm-charts/releases -[6.8.22-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.22-SNAPSHOT/logstash/README.md +[6.8.22]: https://github.com/elastic/helm-charts/blob/6.8.22/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 411fdf0fc..20a266ebe 100644 --- a/logstash/examples/default/README.md +++ b/logstash/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Logstash 6.8.22-SNAPSHOT using [default values][]. +This example deploy Logstash 6.8.22 using [default values][]. ## Usage diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md index fbee2d2d0..bbbd1d663 100644 --- a/logstash/examples/elasticsearch/README.md +++ b/logstash/examples/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -This example deploy Logstash 6.8.22-SNAPSHOT which connects to Elasticsearch (see +This example deploy Logstash 6.8.22 which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/oss/README.md b/logstash/examples/oss/README.md index 35752a723..d455135ea 100644 --- a/logstash/examples/oss/README.md +++ b/logstash/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Logstash 6.8.22-SNAPSHOT using [Logstash OSS][] version. +This example deploy Logstash 6.8.22 using [Logstash OSS][] version. ## Usage diff --git a/logstash/values.yaml b/logstash/values.yaml index 4e18390c1..df1acc41f 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -72,7 +72,7 @@ hostAliases: [] # - "bar.local" image: "docker.elastic.co/logstash/logstash" -imageTag: "6.8.22-SNAPSHOT" +imageTag: "6.8.22" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index 72f6144a9..ac8d2212c 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.22-SNAPSHOT -appVersion: 6.8.22-SNAPSHOT +version: 6.8.22 +appVersion: 6.8.22 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 eac3bd3b7..c9fecbffc 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -6,7 +6,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 the latest [6.x][] release for released version. @@ -14,7 +13,7 @@ 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 6.8 branch and 6.8.22-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) + - [Install development version using 6.8 branch and 6.8.22 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -40,7 +39,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.22-SNAPSHOT version. +This chart is tested with the latest 6.8.22 version. ### Install released version using Helm repository @@ -52,15 +51,15 @@ This chart is tested with the latest 6.8.22-SNAPSHOT version. - with Helm 3: `helm install metricbeat --version elastic/metricbeat` - with Helm 2 (deprecated): `helm install --name metricbeat --version elastic/metricbeat` -### Install development version using 6.8 branch and 6.8.22-SNAPSHOT versions +### Install development version using 6.8 branch and 6.8.22 versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` * Checkout the branch : git checkout 6.8 * Install it: - - with Helm 3: `helm install metricbeat ./helm-charts/metricbeat --set imageTag=6.8.22-SNAPSHOT` - - with Helm 2 (deprecated): `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=6.8.22-SNAPSHOT` + - with Helm 3: `helm install metricbeat ./helm-charts/metricbeat --set imageTag=6.8.22` + - with Helm 2 (deprecated): `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=6.8.22` ## Upgrading @@ -130,7 +129,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.22-SNAPSHOT` | +| `imageTag` | The Metricbeat Docker image tag | `6.8.22` | | `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` | `""` | @@ -224,7 +223,7 @@ about our development and testing process. [6.x]: https://github.com/elastic/helm-charts/releases [#471]: https://github.com/elastic/helm-charts/pull/471 -[6.8.22-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.22-SNAPSHOT/metricbeat/README.md +[6.8.22]: https://github.com/elastic/helm-charts/blob/6.8.22/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 c80f550d7..88e063597 100644 --- a/metricbeat/examples/default/README.md +++ b/metricbeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Metricbeat 6.8.22-SNAPSHOT using [default values][]. +This example deploy Metricbeat 6.8.22 using [default values][]. ## Usage diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index db03820f5..80c86c088 100644 --- a/metricbeat/examples/oss/README.md +++ b/metricbeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Metricbeat 6.8.22-SNAPSHOT using [Metricbeat OSS][] version. +This example deploy Metricbeat 6.8.22 using [Metricbeat OSS][] version. ## Usage diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index 855ce1a1c..7b7fffe17 100644 --- a/metricbeat/examples/security/README.md +++ b/metricbeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Metricbeat 6.8.22-SNAPSHOT using authentication and TLS to connect to +This example deploy Metricbeat 6.8.22 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 9d29018dc..729c84902 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -181,7 +181,7 @@ extraInitContainers: "" hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "6.8.22-SNAPSHOT" +imageTag: "6.8.22" imagePullPolicy: "IfNotPresent" imagePullSecrets: []