diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index 6a023e4ba..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.0-SNAPSHOT -appVersion: 7.8.0-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 aef3faee3..3dde0a6ec 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.7.1][] 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.0-SNAPSHOT versions](#install-development-version-using-78-branch-and-780-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.0-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.7 release: -`helm install --name apm-server elastic/apm-server` - -### Install development version using 7.8 branch and 7.8.0-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.0-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 | `{}` | @@ -143,7 +130,6 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[7.7.1]: https://github.com/elastic/helm-charts/blob/7.7.1/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 39aa514e1..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.0-SNAPSHOT using [default values][]. +This example deploy APM Server 7.8.0 using [default values][]. ## Usage diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index 5f48d5ab5..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.0-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/security/README.md b/apm-server/examples/security/README.md index 615986fb3..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.0-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/values.yaml b/apm-server/values.yaml index 6b3a6184e..33bc0054d 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-SNAPSHOT" +imageTag: "7.8.0" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 5945eae05..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.0-SNAPSHOT -appVersion: 7.8.0-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 73b09c0c7..31006234a 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.7.1][] 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.0-SNAPSHOT versions](#install-development-version-using-78-branch-and-780-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.0-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.7 release: -`helm install --name elasticsearch elastic/elasticsearch` - -### Install development version using 7.8 branch and 7.8.0-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 apm-server --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.0-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.7.1]: https://github.com/elastic/helm-charts/blob/7.7.1/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 6afce9349..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.0-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 92f814d30..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.0-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 c8b2c0c25..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.0-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 7becc7d27..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.0-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 384b58832..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.0-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 485248c96..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.0-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 ae914e271..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.0-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 b696d1d76..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.0-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 6cd6a8a85..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.0-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/oss/README.md b/elasticsearch/examples/oss/README.md index b46f23a63..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.0-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 30c179d51..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.0-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 ef2bc8408..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.0-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 2f5d0aa16..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.0-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.0-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 b99d4e4f8..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.0-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 e7b2731cc..bbe004ab0 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-SNAPSHOT" +imageTag: "7.8.0" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index 843f7f70c..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.0-SNAPSHOT -appVersion: 7.8.0-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 d7f037bed..5922ff7da 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.7.1][] 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.0-SNAPSHOT versions](#install-development-version-using-78-branch-and-780-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -39,21 +34,13 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.8.0-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.7 release: -`helm install --name filebeat elastic/filebeat` - -### Install development version using 7.8 branch and 7.8.0-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 @@ -101,7 +88,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-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][] | @@ -158,7 +145,6 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[7.7.1]: https://github.com/elastic/helm-charts/blob/7.7.1/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 9773681c4..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.0-SNAPSHOT using [default values][]. +This example deploy Filebeat 7.8.0 using [default values][]. ## Usage diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index 959e8192c..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.0-SNAPSHOT using [Filebeat OSS][] version. +This example deploy Filebeat 7.8.0 using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index fcacc2210..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.0-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/values.yaml b/filebeat/values.yaml index a723aed13..378ba402b 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-SNAPSHOT" +imageTag: "7.8.0" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/bumper.py b/helpers/bumper.py index caa86648a..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.0-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 4b8da463c..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.0-SNAPSHOT +STACK_VERSION := 7.8.0 .PHONY: help help: ## Display this help diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index 722b9688f..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.0-SNAPSHOT -appVersion: 7.8.0-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 8153829af..f8ff28723 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.7.1][] 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.0-SNAPSHOT versions](#install-development-version-using-78-branch-and-780-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.0-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.7 release: -`helm install --name kibana elastic/kibana` - -### Install development version using 7.8 branch and 7.8.0-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 apm-server --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.0-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 | `{}` | @@ -200,7 +188,6 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[7.7.1]: https://github.com/elastic/helm-charts/blob/7.7.1/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 26b70cc14..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.0-SNAPSHOT using [default values][]. +This example deploy Kibana 7.8.0 using [default values][]. ## Usage diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index 8c511593b..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.0-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 f6f32380a..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.0-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 354626ee1..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.0-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 e357f4fc8..91021e27d 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-SNAPSHOT" +imageTag: "7.8.0" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index 05e2de6ea..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.0-SNAPSHOT -appVersion: 7.8.0-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 17b61c01f..c7a20ab59 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.7.1][] 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.0-SNAPSHOT versions](#install-development-version-using-78-branch-and-780-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.0-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.7 release: -`helm install --name logstash elastic/logstash` - -### Install development version using 7.8 branch and 7.8.0-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.0-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 | `{}` | @@ -184,7 +171,6 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[7.7.1]: https://github.com/elastic/helm-charts/blob/7.7.1/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 07348bf93..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.0-SNAPSHOT using [default values][]. +This example deploy Logstash 7.8.0 using [default values][]. ## Usage diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md index b7ab22edc..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.0-SNAPSHOT which connects to Elasticsearch (see +This example deploy Logstash 7.8.0 which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/oss/README.md b/logstash/examples/oss/README.md index b7a83148e..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.0-SNAPSHOT using [Logstash OSS][] version. +This example deploy Logstash 7.8.0 using [Logstash OSS][] version. ## Usage diff --git a/logstash/examples/security/README.md b/logstash/examples/security/README.md index 0f9af83dd..a041ca682 100644 --- a/logstash/examples/security/README.md +++ b/logstash/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Logstash 7.7.1 which connects to Elasticsearch using TLS +This example deploy Logstash 7.8.0 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 0102ad0d1..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.7.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 8fd6a4789..181f9e571 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -43,7 +43,7 @@ envFrom: [] secretMounts: [] image: "docker.elastic.co/logstash/logstash" -imageTag: "7.8.0-SNAPSHOT" +imageTag: "7.8.0" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index 1d42f81d0..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.0-SNAPSHOT -appVersion: 7.8.0-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 2f44dfa97..34b8d6691 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.7.1][] 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.0-SNAPSHOT versions](#install-development-version-using-78-branch-and-780-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.0-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.7 release: -`helm install --name metricbeat elastic/metricbeat` - -### Install development version using 7.8 branch and 7.8.0-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 @@ -116,7 +104,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-SNAPSHOT` | +| `imageTag` | The Metricbeat Docker image tag | `7.8.0` | | `image` | The Metricbeat Docker image | `docker.elastic.co/beats/metricbeat` | | `labels` | Configurable [labels][] applied to all Metricbeat pods | `{}` | | `livenessProbe` | Parameters to pass to liveness [probe][] checks for values such as timeouts and thresholds | see [values.yaml][] | @@ -198,7 +186,6 @@ about our development and testing process. [#471]: https://github.com/elastic/helm-charts/pull/471 -[7.7.1]: https://github.com/elastic/helm-charts/blob/7.7.1/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 a152a3550..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.0-SNAPSHOT using [default values][]. +This example deploy Metricbeat 7.8.0 using [default values][]. ## Usage diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index d5d964856..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.0-SNAPSHOT using [Metricbeat OSS][] version. +This example deploy Metricbeat 7.8.0 using [Metricbeat OSS][] version. ## Usage diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index 9c1a553b7..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.0-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/values.yaml b/metricbeat/values.yaml index 783a09bb8..8aaa8735c 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -159,7 +159,7 @@ extraInitContainers: "" hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "7.8.0-SNAPSHOT" +imageTag: "7.8.0" imagePullPolicy: "IfNotPresent" imagePullSecrets: []