From 46bbee1ed8f227aa036f3223f74ef40df1bf6b82 Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Wed, 3 Jun 2020 16:38:27 +0200 Subject: [PATCH] 6.8.10 Release (#651) This PR prepare `6.8` branch for `6.8.10` release: - bump chart and Docker images version from `6.8.10-SNAPSHOT` to `6.8.10` - remove notices on README that this is a development branch and development branch specific install instructions ### Note > - remove notices on README that this is a development branch and development branch specific install instructions This is required because released Helm charts will be packaged from this PR commit including the README files that will be available inside the chart packages and in [Helm Hub](https://hub.helm.sh/charts/elastic) pages (example: [Elasticsearch chart page](https://hub.helm.sh/charts/elastic/elasticsearch)). This change will be reverted in the next PR after release when we will bump `6.8` branch to `6.8.11-SNAPSHOT` version. --- apm-server/Chart.yaml | 4 ++-- apm-server/README.md | 22 ++----------------- 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 | 22 ++----------------- elasticsearch/examples/config/README.md | 2 +- elasticsearch/examples/default/README.md | 2 +- .../examples/docker-for-mac/README.md | 2 +- .../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 | 22 ++----------------- filebeat/examples/default/README.md | 2 +- filebeat/examples/oss/README.md | 2 +- filebeat/examples/security/README.md | 2 +- filebeat/values.yaml | 2 +- helpers/bumper.py | 2 +- helpers/examples.mk | 2 +- kibana/Chart.yaml | 4 ++-- kibana/README.md | 22 ++----------------- 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 | 22 ++----------------- 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 | 22 ++----------------- 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, 58 insertions(+), 166 deletions(-) diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index 4af35492c..40284bdad 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.10-SNAPSHOT -appVersion: 6.8.10-SNAPSHOT +version: 6.8.10 +appVersion: 6.8.10 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 b5cd222e7..29f55109c 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.9][] 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.10-SNAPSHOT versions](#install-development-version-using-68-branch-and-6810-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -43,22 +38,10 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.10-SNAPSHOT versions. - -### Install released version using Helm repository - * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 6.8 release: -`helm install --name apm-server elastic/apm-server` -* Install it: `helm install --name apm-server elastic/apm-server` - -### Install development version using 6.8 branch and 6.8.10-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: `helm install --name apm-server ./helm-charts/apm-server` +* Install it: `helm install --name apm-server --version 6.8.10 elastic/apm-server` ## Upgrading @@ -96,7 +79,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.10-SNAPSHOT` | +| `imageTag` | The APM Server Docker image tag | `6.8.10` | | `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 | `{}` | @@ -144,7 +127,6 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[6.8.9]: https://github.com/elastic/helm-charts/blob/6.8.9/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 ca2bcdc87..31af30406 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.10-SNAPSHOT using [default values][]. +This example deploy APM Server 6.8.10 using [default values][]. ## Usage diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index 43e0ba7b3..33a228f74 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.10-SNAPSHOT using [APM Server OSS][] version. +This example deploy APM Server 6.8.10 using [APM Server OSS][] version. ## Usage diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md index ee30d443e..90cccd30d 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.10-SNAPSHOT using authentication and TLS to connect to +This example deploy APM Server 6.8.10 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/apm-server/values.yaml b/apm-server/values.yaml index c1f71f294..f7695c914 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.10-SNAPSHOT" +imageTag: "6.8.10" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index e796d83c6..bf68df2d2 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.10-SNAPSHOT -appVersion: 6.8.10-SNAPSHOT +version: 6.8.10 +appVersion: 6.8.10 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 b058943a0..968ca664a 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -3,9 +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 [6.8.9][] release -for released version. - @@ -13,8 +10,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.10-SNAPSHOT versions](#install-development-version-using-68-branch-and-6810-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -53,22 +48,10 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.10-SNAPSHOT versions. - -### Install released version using Helm repository - * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 6.8 release: -`helm install --name elasticsearch elastic/elasticsearch` -* Install it: `helm install --name elasticsearch elastic/elasticsearch` - -### Install development version using 6.8 branch and 6.8.10-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: `helm install --name elasticsearch ./helm-charts/elasticsearch` +* Install it: `helm install --name elasticsearch --version 6.8.10 elastic/elasticsearch` ## Upgrading @@ -123,7 +106,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.10-SNAPSHOT` | +| `imageTag` | The Elasticsearch Docker image tag | `6.8.10` | | `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 | `{}` | @@ -385,7 +368,6 @@ about our development and testing process. [#63]: https://github.com/elastic/helm-charts/issues/63 -[6.8.9]: https://github.com/elastic/helm-charts/blob/6.8.9/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 9bf9a259e..7c4593875 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.10-SNAPSHOT with authentication and +This example deploy a single node Elasticsearch 6.8.10 with authentication and custom [values][]. diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md index 91c394215..fb1e377d1 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.10-SNAPSHOT cluster using +This example deploy a 3 nodes Elasticsearch 6.8.10 cluster using [default values][]. diff --git a/elasticsearch/examples/docker-for-mac/README.md b/elasticsearch/examples/docker-for-mac/README.md index 60ee8813e..b43b1479d 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.10-SNAPSHOT cluster on [Docker for Mac][] +This example deploy a 3 nodes Elasticsearch 6.8.10 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 f685c9309..2482a2c1a 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.10-SNAPSHOT cluster on [Kind][] +This example deploy a 3 nodes Elasticsearch 6.8.10 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 a5521af73..3f31581e9 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.10-SNAPSHOT cluster on [MicroK8S][] +This example deploy a 3 nodes Elasticsearch 6.8.10 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 9f1c9db51..377739a9b 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.10-SNAPSHOT cluster on [Minikube][] +This example deploy a 3 nodes Elasticsearch 6.8.10 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 6cbae4460..813834557 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.10-SNAPSHOT cluster composed of 2 different Helm +This example deploy an Elasticsearch 6.8.10 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 8e4e9af43..334f18a77 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.10-SNAPSHOT cluster on [OpenShift][] +This example deploy a 3 nodes Elasticsearch 6.8.10 cluster on [OpenShift][] using [custom values][]. ## Usage diff --git a/elasticsearch/examples/oss/README.md b/elasticsearch/examples/oss/README.md index f261b86d1..a3247d86f 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.10-SNAPSHOT cluster using +This example deploy a 3 nodes Elasticsearch 6.8.10 cluster using [Elasticsearch OSS][] version. ## Usage diff --git a/elasticsearch/examples/security/README.md b/elasticsearch/examples/security/README.md index c1d476047..21871d47d 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.10-SNAPSHOT with authentication and +This example deploy a 3 nodes Elasticsearch 6.8.10 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 3938b599b..475b58e25 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.10-SNAPSHOT" +imageTag: "6.8.10" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index 6a3f64847..1845e4368 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.10-SNAPSHOT -appVersion: 6.8.10-SNAPSHOT +version: 6.8.10 +appVersion: 6.8.10 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 d1de14967..469fc68be 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -3,9 +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 [6.8.9][] release -for released version. - @@ -13,8 +10,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.10-SNAPSHOT versions](#install-development-version-using-68-branch-and-6810-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -39,22 +34,10 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.10-SNAPSHOT versions. - -### Install released version using Helm repository - * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 6.8 release: -`helm install --name filebeat elastic/filebeat` -* Install it: `helm install --name filebeat elastic/filebeat` - -### Install development version using 6.8 branch and 6.8.10-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: `helm install --name filebeat ./helm-charts/filebeat` +* Install it: `helm install --name filebeat --version 6.8.10 elastic/filebeat` ## Upgrading @@ -102,7 +85,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.10-SNAPSHOT` | +| `imageTag` | The Filebeat Docker image tag | `6.8.10` | | `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][] | @@ -159,7 +142,6 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[6.8.9]: https://github.com/elastic/helm-charts/blob/6.8.9/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 12e774c2a..6ad0ac66a 100644 --- a/filebeat/examples/default/README.md +++ b/filebeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 6.8.10-SNAPSHOT using [default values][]. +This example deploy Filebeat 6.8.10 using [default values][]. ## Usage diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index 2507b153f..485ba0a20 100644 --- a/filebeat/examples/oss/README.md +++ b/filebeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Filebeat 6.8.10-SNAPSHOT using [Filebeat OSS][] version. +This example deploy Filebeat 6.8.10 using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index a9a363075..5213f457d 100644 --- a/filebeat/examples/security/README.md +++ b/filebeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Filebeat 6.8.10-SNAPSHOT using authentication and TLS to connect to +This example deploy Filebeat 6.8.10 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/filebeat/values.yaml b/filebeat/values.yaml index 87b58ab06..c11fbcce0 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.10-SNAPSHOT" +imageTag: "6.8.10" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/bumper.py b/helpers/bumper.py index 647746095..44beed047 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.10-SNAPSHOT"), + 6: os.environ.get("BUMPER_VERSION_6", "6.8.10"), } chart_version = versions[6] diff --git a/helpers/examples.mk b/helpers/examples.mk index c123231a7..c36f1af4f 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.10-SNAPSHOT +STACK_VERSION := 6.8.10 .PHONY: help help: ## Display this help diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index 1190ec1fd..d56d2670f 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.10-SNAPSHOT -appVersion: 6.8.10-SNAPSHOT +version: 6.8.10 +appVersion: 6.8.10 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 2cf89e1db..88f0780af 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -3,9 +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 [6.8.9][] release -for released version. - @@ -13,8 +10,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.10-SNAPSHOT versions](#install-development-version-using-68-branch-and-6810-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -41,22 +36,10 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.10-SNAPSHOT versions. - -### Install released version using Helm repository - * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 6.8 release: -`helm install --name kibana elastic/kibana` -* Install it: `helm install --name kibana elastic/kibana` - -### Install development version using 6.8 branch and 6.8.10-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: `helm install --name kibana ./helm-charts/kibana` +* Install it: `helm install --name kibana --version 6.8.10 elastic/kibana` ## Upgrading @@ -89,7 +72,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.10-SNAPSHOT` | +| `imageTag` | The Kibana Docker image tag | `6.8.10` | | `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 | `{}` | @@ -201,7 +184,6 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[6.8.9]: https://github.com/elastic/helm-charts/blob/6.8.9/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 ce46ee408..e139f356d 100644 --- a/kibana/examples/default/README.md +++ b/kibana/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Kibana 6.8.10-SNAPSHOT using [default values][]. +This example deploy Kibana 6.8.10 using [default values][]. ## Usage diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index 4b45e40a5..cf8075b13 100644 --- a/kibana/examples/openshift/README.md +++ b/kibana/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy Kibana 6.8.10-SNAPSHOT on [OpenShift][] using [custom values][]. +This example deploy Kibana 6.8.10 on [OpenShift][] using [custom values][]. ## Usage diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md index e74fc289b..d415ad4b4 100644 --- a/kibana/examples/oss/README.md +++ b/kibana/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Kibana 6.8.10-SNAPSHOT using [Kibana OSS][] version. +This example deploy Kibana 6.8.10 using [Kibana OSS][] version. ## Usage diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md index 9e48c790b..d606bc736 100644 --- a/kibana/examples/security/README.md +++ b/kibana/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Kibana 6.8.10-SNAPSHOT using authentication and TLS to connect to +This example deploy Kibana 6.8.10 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/kibana/values.yaml b/kibana/values.yaml index c5f8187f2..31c1a614e 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.10-SNAPSHOT" +imageTag: "6.8.10" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index dc96b2231..bd9b0c917 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.10-SNAPSHOT -appVersion: 6.8.10-SNAPSHOT +version: 6.8.10 +appVersion: 6.8.10 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 39b0d5e43..f07a9d9a1 100644 --- a/logstash/README.md +++ b/logstash/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.9][] 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.10-SNAPSHOT versions](#install-development-version-using-68-branch-and-6810-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -43,22 +38,10 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.10-SNAPSHOT versions. - -### Install released version using Helm repository - * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 6.8 release: -`helm install --name logstash elastic/logstash` -* Install it: `helm install --name logstash elastic/logstash` - -### Install development version using 6.8 branch and 6.8.10-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: `helm install --name logstash ./helm-charts/logstash` +* Install it: `helm install --name logstash --version 6.8.10 elastic/logstash` ## Upgrading @@ -112,7 +95,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.10-SNAPSHOT` | +| `imageTag` | The Logstash Docker image tag | `6.8.10` | | `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 | `{}` | @@ -185,7 +168,6 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[6.8.9]: https://github.com/elastic/helm-charts/blob/6.8.9/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 aebb954cc..9975b1a21 100644 --- a/logstash/examples/default/README.md +++ b/logstash/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Logstash 6.8.10-SNAPSHOT using [default values][]. +This example deploy Logstash 6.8.10 using [default values][]. ## Usage diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md index 48d6f2ca9..72630a72c 100644 --- a/logstash/examples/elasticsearch/README.md +++ b/logstash/examples/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -This example deploy Logstash 6.8.10-SNAPSHOT which connects to Elasticsearch (see +This example deploy Logstash 6.8.10 which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/oss/README.md b/logstash/examples/oss/README.md index d26a287ae..50f1f2522 100644 --- a/logstash/examples/oss/README.md +++ b/logstash/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Logstash 6.8.10-SNAPSHOT using [Logstash OSS][] version. +This example deploy Logstash 6.8.10 using [Logstash OSS][] version. ## Usage diff --git a/logstash/values.yaml b/logstash/values.yaml index c639207b9..5f46d6b07 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -43,7 +43,7 @@ envFrom: [] secretMounts: [] image: "docker.elastic.co/logstash/logstash" -imageTag: "6.8.10-SNAPSHOT" +imageTag: "6.8.10" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index 282ca2d49..3170f0cff 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.10-SNAPSHOT -appVersion: 6.8.10-SNAPSHOT +version: 6.8.10 +appVersion: 6.8.10 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 e7256f02a..90d1aef5c 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -3,9 +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 [6.8.9][] release -for released version. - @@ -13,8 +10,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.10-SNAPSHOT versions](#install-development-version-using-68-branch-and-6810-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -40,22 +35,10 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.10-SNAPSHOT versions. - -### Install released version using Helm repository - * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 6.8 release: -`helm install --name metricbeat elastic/metricbeat` -* Install it: `helm install --name metricbeat elastic/metricbeat` - -### Install development version using 6.8 branch and 6.8.10-SNAPSHOT versions - -* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` - -* Install it: `helm install --name metricbeat ./helm-charts/metricbeat` +* Install it: `helm install --name metricbeat --version 6.8.10 elastic/metricbeat` ## Upgrading @@ -117,7 +100,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.10-SNAPSHOT` | +| `imageTag` | The Metricbeat Docker image tag | `6.8.10` | | `image` | The Metricbeat Docker image | `docker.elastic.co/beats/metricbeat` | | `labels` | Configurable [labels][] applied to all Metricbeat pods | `{}` | | `livenessProbe` | Parameters to pass to liveness [probe][] checks for values such as timeouts and thresholds | see [values.yaml][] | @@ -199,7 +182,6 @@ about our development and testing process. [#471]: https://github.com/elastic/helm-charts/pull/471 -[6.8.9]: https://github.com/elastic/helm-charts/blob/6.8.9/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 62ae3319d..ee02d0dc4 100644 --- a/metricbeat/examples/default/README.md +++ b/metricbeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Metricbeat 6.8.10-SNAPSHOT using [default values][]. +This example deploy Metricbeat 6.8.10 using [default values][]. ## Usage diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index e3b2a5d67..315cc172f 100644 --- a/metricbeat/examples/oss/README.md +++ b/metricbeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Metricbeat 6.8.10-SNAPSHOT using [Metricbeat OSS][] version. +This example deploy Metricbeat 6.8.10 using [Metricbeat OSS][] version. ## Usage diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index 50494861c..c26068ede 100644 --- a/metricbeat/examples/security/README.md +++ b/metricbeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Metricbeat 6.8.10-SNAPSHOT using authentication and TLS to connect to +This example deploy Metricbeat 6.8.10 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 1a769e64f..061912915 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -159,7 +159,7 @@ extraInitContainers: "" hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "6.8.10-SNAPSHOT" +imageTag: "6.8.10" imagePullPolicy: "IfNotPresent" imagePullSecrets: []