From 963cfea7af14206eba0d4bf9e11e1e8f5d66c47b Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Mon, 13 Jul 2020 18:51:02 +0200 Subject: [PATCH 1/3] Revert "Bump 7.8 branch to 7.8.1-SNAPSHOT (#683)" This reverts commit 3c40d65d0da0d7ed72844229974da30ec9479659. --- .../elastic+helm-charts+{branch}+staging.yml | 2 +- CONTRIBUTING.md | 4 +-- apm-server/Chart.yaml | 4 +-- apm-server/README.md | 22 +++------------- apm-server/examples/default/README.md | 2 +- apm-server/examples/default/test/goss.yaml | 2 +- apm-server/examples/oss/README.md | 2 +- apm-server/examples/oss/test/goss.yaml | 2 +- apm-server/examples/security/README.md | 2 +- apm-server/examples/security/test/goss.yaml | 2 +- apm-server/values.yaml | 2 +- elasticsearch/Chart.yaml | 4 +-- elasticsearch/README.md | 23 ++++------------- elasticsearch/examples/config/README.md | 2 +- elasticsearch/examples/default/README.md | 2 +- elasticsearch/examples/default/test/goss.yaml | 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 +- .../examples/openshift/test/goss.yaml | 2 +- elasticsearch/examples/oss/README.md | 2 +- elasticsearch/examples/oss/test/goss.yaml | 2 +- elasticsearch/examples/security/README.md | 2 +- elasticsearch/examples/upgrade/README.md | 4 +-- elasticsearch/examples/upgrade/test/goss.yaml | 2 +- elasticsearch/values.yaml | 2 +- filebeat/Chart.yaml | 4 +-- filebeat/README.md | 22 +++------------- filebeat/examples/default/README.md | 2 +- filebeat/examples/default/test/goss.yaml | 4 +-- filebeat/examples/oss/README.md | 2 +- filebeat/examples/oss/test/goss.yaml | 2 +- filebeat/examples/security/README.md | 2 +- filebeat/examples/security/test/goss.yaml | 2 +- filebeat/values.yaml | 2 +- helpers/bumper.py | 2 +- helpers/examples.mk | 2 +- kibana/Chart.yaml | 4 +-- kibana/README.md | 25 +++++-------------- kibana/examples/default/README.md | 2 +- kibana/examples/default/test/goss.yaml | 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/default/test/goss.yaml | 2 +- logstash/examples/elasticsearch/README.md | 2 +- .../examples/elasticsearch/test/goss.yaml | 2 +- logstash/examples/oss/README.md | 2 +- logstash/examples/oss/test/goss.yaml | 2 +- logstash/examples/security/test/goss.yaml | 2 +- logstash/values.yaml | 2 +- metricbeat/Chart.yaml | 4 +-- metricbeat/README.md | 23 ++++------------- metricbeat/examples/default/README.md | 2 +- .../examples/default/test/goss-metrics.yaml | 6 ++--- metricbeat/examples/default/test/goss.yaml | 6 ++--- metricbeat/examples/oss/README.md | 2 +- .../examples/oss/test/goss-metrics.yaml | 6 ++--- metricbeat/examples/oss/test/goss.yaml | 6 ++--- metricbeat/examples/security/README.md | 2 +- .../examples/security/test/goss-metrics.yaml | 6 ++--- metricbeat/examples/security/test/goss.yaml | 6 ++--- metricbeat/values.yaml | 2 +- 70 files changed, 113 insertions(+), 194 deletions(-) diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml index 5d1eb2cbb..2cef76997 100644 --- a/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml +++ b/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml @@ -7,7 +7,7 @@ parameters: - string: name: BUILD_ID - description: "The buildId for the staging images. (Example: 7.8.1-abcdabcd)" + description: "The buildId for the staging images. (Example: 7.8.0-abcdabcd)" project-type: multijob scm: - git: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef563f4af..3e44b6801 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -72,7 +72,7 @@ official Kibana repo, which we'll refer to in later code snippets. * All work on the next major release (`8.0.0`) goes into master. * Past major release branches are named `{majorVersion}.x`. They contain work that will go into the next minor release. For example, if the next minor release -is `7.8.1`, work for it should go into the `7.x` branch. +is `7.8.0`, work for it should go into the `7.x` branch. * Past minor release branches are named `{majorVersion}.{minorVersion}`. They contain work that will go into the next patch release. For example, if the next patch release is `7.8.1`, work for it should go into the `7.8` branch. @@ -191,7 +191,7 @@ Just like with the rest of the stack, all versions in this helm chart repo are bumped and released at the same time. There is no need to bump the version in your pull request. -Charts are released from version branchs (example `7.8` branch). +Charts are released from version branchs (example `7.7` branch). [Elastic Helm repository][] is updated only during releases. diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index fc38bb2b1..eb10409a8 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.8.1-SNAPSHOT -appVersion: 7.8.1-SNAPSHOT +version: 7.8.0 +appVersion: 7.8.0 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 385efc017..bdd15d60b 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 [7.8.0][] 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 7.8 branch and 7.8.1-SNAPSHOT versions](#install-development-version-using-78-branch-and-781-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -43,21 +38,13 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.8.1-SNAPSHOT versions. - -### Install released version using Helm repository +This chart is tested with 7.8.0 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 7.8 release: -`helm install --name apm-server elastic/apm-server` - -### Install development version using 7.8 branch and 7.8.1-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 7.8.0 release: +`helm install --name apm-server --version 7.8.0 elastic/apm-server` ## Upgrading @@ -95,7 +82,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.8.1-SNAPSHOT` | +| `imageTag` | The APM Server Docker image tag | `7.8.0` | | `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 +131,6 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[7.8.0]: https://github.com/elastic/helm-charts/blob/7.8.0/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 793dfd66d..638bf4344 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.8.1-SNAPSHOT using [default values][]. +This example deploy APM Server 7.8.0 using [default values][]. ## Usage diff --git a/apm-server/examples/default/test/goss.yaml b/apm-server/examples/default/test/goss.yaml index e58a6d7cc..a2e5df9fa 100644 --- a/apm-server/examples/default/test/goss.yaml +++ b/apm-server/examples/default/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - '7.8.1' + - '7.8.0' diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index 09edb11b5..2637d874e 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.8.1-SNAPSHOT using [APM Server OSS][] version. +This example deploy APM Server 7.8.0 using [APM Server OSS][] version. ## Usage diff --git a/apm-server/examples/oss/test/goss.yaml b/apm-server/examples/oss/test/goss.yaml index e58a6d7cc..a2e5df9fa 100644 --- a/apm-server/examples/oss/test/goss.yaml +++ b/apm-server/examples/oss/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - '7.8.1' + - '7.8.0' diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md index 1cb862569..93b52b3cd 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.8.1-SNAPSHOT using authentication and TLS to connect to +This example deploy APM Server 7.8.0 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/apm-server/examples/security/test/goss.yaml b/apm-server/examples/security/test/goss.yaml index e58a6d7cc..a2e5df9fa 100644 --- a/apm-server/examples/security/test/goss.yaml +++ b/apm-server/examples/security/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - '7.8.1' + - '7.8.0' diff --git a/apm-server/values.yaml b/apm-server/values.yaml index d18a0bee2..e36e403ba 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.8.1-SNAPSHOT" +imageTag: "7.8.0" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 7f349c1d5..19003660c 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.8.1-SNAPSHOT -appVersion: 7.8.1-SNAPSHOT +version: 7.8.0 +appVersion: 7.8.0 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 68eedd300..f9252b02e 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 [7.8.0][] 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 7.8 branch and 7.8.1-SNAPSHOT versions](#install-development-version-using-78-branch-and-781-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -51,23 +46,16 @@ default settings. All of these settings are configurable. See [supported configurations][] for more details. -## Installing -This chart is tested with the latest 7.8.1-SNAPSHOT versions. +## Installing -### Install released version using Helm repository +This chart is tested with 7.8.0 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 7.8 release: -`helm install --name elasticsearch elastic/elasticsearch` - -### Install development version using 7.8 branch and 7.8.1-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 7.8.0 release: +`helm install --name elasticsearch --version 7.8.0 elastic/elasticsearch` ## Upgrading @@ -123,7 +111,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.8.1-SNAPSHOT` | +| `imageTag` | The Elasticsearch Docker image tag | `7.8.0` | | `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 +373,6 @@ about our development and testing process. [#63]: https://github.com/elastic/helm-charts/issues/63 -[7.8.0]: https://github.com/elastic/helm-charts/blob/7.8.0/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 57a76bcd2..4be1621e8 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.8.1-SNAPSHOT with authentication and +This example deploy a single node Elasticsearch 7.8.0 with authentication and custom [values][]. diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md index c010e040a..0ed9cec73 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.8.1-SNAPSHOT cluster using +This example deploy a 3 nodes Elasticsearch 7.8.0 cluster using [default values][]. diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml index 16a74b926..563760470 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.8.1-SNAPSHOT"' + - '"number" : "7.8.0"' - '"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 c8f7c097d..063dbef6f 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.8.1-SNAPSHOT cluster on [Docker for Mac][] +This example deploy a 3 nodes Elasticsearch 7.8.0 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 b36616e23..2e0a362ea 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.8.1-SNAPSHOT cluster on [Kind][] +This example deploy a 3 nodes Elasticsearch 7.8.0 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 fdfae73ea..6d4ca56a3 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.8.1-SNAPSHOT cluster on [MicroK8S][] +This example deploy a 3 nodes Elasticsearch 7.8.0 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 a3d471bd4..2444ccf7e 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.8.1-SNAPSHOT cluster on [Minikube][] +This example deploy a 3 nodes Elasticsearch 7.8.0 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 069e13bb8..4ee24a823 100644 --- a/elasticsearch/examples/multi/README.md +++ b/elasticsearch/examples/multi/README.md @@ -1,6 +1,6 @@ # Multi -This example deploy an Elasticsearch 7.8.1-SNAPSHOT cluster composed of 2 different Helm +This example deploy an Elasticsearch 7.8.0 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 84346eb99..9706bb9e0 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.8.1-SNAPSHOT cluster on [OpenShift][] +This example deploy a 3 nodes Elasticsearch 7.8.0 cluster on [OpenShift][] using [custom values][]. ## Usage diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml index dd3dc71e1..878dd0cb5 100644 --- a/elasticsearch/examples/openshift/test/goss.yaml +++ b/elasticsearch/examples/openshift/test/goss.yaml @@ -11,7 +11,7 @@ http: status: 200 timeout: 2000 body: - - '"number" : "7.8.1"' + - '"number" : "7.8.0"' - '"cluster_name" : "elasticsearch"' - '"name" : "elasticsearch-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/oss/README.md b/elasticsearch/examples/oss/README.md index f7911550b..da82f243a 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.8.1-SNAPSHOT cluster using +This example deploy a 3 nodes Elasticsearch 7.8.0 cluster using [Elasticsearch OSS][] version. ## Usage diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml index c9f0db179..f94274cc7 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.8.1-SNAPSHOT"' + - '"number" : "7.8.0"' - '"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 8a40fbd93..49047d28c 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.8.1-SNAPSHOT with authentication and +This example deploy a 3 nodes Elasticsearch 7.8.0 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 919898744..bd467e4c9 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.8.1-SNAPSHOT. +then upgrade it to version 7.8.0. 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.8.1-SNAPSHOT upgrade. +Running `make install` command will do first install and 7.8.0 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 241c63050..f319de7a5 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.8.1-SNAPSHOT"' + - '"number" : "7.8.0"' - '"cluster_name" : "upgrade"' - '"name" : "upgrade-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 02d5ef285..3ea848470 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -51,7 +51,7 @@ secretMounts: [] # defaultMode: 0755 image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "7.8.1-SNAPSHOT" +imageTag: "7.8.0" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index bd1b8153b..5959c1389 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.8.1-SNAPSHOT -appVersion: 7.8.1-SNAPSHOT +version: 7.8.0 +appVersion: 7.8.0 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 9daca55c8..e91975af7 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 [7.8.0][] 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 7.8 branch and 7.8.1-SNAPSHOT versions](#install-development-version-using-78-branch-and-781-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -40,21 +35,13 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.8.1-SNAPSHOT versions. - -### Install released version using Helm repository +This chart is tested with 7.8.0 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 7.8 release: -`helm install --name filebeat elastic/filebeat` - -### Install development version using 7.8 branch and 7.8.1-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 7.8.0 release: +`helm install --name apm-server --version 7.8.0 elastic/filebeat` ## Upgrading @@ -102,7 +89,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.8.1-SNAPSHOT` | +| `imageTag` | The Filebeat Docker image tag | `7.8.0` | | `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][] | @@ -182,7 +169,6 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[7.8.0]: https://github.com/elastic/helm-charts/blob/7.8.0/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 75766df2c..d108d3550 100644 --- a/filebeat/examples/default/README.md +++ b/filebeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 7.8.1-SNAPSHOT using [default values][]. +This example deploy Filebeat 7.8.0 using [default values][]. ## Usage diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml index 4fbad1f79..71c870739 100644 --- a/filebeat/examples/default/test/goss.yaml +++ b/filebeat/examples/default/test/goss.yaml @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-7.8.1' + - 'filebeat-7.8.0' file: /usr/share/filebeat/filebeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.8.1' + - 'version: 7.8.0' diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index 346229654..a840691ed 100644 --- a/filebeat/examples/oss/README.md +++ b/filebeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Filebeat 7.8.1-SNAPSHOT using [Filebeat OSS][] version. +This example deploy Filebeat 7.8.0 using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml index 90bf67b25..da2d94e32 100644 --- a/filebeat/examples/oss/test/goss.yaml +++ b/filebeat/examples/oss/test/goss.yaml @@ -19,4 +19,4 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-7.8.1' + - 'filebeat-7.8.0' diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index 1411d38b0..677cf7e3f 100644 --- a/filebeat/examples/security/README.md +++ b/filebeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Filebeat 7.8.1-SNAPSHOT using authentication and TLS to connect to +This example deploy Filebeat 7.8.0 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/filebeat/examples/security/test/goss.yaml b/filebeat/examples/security/test/goss.yaml index 7a5d1e992..8871dde92 100644 --- a/filebeat/examples/security/test/goss.yaml +++ b/filebeat/examples/security/test/goss.yaml @@ -3,7 +3,7 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-7.8.1' + - 'filebeat-7.8.0' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' diff --git a/filebeat/values.yaml b/filebeat/values.yaml index fb2ad4c68..445da08f4 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.8.1-SNAPSHOT" +imageTag: "7.8.0" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/bumper.py b/helpers/bumper.py index c94aa5de5..1034e5d9a 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -20,7 +20,7 @@ os.chdir(os.path.join(os.path.dirname(__file__), "..")) versions = { - 7: os.environ.get("BUMPER_VERSION_7", "7.8.1-SNAPSHOT"), + 7: os.environ.get("BUMPER_VERSION_7", "7.8.0"), } chart_version = versions[7] diff --git a/helpers/examples.mk b/helpers/examples.mk index 09d14fba1..6e141fe35 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.8.1-SNAPSHOT +STACK_VERSION := 7.8.0 .PHONY: help help: ## Display this help diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index affcea62d..32cc4d826 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.8.1-SNAPSHOT -appVersion: 7.8.1-SNAPSHOT +version: 7.8.0 +appVersion: 7.8.0 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 246b299ba..ae7ce6f03 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 [7.8.0][] 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 7.8 branch and 7.8.1-SNAPSHOT versions](#install-development-version-using-78-branch-and-781-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -39,23 +34,16 @@ for released version. See [supported configurations][] for more details. -## Installing -This chart is tested with the latest 7.8.1-SNAPSHOT versions. +## Installing -### Install released version using Helm repository +This chart is tested with 7.8.0 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 7.8 release: -`helm install --name kibana elastic/kibana` - -### Install development version using 7.8 branch and 7.8.1-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 7.8.0 release: +`helm install --name kibana --version 7.8.0 elastic/kibana` ## Upgrading @@ -88,7 +76,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.8.1-SNAPSHOT` | +| `imageTag` | The Kibana Docker image tag | `7.8.0` | | `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 | `{}` | @@ -142,7 +130,7 @@ An example can be found in [examples/security][]. Deploying OSS version of Elasticsearch can be done by setting `image` value to [kibana OSS Docker image][] -An example of Kibana deployment using OSS version can be found in +An example of APM Server deployment using OSS version can be found in [examples/oss][]. ### How to install plugins? @@ -200,7 +188,6 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[7.8.0]: https://github.com/elastic/helm-charts/blob/7.8.0/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 fe7fe73f0..e2e8fa32d 100644 --- a/kibana/examples/default/README.md +++ b/kibana/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Kibana 7.8.1-SNAPSHOT using [default values][]. +This example deploy Kibana 7.8.0 using [default values][]. ## Usage diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml index ce0d384f6..101aa5552 100644 --- a/kibana/examples/default/test/goss.yaml +++ b/kibana/examples/default/test/goss.yaml @@ -3,7 +3,7 @@ http: status: 200 timeout: 2000 body: - - '"number":"7.8.1"' + - '"number":"7.8.0"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index c25dd1cd4..e096e920d 100644 --- a/kibana/examples/openshift/README.md +++ b/kibana/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy Kibana 7.8.1-SNAPSHOT on [OpenShift][] using [custom values][]. +This example deploy Kibana 7.8.0 on [OpenShift][] using [custom values][]. ## Usage diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md index 273f68ae6..eb3f99c2c 100644 --- a/kibana/examples/oss/README.md +++ b/kibana/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Kibana 7.8.1-SNAPSHOT using [Kibana OSS][] version. +This example deploy Kibana 7.8.0 using [Kibana OSS][] version. ## Usage diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md index 04880341a..f1461a837 100644 --- a/kibana/examples/security/README.md +++ b/kibana/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Kibana 7.8.1-SNAPSHOT using authentication and TLS to connect to +This example deploy Kibana 7.8.0 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/kibana/values.yaml b/kibana/values.yaml index c2742c6b4..6a4cd2ce8 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.8.1-SNAPSHOT" +imageTag: "7.8.0" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index 163bf8fb3..841f72d1f 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.8.1-SNAPSHOT -appVersion: 7.8.1-SNAPSHOT +version: 7.8.0 +appVersion: 7.8.0 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 801b9116b..a5dd854fc 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 [7.8.0][] 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 7.8 branch and 7.8.1-SNAPSHOT versions](#install-development-version-using-78-branch-and-781-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -43,21 +38,13 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.8.1-SNAPSHOT versions. - -### Install released version using Helm repository +This chart is tested with 7.8.0 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 7.8 release: -`helm install --name logstash elastic/logstash` - -### Install development version using 7.8 branch and 7.8.1-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 7.8.0 release: +`helm install --name apm-server --version 7.8.0 elastic/logstash` ## Upgrading @@ -111,7 +98,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.8.1-SNAPSHOT` | +| `imageTag` | The Logstash Docker image tag | `7.8.0` | | `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 +172,6 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[7.8.0]: https://github.com/elastic/helm-charts/blob/7.8.0/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 5e0f50f60..36c959349 100644 --- a/logstash/examples/default/README.md +++ b/logstash/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Logstash 7.8.1-SNAPSHOT using [default values][]. +This example deploy Logstash 7.8.0 using [default values][]. ## Usage diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index baa412958..9e6912433 100644 --- a/logstash/examples/default/test/goss.yaml +++ b/logstash/examples/default/test/goss.yaml @@ -10,7 +10,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-default-logstash-0"' - - '"version" : "7.8.1"' + - '"version" : "7.8.0"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-default-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md index 900e87bf6..8a7c29873 100644 --- a/logstash/examples/elasticsearch/README.md +++ b/logstash/examples/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -This example deploy Logstash 7.8.1-SNAPSHOT which connects to Elasticsearch (see +This example deploy Logstash 7.8.0 which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index 652aeb7a8..4194138c0 100644 --- a/logstash/examples/elasticsearch/test/goss.yaml +++ b/logstash/examples/elasticsearch/test/goss.yaml @@ -22,7 +22,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-elasticsearch-logstash-0"' - - '"version" : "7.8.1"' + - '"version" : "7.8.0"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-elasticsearch-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/oss/README.md b/logstash/examples/oss/README.md index 92d0ae4b1..2d5551fb2 100644 --- a/logstash/examples/oss/README.md +++ b/logstash/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Logstash 7.8.1-SNAPSHOT using [Logstash OSS][] version. +This example deploy Logstash 7.8.0 using [Logstash OSS][] version. ## Usage diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index ccf623a18..7d9bfefbe 100644 --- a/logstash/examples/oss/test/goss.yaml +++ b/logstash/examples/oss/test/goss.yaml @@ -10,7 +10,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-oss-logstash-0"' - - '"version" : "7.8.1"' + - '"version" : "7.8.0"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-oss-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/security/test/goss.yaml b/logstash/examples/security/test/goss.yaml index 039cf8b2c..2bf128743 100644 --- a/logstash/examples/security/test/goss.yaml +++ b/logstash/examples/security/test/goss.yaml @@ -22,7 +22,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-security-logstash-0"' - - '"version" : "7.8.1"' + - '"version" : "7.8.0"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-security-logstash-0"' - '"status" : "green"' diff --git a/logstash/values.yaml b/logstash/values.yaml index 2bcc5bfe2..218aeb421 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -60,7 +60,7 @@ secrets: [] secretMounts: [] image: "docker.elastic.co/logstash/logstash" -imageTag: "7.8.1-SNAPSHOT" +imageTag: "7.8.0" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index 4c19d7ce7..c8eb88bfb 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.8.1-SNAPSHOT -appVersion: 7.8.1-SNAPSHOT +version: 7.8.0 +appVersion: 7.8.0 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 24240debc..5db019a33 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 [7.8.0][] 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 7.8 branch and 7.8.1-SNAPSHOT versions](#install-development-version-using-78-branch-and-781-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -38,23 +33,16 @@ for released version. See [supported configurations][] for more details. -## Installing -This chart is tested with the latest 7.8.1-SNAPSHOT versions. +## Installing -### Install released version using Helm repository +This chart is tested with 7.8.0 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 7.8 release: -`helm install --name metricbeat elastic/metricbeat` - -### Install development version using 7.8 branch and 7.8.1-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 7.8.0 release: +`helm install --name apm-server --version 7.8.0 elastic/metricbeat` ## Upgrading @@ -120,7 +108,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.8.1-SNAPSHOT` | +| `imageTag` | The Metricbeat Docker image tag | `7.8.0` | | `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` | `""` | @@ -205,7 +193,6 @@ about our development and testing process. [#471]: https://github.com/elastic/helm-charts/pull/471 -[7.8.0]: https://github.com/elastic/helm-charts/blob/7.8.0/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 64d230ff3..7513f7491 100644 --- a/metricbeat/examples/default/README.md +++ b/metricbeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Metricbeat 7.8.1-SNAPSHOT using [default values][]. +This example deploy Metricbeat 7.8.0 using [default values][]. ## Usage diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml index 5ba36c449..d053187a5 100644 --- a/metricbeat/examples/default/test/goss-metrics.yaml +++ b/metricbeat/examples/default/test/goss-metrics.yaml @@ -21,13 +21,13 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.1' + - 'metricbeat-7.8.0' 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.8.1' + - 'metricbeat-7.8.0' file: /usr/share/metricbeat/metricbeat.yml: @@ -41,4 +41,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.8.1' + - 'version: 7.8.0' diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index 4a54c4f2f..57729b462 100644 --- a/metricbeat/examples/default/test/goss.yaml +++ b/metricbeat/examples/default/test/goss.yaml @@ -25,12 +25,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.1' + - 'metricbeat-7.8.0' 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.8.1' + - 'metricbeat-7.8.0' file: /usr/share/metricbeat/metricbeat.yml: @@ -45,4 +45,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.8.1' + - 'version: 7.8.0' diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index f6b5993ac..85ff6d608 100644 --- a/metricbeat/examples/oss/README.md +++ b/metricbeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Metricbeat 7.8.1-SNAPSHOT using [Metricbeat OSS][] version. +This example deploy Metricbeat 7.8.0 using [Metricbeat OSS][] version. ## Usage diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml index 1cf90ac63..a8af07519 100644 --- a/metricbeat/examples/oss/test/goss-metrics.yaml +++ b/metricbeat/examples/oss/test/goss-metrics.yaml @@ -21,12 +21,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.1' + - 'metricbeat-7.8.0' http://oss-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.1' + - 'metricbeat-7.8.0' file: /usr/share/metricbeat/metricbeat.yml: @@ -39,4 +39,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.8.1' + - 'version: 7.8.0' diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index b6d645fcf..8a1bf3baa 100644 --- a/metricbeat/examples/oss/test/goss.yaml +++ b/metricbeat/examples/oss/test/goss.yaml @@ -25,12 +25,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.1' + - 'metricbeat-7.8.0' http://oss-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.1' + - 'metricbeat-7.8.0' file: /usr/share/metricbeat/metricbeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.8.1' + - 'version: 7.8.0' diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index 203dc9f1d..0255dc291 100644 --- a/metricbeat/examples/security/README.md +++ b/metricbeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Metricbeat 7.8.1-SNAPSHOT using authentication and TLS to connect to +This example deploy Metricbeat 7.8.0 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/metricbeat/examples/security/test/goss-metrics.yaml b/metricbeat/examples/security/test/goss-metrics.yaml index 84c17cb0b..cf215bd65 100644 --- a/metricbeat/examples/security/test/goss-metrics.yaml +++ b/metricbeat/examples/security/test/goss-metrics.yaml @@ -21,7 +21,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.1' + - 'metricbeat-7.8.0' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.1' + - 'metricbeat-7.8.0' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -45,4 +45,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 7.8.1' + - 'version: 7.8.0' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index 2c49075a2..58213e2e0 100644 --- a/metricbeat/examples/security/test/goss.yaml +++ b/metricbeat/examples/security/test/goss.yaml @@ -25,7 +25,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.1' + - 'metricbeat-7.8.0' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -33,7 +33,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.1' + - 'metricbeat-7.8.0' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -50,4 +50,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 7.8.1' + - 'version: 7.8.0' diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 35f90bf30..3f97e505c 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.8.1-SNAPSHOT" +imageTag: "7.8.0" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] From 0af26c09e0556a5f8a7217ff59b81b73df8248e1 Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Mon, 13 Jul 2020 18:58:58 +0200 Subject: [PATCH 2/3] [meta] bump to 7.8.1 --- apm-server/Chart.yaml | 4 ++-- apm-server/README.md | 8 ++++---- apm-server/examples/default/README.md | 2 +- apm-server/examples/default/test/goss.yaml | 2 +- apm-server/examples/oss/README.md | 2 +- apm-server/examples/oss/test/goss.yaml | 2 +- apm-server/examples/security/README.md | 2 +- apm-server/examples/security/test/goss.yaml | 2 +- apm-server/values.yaml | 2 +- elasticsearch/Chart.yaml | 4 ++-- elasticsearch/README.md | 8 ++++---- elasticsearch/examples/config/README.md | 2 +- elasticsearch/examples/default/README.md | 2 +- elasticsearch/examples/default/test/goss.yaml | 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/openshift/test/goss.yaml | 2 +- elasticsearch/examples/oss/README.md | 2 +- elasticsearch/examples/oss/test/goss.yaml | 2 +- elasticsearch/examples/security/README.md | 2 +- elasticsearch/examples/upgrade/README.md | 4 ++-- elasticsearch/examples/upgrade/test/goss.yaml | 2 +- elasticsearch/values.yaml | 2 +- filebeat/Chart.yaml | 4 ++-- filebeat/README.md | 8 ++++---- filebeat/examples/default/README.md | 2 +- filebeat/examples/default/test/goss.yaml | 4 ++-- filebeat/examples/oss/README.md | 2 +- filebeat/examples/oss/test/goss.yaml | 2 +- filebeat/examples/security/README.md | 2 +- filebeat/examples/security/test/goss.yaml | 2 +- filebeat/examples/security/values.yaml | 2 +- filebeat/values.yaml | 2 +- helpers/bumper.py | 4 ++-- helpers/examples.mk | 2 +- kibana/Chart.yaml | 4 ++-- kibana/README.md | 8 ++++---- kibana/examples/default/README.md | 2 +- kibana/examples/default/test/goss.yaml | 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 | 8 ++++---- logstash/examples/default/README.md | 2 +- logstash/examples/default/test/goss.yaml | 2 +- logstash/examples/elasticsearch/README.md | 2 +- logstash/examples/elasticsearch/test/goss.yaml | 2 +- logstash/examples/oss/README.md | 2 +- logstash/examples/oss/test/goss.yaml | 2 +- logstash/examples/security/README.md | 2 +- logstash/examples/security/test/goss.yaml | 2 +- logstash/values.yaml | 2 +- metricbeat/Chart.yaml | 4 ++-- metricbeat/README.md | 8 ++++---- metricbeat/examples/default/README.md | 2 +- metricbeat/examples/default/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/default/test/goss.yaml | 6 +++--- metricbeat/examples/oss/README.md | 2 +- metricbeat/examples/oss/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/oss/test/goss.yaml | 6 +++--- metricbeat/examples/security/README.md | 2 +- metricbeat/examples/security/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/security/test/goss.yaml | 6 +++--- metricbeat/values.yaml | 2 +- 70 files changed, 109 insertions(+), 109 deletions(-) diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index eb10409a8..738905f2b 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.8.0 -appVersion: 7.8.0 +version: 7.8.1 +appVersion: 7.8.1 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 bdd15d60b..17594de69 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -38,13 +38,13 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with 7.8.0 version. +This chart is tested with 7.8.1 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install 7.8.0 release: -`helm install --name apm-server --version 7.8.0 elastic/apm-server` +* Install 7.8.1 release: +`helm install --name apm-server --version 7.8.1 elastic/apm-server` ## Upgrading @@ -82,7 +82,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.8.0` | +| `imageTag` | The APM Server Docker image tag | `7.8.1` | | `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 638bf4344..ec94438f6 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.8.0 using [default values][]. +This example deploy APM Server 7.8.1 using [default values][]. ## Usage diff --git a/apm-server/examples/default/test/goss.yaml b/apm-server/examples/default/test/goss.yaml index a2e5df9fa..e58a6d7cc 100644 --- a/apm-server/examples/default/test/goss.yaml +++ b/apm-server/examples/default/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - '7.8.0' + - '7.8.1' diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index 2637d874e..39a858e41 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.8.0 using [APM Server OSS][] version. +This example deploy APM Server 7.8.1 using [APM Server OSS][] version. ## Usage diff --git a/apm-server/examples/oss/test/goss.yaml b/apm-server/examples/oss/test/goss.yaml index a2e5df9fa..e58a6d7cc 100644 --- a/apm-server/examples/oss/test/goss.yaml +++ b/apm-server/examples/oss/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - '7.8.0' + - '7.8.1' diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md index 93b52b3cd..ab9cbc810 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.8.0 using authentication and TLS to connect to +This example deploy APM Server 7.8.1 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/apm-server/examples/security/test/goss.yaml b/apm-server/examples/security/test/goss.yaml index a2e5df9fa..e58a6d7cc 100644 --- a/apm-server/examples/security/test/goss.yaml +++ b/apm-server/examples/security/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - '7.8.0' + - '7.8.1' diff --git a/apm-server/values.yaml b/apm-server/values.yaml index e36e403ba..a5b39b8fd 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.8.0" +imageTag: "7.8.1" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 19003660c..96d86c47e 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.8.0 -appVersion: 7.8.0 +version: 7.8.1 +appVersion: 7.8.1 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 f9252b02e..51ec3c306 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -49,13 +49,13 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with 7.8.0 version. +This chart is tested with 7.8.1 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install 7.8.0 release: -`helm install --name elasticsearch --version 7.8.0 elastic/elasticsearch` +* Install 7.8.1 release: +`helm install --name elasticsearch --version 7.8.1 elastic/elasticsearch` ## Upgrading @@ -111,7 +111,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.8.0` | +| `imageTag` | The Elasticsearch Docker image tag | `7.8.1` | | `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 4be1621e8..4fb0a28a8 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.8.0 with authentication and +This example deploy a single node Elasticsearch 7.8.1 with authentication and custom [values][]. diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md index 0ed9cec73..23a7d69b9 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.8.0 cluster using +This example deploy a 3 nodes Elasticsearch 7.8.1 cluster using [default values][]. diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml index 563760470..781ccaf61 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.8.0"' + - '"number" : "7.8.1"' - '"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 063dbef6f..48929171b 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.8.0 cluster on [Docker for Mac][] +This example deploy a 3 nodes Elasticsearch 7.8.1 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 2e0a362ea..e48c2b186 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.8.0 cluster on [Kind][] +This example deploy a 3 nodes Elasticsearch 7.8.1 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 6d4ca56a3..75adcd84b 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.8.0 cluster on [MicroK8S][] +This example deploy a 3 nodes Elasticsearch 7.8.1 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 2444ccf7e..e01698701 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.8.0 cluster on [Minikube][] +This example deploy a 3 nodes Elasticsearch 7.8.1 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 4ee24a823..f27cade81 100644 --- a/elasticsearch/examples/multi/README.md +++ b/elasticsearch/examples/multi/README.md @@ -1,6 +1,6 @@ # Multi -This example deploy an Elasticsearch 7.8.0 cluster composed of 2 different Helm +This example deploy an Elasticsearch 7.8.1 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 9706bb9e0..73a376047 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.8.0 cluster on [OpenShift][] +This example deploy a 3 nodes Elasticsearch 7.8.1 cluster on [OpenShift][] using [custom values][]. ## Usage diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml index 878dd0cb5..dd3dc71e1 100644 --- a/elasticsearch/examples/openshift/test/goss.yaml +++ b/elasticsearch/examples/openshift/test/goss.yaml @@ -11,7 +11,7 @@ http: status: 200 timeout: 2000 body: - - '"number" : "7.8.0"' + - '"number" : "7.8.1"' - '"cluster_name" : "elasticsearch"' - '"name" : "elasticsearch-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/oss/README.md b/elasticsearch/examples/oss/README.md index da82f243a..fd2aad926 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.8.0 cluster using +This example deploy a 3 nodes Elasticsearch 7.8.1 cluster using [Elasticsearch OSS][] version. ## Usage diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml index f94274cc7..e0f10c4ef 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.8.0"' + - '"number" : "7.8.1"' - '"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 49047d28c..0b941396d 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.8.0 with authentication and +This example deploy a 3 nodes Elasticsearch 7.8.1 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 bd467e4c9..def17dda8 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.8.0. +then upgrade it to version 7.8.1. 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.8.0 upgrade. +Running `make install` command will do first install and 7.8.1 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 f319de7a5..c060b8b39 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.8.0"' + - '"number" : "7.8.1"' - '"cluster_name" : "upgrade"' - '"name" : "upgrade-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 3ea848470..284ea67a8 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -51,7 +51,7 @@ secretMounts: [] # defaultMode: 0755 image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "7.8.0" +imageTag: "7.8.1" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index 5959c1389..20f0cccec 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.8.0 -appVersion: 7.8.0 +version: 7.8.1 +appVersion: 7.8.1 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 e91975af7..9a11813ce 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -35,13 +35,13 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with 7.8.0 version. +This chart is tested with 7.8.1 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install 7.8.0 release: -`helm install --name apm-server --version 7.8.0 elastic/filebeat` +* Install 7.8.1 release: +`helm install --name apm-server --version 7.8.1 elastic/filebeat` ## Upgrading @@ -89,7 +89,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.8.0` | +| `imageTag` | The Filebeat Docker image tag | `7.8.1` | | `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 d108d3550..0ac090faf 100644 --- a/filebeat/examples/default/README.md +++ b/filebeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 7.8.0 using [default values][]. +This example deploy Filebeat 7.8.1 using [default values][]. ## Usage diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml index 71c870739..4fbad1f79 100644 --- a/filebeat/examples/default/test/goss.yaml +++ b/filebeat/examples/default/test/goss.yaml @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-7.8.0' + - 'filebeat-7.8.1' file: /usr/share/filebeat/filebeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.8.0' + - 'version: 7.8.1' diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index a840691ed..e5ed03242 100644 --- a/filebeat/examples/oss/README.md +++ b/filebeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Filebeat 7.8.0 using [Filebeat OSS][] version. +This example deploy Filebeat 7.8.1 using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml index da2d94e32..90bf67b25 100644 --- a/filebeat/examples/oss/test/goss.yaml +++ b/filebeat/examples/oss/test/goss.yaml @@ -19,4 +19,4 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-7.8.0' + - 'filebeat-7.8.1' diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index 677cf7e3f..4d8041b58 100644 --- a/filebeat/examples/security/README.md +++ b/filebeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Filebeat 7.8.0 using authentication and TLS to connect to +This example deploy Filebeat 7.8.1 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/filebeat/examples/security/test/goss.yaml b/filebeat/examples/security/test/goss.yaml index 8871dde92..7a5d1e992 100644 --- a/filebeat/examples/security/test/goss.yaml +++ b/filebeat/examples/security/test/goss.yaml @@ -3,7 +3,7 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-7.8.0' + - 'filebeat-7.8.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' diff --git a/filebeat/examples/security/values.yaml b/filebeat/examples/security/values.yaml index 606961fa8..5ed7c5529 100644 --- a/filebeat/examples/security/values.yaml +++ b/filebeat/examples/security/values.yaml @@ -5,7 +5,7 @@ filebeatConfig: paths: - /var/log/containers/*.log processors: - - add_kubernetes_metadata: + - add_kubernetes_metadata: host: ${NODE_NAME} matchers: - logs_path: diff --git a/filebeat/values.yaml b/filebeat/values.yaml index 445da08f4..127930013 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.8.0" +imageTag: "7.8.1" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/bumper.py b/helpers/bumper.py index 1034e5d9a..7e3008bc0 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -20,7 +20,7 @@ os.chdir(os.path.join(os.path.dirname(__file__), "..")) versions = { - 7: os.environ.get("BUMPER_VERSION_7", "7.8.0"), + 7: os.environ.get("BUMPER_VERSION_7", "7.8.1"), } chart_version = versions[7] @@ -41,7 +41,7 @@ # This was happening because strings like 127.0.0.1 match for 7.0.0 # "7.0.0-alpha1" is also used in elasticsearch upgrade test and so shouldn't # been bump -blacklist = re.compile(r".*127.0.0.1.*|.*7.0.0-alpha1.*") +blacklist = re.compile(r".*127.0.0.1.*|.*7.0.0-alpha1.*|.*0.7.0.*|.*7.4.0.*") print("Updating versions...") diff --git a/helpers/examples.mk b/helpers/examples.mk index 6e141fe35..2011830fe 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.8.0 +STACK_VERSION := 7.8.1 .PHONY: help help: ## Display this help diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index 32cc4d826..496be8592 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.8.0 -appVersion: 7.8.0 +version: 7.8.1 +appVersion: 7.8.1 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 ae7ce6f03..a3bf33aa6 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -37,13 +37,13 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with 7.8.0 version. +This chart is tested with 7.8.1 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install 7.8.0 release: -`helm install --name kibana --version 7.8.0 elastic/kibana` +* Install 7.8.1 release: +`helm install --name kibana --version 7.8.1 elastic/kibana` ## Upgrading @@ -76,7 +76,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.8.0` | +| `imageTag` | The Kibana Docker image tag | `7.8.1` | | `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 e2e8fa32d..141485c3a 100644 --- a/kibana/examples/default/README.md +++ b/kibana/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Kibana 7.8.0 using [default values][]. +This example deploy Kibana 7.8.1 using [default values][]. ## Usage diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml index 101aa5552..ce0d384f6 100644 --- a/kibana/examples/default/test/goss.yaml +++ b/kibana/examples/default/test/goss.yaml @@ -3,7 +3,7 @@ http: status: 200 timeout: 2000 body: - - '"number":"7.8.0"' + - '"number":"7.8.1"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index e096e920d..38a5f1f5c 100644 --- a/kibana/examples/openshift/README.md +++ b/kibana/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy Kibana 7.8.0 on [OpenShift][] using [custom values][]. +This example deploy Kibana 7.8.1 on [OpenShift][] using [custom values][]. ## Usage diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md index eb3f99c2c..563e79434 100644 --- a/kibana/examples/oss/README.md +++ b/kibana/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Kibana 7.8.0 using [Kibana OSS][] version. +This example deploy Kibana 7.8.1 using [Kibana OSS][] version. ## Usage diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md index f1461a837..a4133c025 100644 --- a/kibana/examples/security/README.md +++ b/kibana/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Kibana 7.8.0 using authentication and TLS to connect to +This example deploy Kibana 7.8.1 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/kibana/values.yaml b/kibana/values.yaml index 6a4cd2ce8..6383cddba 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.8.0" +imageTag: "7.8.1" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index 841f72d1f..1772286d0 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.8.0 -appVersion: 7.8.0 +version: 7.8.1 +appVersion: 7.8.1 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 a5dd854fc..16ef3af2d 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -38,13 +38,13 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with 7.8.0 version. +This chart is tested with 7.8.1 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install 7.8.0 release: -`helm install --name apm-server --version 7.8.0 elastic/logstash` +* Install 7.8.1 release: +`helm install --name apm-server --version 7.8.1 elastic/logstash` ## Upgrading @@ -98,7 +98,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.8.0` | +| `imageTag` | The Logstash Docker image tag | `7.8.1` | | `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 36c959349..a51296e7c 100644 --- a/logstash/examples/default/README.md +++ b/logstash/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Logstash 7.8.0 using [default values][]. +This example deploy Logstash 7.8.1 using [default values][]. ## Usage diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index 9e6912433..baa412958 100644 --- a/logstash/examples/default/test/goss.yaml +++ b/logstash/examples/default/test/goss.yaml @@ -10,7 +10,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-default-logstash-0"' - - '"version" : "7.8.0"' + - '"version" : "7.8.1"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-default-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md index 8a7c29873..db06fccb8 100644 --- a/logstash/examples/elasticsearch/README.md +++ b/logstash/examples/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -This example deploy Logstash 7.8.0 which connects to Elasticsearch (see +This example deploy Logstash 7.8.1 which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index 4194138c0..652aeb7a8 100644 --- a/logstash/examples/elasticsearch/test/goss.yaml +++ b/logstash/examples/elasticsearch/test/goss.yaml @@ -22,7 +22,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-elasticsearch-logstash-0"' - - '"version" : "7.8.0"' + - '"version" : "7.8.1"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-elasticsearch-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/oss/README.md b/logstash/examples/oss/README.md index 2d5551fb2..ac2cbd37b 100644 --- a/logstash/examples/oss/README.md +++ b/logstash/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Logstash 7.8.0 using [Logstash OSS][] version. +This example deploy Logstash 7.8.1 using [Logstash OSS][] version. ## Usage diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index 7d9bfefbe..ccf623a18 100644 --- a/logstash/examples/oss/test/goss.yaml +++ b/logstash/examples/oss/test/goss.yaml @@ -10,7 +10,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-oss-logstash-0"' - - '"version" : "7.8.0"' + - '"version" : "7.8.1"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-oss-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/security/README.md b/logstash/examples/security/README.md index a041ca682..3f38afb04 100644 --- a/logstash/examples/security/README.md +++ b/logstash/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Logstash 7.8.0 which connects to Elasticsearch using TLS +This example deploy Logstash 7.8.1 which connects to Elasticsearch using TLS (see [values][]). diff --git a/logstash/examples/security/test/goss.yaml b/logstash/examples/security/test/goss.yaml index 2bf128743..039cf8b2c 100644 --- a/logstash/examples/security/test/goss.yaml +++ b/logstash/examples/security/test/goss.yaml @@ -22,7 +22,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-security-logstash-0"' - - '"version" : "7.8.0"' + - '"version" : "7.8.1"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-security-logstash-0"' - '"status" : "green"' diff --git a/logstash/values.yaml b/logstash/values.yaml index 218aeb421..aa7f6f074 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -60,7 +60,7 @@ secrets: [] secretMounts: [] image: "docker.elastic.co/logstash/logstash" -imageTag: "7.8.0" +imageTag: "7.8.1" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index c8eb88bfb..a088ca80b 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.8.0 -appVersion: 7.8.0 +version: 7.8.1 +appVersion: 7.8.1 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 5db019a33..7cfcbf703 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -36,13 +36,13 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with 7.8.0 version. +This chart is tested with 7.8.1 version. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install 7.8.0 release: -`helm install --name apm-server --version 7.8.0 elastic/metricbeat` +* Install 7.8.1 release: +`helm install --name apm-server --version 7.8.1 elastic/metricbeat` ## Upgrading @@ -108,7 +108,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.8.0` | +| `imageTag` | The Metricbeat Docker image tag | `7.8.1` | | `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 7513f7491..76ae599fd 100644 --- a/metricbeat/examples/default/README.md +++ b/metricbeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Metricbeat 7.8.0 using [default values][]. +This example deploy Metricbeat 7.8.1 using [default values][]. ## Usage diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml index d053187a5..5ba36c449 100644 --- a/metricbeat/examples/default/test/goss-metrics.yaml +++ b/metricbeat/examples/default/test/goss-metrics.yaml @@ -21,13 +21,13 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -41,4 +41,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.8.0' + - 'version: 7.8.1' diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index 57729b462..4a54c4f2f 100644 --- a/metricbeat/examples/default/test/goss.yaml +++ b/metricbeat/examples/default/test/goss.yaml @@ -25,12 +25,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -45,4 +45,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.8.0' + - 'version: 7.8.1' diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index 85ff6d608..5a046ec40 100644 --- a/metricbeat/examples/oss/README.md +++ b/metricbeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Metricbeat 7.8.0 using [Metricbeat OSS][] version. +This example deploy Metricbeat 7.8.1 using [Metricbeat OSS][] version. ## Usage diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml index a8af07519..1cf90ac63 100644 --- a/metricbeat/examples/oss/test/goss-metrics.yaml +++ b/metricbeat/examples/oss/test/goss-metrics.yaml @@ -21,12 +21,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' http://oss-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -39,4 +39,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.8.0' + - 'version: 7.8.1' diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index 8a1bf3baa..b6d645fcf 100644 --- a/metricbeat/examples/oss/test/goss.yaml +++ b/metricbeat/examples/oss/test/goss.yaml @@ -25,12 +25,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' http://oss-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.8.0' + - 'version: 7.8.1' diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index 0255dc291..7a5ae1ef6 100644 --- a/metricbeat/examples/security/README.md +++ b/metricbeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Metricbeat 7.8.0 using authentication and TLS to connect to +This example deploy Metricbeat 7.8.1 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/metricbeat/examples/security/test/goss-metrics.yaml b/metricbeat/examples/security/test/goss-metrics.yaml index cf215bd65..84c17cb0b 100644 --- a/metricbeat/examples/security/test/goss-metrics.yaml +++ b/metricbeat/examples/security/test/goss-metrics.yaml @@ -21,7 +21,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -45,4 +45,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 7.8.0' + - 'version: 7.8.1' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index 58213e2e0..2c49075a2 100644 --- a/metricbeat/examples/security/test/goss.yaml +++ b/metricbeat/examples/security/test/goss.yaml @@ -25,7 +25,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -33,7 +33,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -50,4 +50,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 7.8.0' + - 'version: 7.8.1' diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 3f97e505c..f21b89c08 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.8.0" +imageTag: "7.8.1" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] From 9ab8e13a3bd9f77dad1ae1dc7633c349b7a12eac Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Mon, 13 Jul 2020 19:09:49 +0200 Subject: [PATCH 3/3] some other manual updates --- .../elastic+helm-charts+{branch}+staging.yml | 2 +- CONTRIBUTING.md | 4 +-- README.md | 30 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml index 2cef76997..5d1eb2cbb 100644 --- a/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml +++ b/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml @@ -7,7 +7,7 @@ parameters: - string: name: BUILD_ID - description: "The buildId for the staging images. (Example: 7.8.0-abcdabcd)" + description: "The buildId for the staging images. (Example: 7.8.1-abcdabcd)" project-type: multijob scm: - git: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3e44b6801..ef563f4af 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -72,7 +72,7 @@ official Kibana repo, which we'll refer to in later code snippets. * All work on the next major release (`8.0.0`) goes into master. * Past major release branches are named `{majorVersion}.x`. They contain work that will go into the next minor release. For example, if the next minor release -is `7.8.0`, work for it should go into the `7.x` branch. +is `7.8.1`, work for it should go into the `7.x` branch. * Past minor release branches are named `{majorVersion}.{minorVersion}`. They contain work that will go into the next patch release. For example, if the next patch release is `7.8.1`, work for it should go into the `7.8` branch. @@ -191,7 +191,7 @@ Just like with the rest of the stack, all versions in this helm chart repo are bumped and released at the same time. There is no need to bump the version in your pull request. -Charts are released from version branchs (example `7.7` branch). +Charts are released from version branchs (example `7.8` branch). [Elastic Helm repository][] is updated only during releases. diff --git a/README.md b/README.md index afd7b8ce5..f741372b0 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,8 @@ tested against the corresponding production version. This will also ensure that the documentation and examples for the chart will work with the version of the product you are installing. -For example if you want to deploy an Elasticsearch `7.7.1` cluster, use the -corresponding `7.7.1` [tag][elasticsearch-771]. +For example if you want to deploy an Elasticsearch `7.8.1` cluster, use the +corresponding `7.8.1` [tag][elasticsearch-781]. The `master` version of these charts are intended to support the latest pre-release versions of our products, and therefore may or may not work with current released @@ -37,12 +37,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.8/running-on-docker.html | [`7.8.0`][apm-7] | [`6.8.10`][apm-6] | -| [Elasticsearch](./elasticsearch/README.md) | https://www.elastic.co/guide/en/elasticsearch/reference/7.8/docker.html | [`7.8.0`][elasticsearch-7] | [`6.8.10`][elasticsearch-6] | -| [Filebeat](./filebeat/README.md) | https://www.elastic.co/guide/en/beats/filebeat/7.8/running-on-docker.html | [`7.8.0`][filebeat-7] | [`6.8.10`][filebeat-6] | -| [Kibana](./kibana/README.md) | https://www.elastic.co/guide/en/kibana/7.8/docker.html | [`7.8.0`][kibana-7] | [`6.8.10`][kibana-6] | -| [Logstash](./logstash/README.md) | https://www.elastic.co/guide/en/logstash/7.8/docker.html | [`7.8.0`][logstash-7] | [`6.8.10`][logstash-6] | -| [Metricbeat](./metricbeat/README.md) | https://www.elastic.co/guide/en/beats/metricbeat/7.8/running-on-docker.html | [`7.8.0`][metricbeat-7] | [`6.8.10`][metricbeat-6] | +| [APM-Server](./apm-server/README.md) | https://www.elastic.co/guide/en/apm/server/7.8/running-on-docker.html | [`7.8.1`][apm-7] | [`6.8.10`][apm-6] | +| [Elasticsearch](./elasticsearch/README.md) | https://www.elastic.co/guide/en/elasticsearch/reference/7.8/docker.html | [`7.8.1`][elasticsearch-7] | [`6.8.10`][elasticsearch-6] | +| [Filebeat](./filebeat/README.md) | https://www.elastic.co/guide/en/beats/filebeat/7.8/running-on-docker.html | [`7.8.1`][filebeat-7] | [`6.8.10`][filebeat-6] | +| [Kibana](./kibana/README.md) | https://www.elastic.co/guide/en/kibana/7.8/docker.html | [`7.8.1`][kibana-7] | [`6.8.10`][kibana-6] | +| [Logstash](./logstash/README.md) | https://www.elastic.co/guide/en/logstash/7.8/docker.html | [`7.8.1`][logstash-7] | [`6.8.10`][logstash-6] | +| [Metricbeat](./metricbeat/README.md) | https://www.elastic.co/guide/en/beats/metricbeat/7.8/running-on-docker.html | [`7.8.1`][metricbeat-7] | [`6.8.10`][metricbeat-6] | ## Supported Configurations @@ -94,17 +94,17 @@ Kubernetes. [helm-tester Dockerfile]: https://github.com/elastic/helm-charts/blob/7.8/helpers/helm-tester/Dockerfile [helpers/matrix.yml]: https://github.com/elastic/helm-charts/blob/7.8/helpers/matrix.yml [operator pattern]: https://kubernetes.io/docs/concepts/extend-kubernetes/operator/ -[elasticsearch-771]: https://github.com/elastic/helm-charts/tree/7.7.1/elasticsearch/ +[elasticsearch-781]: https://github.com/elastic/helm-charts/tree/7.8.1/elasticsearch/ -[apm-7]: https://github.com/elastic/helm-charts/tree/7.8.0/apm-server/README.md +[apm-7]: https://github.com/elastic/helm-charts/tree/7.8.1/apm-server/README.md [apm-6]: https://github.com/elastic/helm-charts/tree/6.8.10/apm-server/README.md -[elasticsearch-7]: https://github.com/elastic/helm-charts/tree/7.8.0/elasticsearch/README.md +[elasticsearch-7]: https://github.com/elastic/helm-charts/tree/7.8.1/elasticsearch/README.md [elasticsearch-6]: https://github.com/elastic/helm-charts/tree/6.8.10/elasticsearch/README.md -[filebeat-7]: https://github.com/elastic/helm-charts/tree/7.8.0/filebeat/README.md +[filebeat-7]: https://github.com/elastic/helm-charts/tree/7.8.1/filebeat/README.md [filebeat-6]: https://github.com/elastic/helm-charts/tree/6.8.10/filebeat/README.md -[kibana-7]: https://github.com/elastic/helm-charts/tree/7.8.0/kibana/README.md +[kibana-7]: https://github.com/elastic/helm-charts/tree/7.8.1/kibana/README.md [kibana-6]: https://github.com/elastic/helm-charts/tree/6.8.10/kibana/README.md -[logstash-7]: https://github.com/elastic/helm-charts/tree/7.8.0/logstash/README.md +[logstash-7]: https://github.com/elastic/helm-charts/tree/7.8.1/logstash/README.md [logstash-6]: https://github.com/elastic/helm-charts/tree/6.8.10/logstash/README.md -[metricbeat-7]: https://github.com/elastic/helm-charts/tree/7.8.0/metricbeat/README.md +[metricbeat-7]: https://github.com/elastic/helm-charts/tree/7.8.1/metricbeat/README.md [metricbeat-6]: https://github.com/elastic/helm-charts/tree/6.8.10/metricbeat/README.md