diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index e3772ecbf..5af81a0be 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.11.1 -appVersion: 7.11.1 +version: 7.11.2-SNAPSHOT +appVersion: 7.11.2-SNAPSHOT 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 8a0cc8caa..8a85c26cc 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -11,6 +11,7 @@ provided as-is with no warranties. Alpha features are not subject to the support SLA of official GA features (see [supported configurations][] for more details). +**Warning**: This branch is used for development, please use the latest [7.x][] release for released version. @@ -43,7 +44,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.11.1 version. +This chart is tested with the latest 7.11.2-SNAPSHOT version. ### Install released version using Helm repository @@ -61,8 +62,8 @@ This chart is tested with the latest 7.11.1 version. * Checkout the branch : `git checkout 7.11` * Install it: - - with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=7.11.1` - - with Helm 2 (deprecated): `helm install --name apm-server ./helm-charts/apm-server --set imageTag=7.11.1` + - with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=7.11.2-SNAPSHOT` + - with Helm 2 (deprecated): `helm install --name apm-server ./helm-charts/apm-server --set imageTag=7.11.2-SNAPSHOT` ## Upgrading @@ -101,7 +102,7 @@ as a reference. They are also used in the automated testing of this chart. | `hostAliases` | Configurable [hostAliases][] | `[]` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The APM Server Docker image tag | `7.11.1` | +| `imageTag` | The APM Server Docker image tag | `7.11.2-SNAPSHOT` | | `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 a67d06bf2..164f53e5d 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.11.1 using [default values][]. +This example deploy APM Server 7.11.2-SNAPSHOT using [default values][]. ## Usage diff --git a/apm-server/examples/default/test/goss.yaml b/apm-server/examples/default/test/goss.yaml index 116e811cf..01206bac3 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.11.0" # https://github.com/elastic/apm-server/issues/4791 + - "7.11.2" diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index 2d8ff1ae8..ce5d57efe 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.11.1 using [APM Server OSS][] version. +This example deploy APM Server 7.11.2-SNAPSHOT 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 43b5cd01c..b55306d16 100644 --- a/apm-server/examples/oss/test/goss.yaml +++ b/apm-server/examples/oss/test/goss.yaml @@ -3,9 +3,9 @@ http: status: 200 timeout: 2000 body: - - '7.11.0' + - '7.11.2' http://elasticsearch-master:9200/_cat/indices: status: 200 timeout: 2000 body: - - 'apm-oss-7.11.1' + - 'apm-oss-7.11.2' diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md index 849b033c2..9859cd17b 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.11.1 using authentication and TLS to connect to +This example deploy APM Server 7.11.2-SNAPSHOT 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 7659f1f86..01206bac3 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.11.0" + - "7.11.2" diff --git a/apm-server/examples/upgrade/test/goss.yaml b/apm-server/examples/upgrade/test/goss.yaml index 7659f1f86..01206bac3 100644 --- a/apm-server/examples/upgrade/test/goss.yaml +++ b/apm-server/examples/upgrade/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - "7.11.0" + - "7.11.2" diff --git a/apm-server/values.yaml b/apm-server/values.yaml index 0d26e026b..9e1b2c8ae 100755 --- a/apm-server/values.yaml +++ b/apm-server/values.yaml @@ -68,7 +68,7 @@ hostAliases: [] # - "bar.local" image: "docker.elastic.co/apm/apm-server" -imageTag: "7.11.1" +imageTag: "7.11.2-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index be8e7b7aa..0ae346f4b 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.11.1 -appVersion: 7.11.1 +version: 7.11.2-SNAPSHOT +appVersion: 7.11.2-SNAPSHOT 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 f31b5627b..a25d633bb 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -6,6 +6,7 @@ This Helm chart is a lightweight way to configure and run our official [Elasticsearch Docker image][]. +**Warning**: This branch is used for development, please use the latest [7.x][] release for released version. @@ -52,7 +53,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.11.1 version. +This chart is tested with the latest 7.11.2-SNAPSHOT version. ### Install released version using Helm repository @@ -70,8 +71,8 @@ This chart is tested with the latest 7.11.1 version. * Checkout the branch : `git checkout 7.11` * Install it: - - with Helm 3: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=7.11.1` - - with Helm 2 (deprecated): `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=7.11.1` + - with Helm 3: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=7.11.2-SNAPSHOT` + - with Helm 2 (deprecated): `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=7.11.2-SNAPSHOT` ## Upgrading @@ -128,7 +129,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.11.1` | +| `imageTag` | The Elasticsearch Docker image tag | `7.11.2-SNAPSHOT` | | `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 61fbd7e72..2d3f8a714 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.11.1 with authentication and +This example deploy a single node Elasticsearch 7.11.2-SNAPSHOT with authentication and custom [values][]. diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md index 4746edb91..07cdcbdaa 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.11.1 cluster using +This example deploy a 3 nodes Elasticsearch 7.11.2-SNAPSHOT cluster using [default values][]. diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml index 6f6208127..86448ec8e 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.11.1"' + - '"number" : "7.11.2-SNAPSHOT"' - '"cluster_name" : "elasticsearch"' - "You Know, for Search" diff --git a/elasticsearch/examples/docker-for-mac/README.md b/elasticsearch/examples/docker-for-mac/README.md index 5a1023ce4..05586884f 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.11.1 cluster on [Docker for Mac][] +This example deploy a 3 nodes Elasticsearch 7.11.2-SNAPSHOT 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 4e0442cc9..126abc15f 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.11.1 cluster on [Kind][] +This example deploy a 3 nodes Elasticsearch 7.11.2-SNAPSHOT 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 5b24452c6..d7ce1a57b 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.11.1 cluster on [MicroK8S][] +This example deploy a 3 nodes Elasticsearch 7.11.2-SNAPSHOT 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 677141d47..ff1e6bb05 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.11.1 cluster on [Minikube][] +This example deploy a 3 nodes Elasticsearch 7.11.2-SNAPSHOT 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 002cad005..d24652231 100644 --- a/elasticsearch/examples/multi/README.md +++ b/elasticsearch/examples/multi/README.md @@ -1,6 +1,6 @@ # Multi -This example deploy an Elasticsearch 7.11.1 cluster composed of 3 different Helm +This example deploy an Elasticsearch 7.11.2-SNAPSHOT cluster composed of 3 different Helm releases: - `helm-es-multi-master` for the 3 master nodes using [master values][] diff --git a/elasticsearch/examples/openshift/README.md b/elasticsearch/examples/openshift/README.md index c94bf3a9c..0202e212f 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.11.1 cluster on [OpenShift][] +This example deploy a 3 nodes Elasticsearch 7.11.2-SNAPSHOT cluster on [OpenShift][] using [custom values][]. ## Usage diff --git a/elasticsearch/examples/security/README.md b/elasticsearch/examples/security/README.md index 2feb71740..ec23bd7c8 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.11.1 with authentication and +This example deploy a 3 nodes Elasticsearch 7.11.2-SNAPSHOT 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/test/goss.yaml b/elasticsearch/examples/upgrade/test/goss.yaml index 05333e390..7e7e093a0 100644 --- a/elasticsearch/examples/upgrade/test/goss.yaml +++ b/elasticsearch/examples/upgrade/test/goss.yaml @@ -11,6 +11,6 @@ http: status: 200 timeout: 2000 body: - - '"number" : "7.11.1"' + - '"number" : "7.11.2-SNAPSHOT"' - '"cluster_name" : "upgrade"' - "You Know, for Search" diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index b5b1c4c4a..fb09877a6 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -59,7 +59,7 @@ hostAliases: [] # - "bar.local" image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "7.11.1" +imageTag: "7.11.2-SNAPSHOT" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index 436995098..1df968b92 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.11.1 -appVersion: 7.11.1 +version: 7.11.2-SNAPSHOT +appVersion: 7.11.2-SNAPSHOT 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 5c1a0dd3a..ef8d1d7e1 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -6,6 +6,7 @@ This Helm chart is a lightweight way to configure and run our official [Filebeat Docker image][]. +**Warning**: This branch is used for development, please use the latest [7.x][] release for released version. @@ -42,7 +43,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.11.1 version. +This chart is tested with the latest 7.11.2-SNAPSHOT version. ### Install released version using Helm repository @@ -59,8 +60,8 @@ This chart is tested with the latest 7.11.1 version. * Checkout the branch : `git checkout 7.11` * Install it: - - with Helm 3: `helm install filebeat ./helm-charts/filebeat --set imageTag=7.11.1` - - with Helm 2 (deprecated): `helm install --name filebeat ./helm-charts/filebeat --set imageTag=7.11.1` + - with Helm 3: `helm install filebeat ./helm-charts/filebeat --set imageTag=7.11.2-SNAPSHOT` + - with Helm 2 (deprecated): `helm install --name filebeat ./helm-charts/filebeat --set imageTag=7.11.2-SNAPSHOT` ## Upgrading @@ -135,7 +136,7 @@ as a reference. They are also used in the automated testing of this chart. | `hostPathRoot` | Fully-qualified [hostPath][] that will be used to persist filebeat registry data | `/var/lib` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The filebeat Docker image tag | `7.11.1` | +| `imageTag` | The filebeat Docker image tag | `7.11.2-SNAPSHOT` | | `image` | The filebeat Docker image | `docker.elastic.co/beats/filebeat` | | `livenessProbe` | Parameters to pass to liveness [probe][] checks for values such as timeouts and thresholds | see [values.yaml][] | | `managedServiceAccount` | Whether the `serviceAccount` should be managed by this helm chart. Set this to `false` in order to manage your own service account and related roles | `true` | diff --git a/filebeat/examples/default/README.md b/filebeat/examples/default/README.md index 731089ffb..861e31e0c 100644 --- a/filebeat/examples/default/README.md +++ b/filebeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 7.11.1 using [default values][]. +This example deploy Filebeat 7.11.2-SNAPSHOT using [default values][]. ## Usage diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml index b6d92c7a0..84b413ee8 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.11.1' + - 'filebeat-7.11.2' file: /usr/share/filebeat/filebeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.11.1' + - 'version: 7.11.2' diff --git a/filebeat/examples/deployment/README.md b/filebeat/examples/deployment/README.md index e45834412..73b75ca2a 100644 --- a/filebeat/examples/deployment/README.md +++ b/filebeat/examples/deployment/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 7.11.1 using [default values][] as a Kubernetes Deployment. +This example deploy Filebeat 7.11.2-SNAPSHOT using [default values][] as a Kubernetes Deployment. ## Usage diff --git a/filebeat/examples/deployment/test/goss.yaml b/filebeat/examples/deployment/test/goss.yaml index 7bfa3734f..82c5219d9 100644 --- a/filebeat/examples/deployment/test/goss.yaml +++ b/filebeat/examples/deployment/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-7.11.1' + - 'filebeat-7.11.2' diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index 56df7f2c4..a978bbd0e 100644 --- a/filebeat/examples/oss/README.md +++ b/filebeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Filebeat 7.11.1 using [Filebeat OSS][] version. +This example deploy Filebeat 7.11.2-SNAPSHOT using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml index 5848d68fe..d7c2555c5 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-oss-7.11.1' + - 'filebeat-oss-7.11.2' diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index 23b6e5a37..aad7aa8ae 100644 --- a/filebeat/examples/security/README.md +++ b/filebeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Filebeat 7.11.1 using authentication and TLS to connect to +This example deploy Filebeat 7.11.2-SNAPSHOT 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 cb6b61dbd..e7dfd8b0d 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.11.1" + - "filebeat-7.11.2" allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' diff --git a/filebeat/examples/upgrade/test/goss.yaml b/filebeat/examples/upgrade/test/goss.yaml index 6bd86f6ad..82e76056e 100644 --- a/filebeat/examples/upgrade/test/goss.yaml +++ b/filebeat/examples/upgrade/test/goss.yaml @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - "filebeat-7.11.1" + - "filebeat-7.11.2" file: /usr/share/filebeat/filebeat.yml: diff --git a/filebeat/values.yaml b/filebeat/values.yaml index 30c863c4c..97db05963 100755 --- a/filebeat/values.yaml +++ b/filebeat/values.yaml @@ -146,7 +146,7 @@ hostAliases: [] # - "foo.local" # - "bar.local" image: "docker.elastic.co/beats/filebeat" -imageTag: "7.11.1" +imageTag: "7.11.2-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/examples.mk b/helpers/examples.mk index a2cde42de..6b1b64eee 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.11.1 +STACK_VERSION := 7.11.2-SNAPSHOT TIMEOUT := 900s .PHONY: help diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index 35640d13a..dda254b47 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.11.1 -appVersion: 7.11.1 +version: 7.11.2-SNAPSHOT +appVersion: 7.11.2-SNAPSHOT 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 07f38df92..1bb7b965a 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -6,6 +6,7 @@ This Helm chart is a lightweight way to configure and run our official [Kibana Docker image][]. +**Warning**: This branch is used for development, please use the latest [7.x][] release for released version. @@ -39,7 +40,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.11.1 version. +This chart is tested with the latest 7.11.2-SNAPSHOT version. ### Install released version using Helm repository @@ -57,8 +58,8 @@ This chart is tested with the latest 7.11.1 version. * Checkout the branch : `git checkout 7.11` * Install it: - - with Helm 3: `helm install kibana ./helm-charts/kibana --set imageTag=7.11.1` - - with Helm 2 (deprecated): `helm install --name kibana ./helm-charts/kibana --set imageTag=7.11.1` + - with Helm 3: `helm install kibana ./helm-charts/kibana --set imageTag=7.11.2-SNAPSHOT` + - with Helm 2 (deprecated): `helm install --name kibana ./helm-charts/kibana --set imageTag=7.11.2-SNAPSHOT` ## Upgrading @@ -92,7 +93,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.11.1` | +| `imageTag` | The Kibana Docker image tag | `7.11.2-SNAPSHOT` | | `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 24569e93b..73155f59f 100644 --- a/kibana/examples/default/README.md +++ b/kibana/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Kibana 7.11.1 using [default values][]. +This example deploy Kibana 7.11.2-SNAPSHOT using [default values][]. ## Usage diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml index aeadc90a4..ac2af1a6a 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.11.1"' + - '"number":"7.11.2"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index 1d3ed0426..3d3e616df 100644 --- a/kibana/examples/openshift/README.md +++ b/kibana/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy Kibana 7.11.1 on [OpenShift][] using [custom values][]. +This example deploy Kibana 7.11.2-SNAPSHOT on [OpenShift][] using [custom values][]. ## Usage diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md index af88a932c..557782a28 100644 --- a/kibana/examples/security/README.md +++ b/kibana/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Kibana 7.11.1 using authentication and TLS to connect to +This example deploy Kibana 7.11.2-SNAPSHOT using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/kibana/examples/upgrade/test/goss.yaml b/kibana/examples/upgrade/test/goss.yaml index 733beeffa..29418e3ee 100644 --- a/kibana/examples/upgrade/test/goss.yaml +++ b/kibana/examples/upgrade/test/goss.yaml @@ -3,7 +3,7 @@ http: status: 200 timeout: 2000 body: - - '"number":"7.11.1"' + - '"number":"7.11.2"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/values.yaml b/kibana/values.yaml index b5a6d92b6..f93bf1c59 100755 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -35,7 +35,7 @@ hostAliases: [] # - "bar.local" image: "docker.elastic.co/kibana/kibana" -imageTag: "7.11.1" +imageTag: "7.11.2-SNAPSHOT" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index 9dcf3ecfb..c6a4e29ee 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.11.1 -appVersion: 7.11.1 +version: 7.11.2-SNAPSHOT +appVersion: 7.11.2-SNAPSHOT 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 671028d23..c457744eb 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -11,6 +11,7 @@ provided as-is with no warranties. Alpha features are not subject to the support SLA of official GA features (see [supported configurations][] for more details). +**Warning**: This branch is used for development, please use the latest [7.x][] release for released version. @@ -43,7 +44,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.11.1 version. +This chart is tested with the latest 7.11.2-SNAPSHOT version. ### Install released version using Helm repository @@ -61,8 +62,8 @@ This chart is tested with the latest 7.11.1 version. * Checkout the branch : `git checkout 7.11` * Install it: - - with Helm 3: `helm install logstash ./helm-charts/logstash --set imageTag=7.11.1` - - with Helm 2 (deprecated): `helm install --name logstash ./helm-charts/logstash --set imageTag=7.11.1` + - with Helm 3: `helm install logstash ./helm-charts/logstash --set imageTag=7.11.2-SNAPSHOT` + - with Helm 2 (deprecated): `helm install --name logstash ./helm-charts/logstash --set imageTag=7.11.2-SNAPSHOT` ## Upgrading @@ -119,7 +120,7 @@ useful for the [http input plugin][], for instance. | `httpPort` | The http port that Kubernetes will use for the healthchecks and the service | `9600` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The Logstash Docker image tag | `7.11.1` | +| `imageTag` | The Logstash Docker image tag | `7.11.2-SNAPSHOT` | | `image` | The Logstash Docker image | `docker.elastic.co/logstash/logstash` | | `labels` | Configurable [labels][] applied to all Logstash pods | `{}` | | `ingress` | Configurable [ingress][] for external access to Logstash HTTP port. | see [values.yaml][] | diff --git a/logstash/examples/default/README.md b/logstash/examples/default/README.md index 3913e8fb5..a2d9343e1 100644 --- a/logstash/examples/default/README.md +++ b/logstash/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Logstash 7.11.1 using [default values][]. +This example deploy Logstash 7.11.2-SNAPSHOT using [default values][]. ## Usage diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index 9a284fabb..3137a2023 100644 --- a/logstash/examples/default/test/goss.yaml +++ b/logstash/examples/default/test/goss.yaml @@ -9,7 +9,7 @@ http: status: 200 timeout: 2000 body: - - '"version" : "7.11.1"' + - '"version" : "7.11.2"' - '"http_address" : "0.0.0.0:9600"' - '"status" : "green"' - '"workers" : 1' diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md index e967e0cbb..1dacc7528 100644 --- a/logstash/examples/elasticsearch/README.md +++ b/logstash/examples/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -This example deploy Logstash 7.11.1 which connects to Elasticsearch (see +This example deploy Logstash 7.11.2-SNAPSHOT which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index 45e44f689..1538162fc 100644 --- a/logstash/examples/elasticsearch/test/goss.yaml +++ b/logstash/examples/elasticsearch/test/goss.yaml @@ -21,7 +21,7 @@ http: status: 200 timeout: 2000 body: - - '"version" : "7.11.1"' + - '"version" : "7.11.2"' - '"http_address" : "0.0.0.0:9600"' - '"status" : "green"' - '"workers" : 1' diff --git a/logstash/examples/oss/README.md b/logstash/examples/oss/README.md index b93d91a2d..ed9bed3c2 100644 --- a/logstash/examples/oss/README.md +++ b/logstash/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Logstash 7.11.1 using [Logstash OSS][] version. +This example deploy Logstash 7.11.2-SNAPSHOT using [Logstash OSS][] version. ## Usage diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index 62c7b08d1..3f1fe9202 100644 --- a/logstash/examples/oss/test/goss.yaml +++ b/logstash/examples/oss/test/goss.yaml @@ -9,7 +9,7 @@ http: status: 200 timeout: 2000 body: - - '"version" : "7.11.1"' + - '"version" : "7.11.2"' - '"http_address" : "0.0.0.0:9600"' - '"status" : "green"' - '"workers" : 1' diff --git a/logstash/examples/security/test/goss.yaml b/logstash/examples/security/test/goss.yaml index b39192bf0..c6b38ced8 100644 --- a/logstash/examples/security/test/goss.yaml +++ b/logstash/examples/security/test/goss.yaml @@ -21,7 +21,7 @@ http: status: 200 timeout: 2000 body: - - '"version" : "7.11.1"' + - '"version" : "7.11.2"' - '"http_address" : "0.0.0.0:9600"' - '"status" : "green"' - '"workers" : 1' diff --git a/logstash/examples/upgrade/test/goss.yaml b/logstash/examples/upgrade/test/goss.yaml index 9a284fabb..3137a2023 100644 --- a/logstash/examples/upgrade/test/goss.yaml +++ b/logstash/examples/upgrade/test/goss.yaml @@ -9,7 +9,7 @@ http: status: 200 timeout: 2000 body: - - '"version" : "7.11.1"' + - '"version" : "7.11.2"' - '"http_address" : "0.0.0.0:9600"' - '"status" : "green"' - '"workers" : 1' diff --git a/logstash/values.yaml b/logstash/values.yaml index c2abc582b..e62e6b890 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -66,7 +66,7 @@ hostAliases: [] # - "bar.local" image: "docker.elastic.co/logstash/logstash" -imageTag: "7.11.1" +imageTag: "7.11.2-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index 1a7762194..9b4e4b4dd 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.11.1 -appVersion: 7.11.1 +version: 7.11.2-SNAPSHOT +appVersion: 7.11.2-SNAPSHOT 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 f7f89232b..a1be632e0 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -6,6 +6,7 @@ This Helm chart is a lightweight way to configure and run our official [Metricbeat Docker image][]. +**Warning**: This branch is used for development, please use the latest [7.x][] release for released version. @@ -40,7 +41,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.11.1 version. +This chart is tested with the latest 7.11.2-SNAPSHOT version. ### Install released version using Helm repository @@ -59,8 +60,8 @@ This chart is tested with the latest 7.11.1 version. * Checkout the branch : `git checkout 7.11` * Install it: - - with Helm 3: `helm install metricbeat ./helm-charts/metricbeat --set imageTag=7.11.1` - - with Helm 2 (deprecated): `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=7.11.1` + - with Helm 3: `helm install metricbeat ./helm-charts/metricbeat --set imageTag=7.11.2-SNAPSHOT` + - with Helm 2 (deprecated): `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=7.11.2-SNAPSHOT` ## Upgrading @@ -130,7 +131,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.11.1` | +| `imageTag` | The Metricbeat Docker image tag | `7.11.2-SNAPSHOT` | | `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 766e7f75e..88261a6b8 100644 --- a/metricbeat/examples/default/README.md +++ b/metricbeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Metricbeat 7.11.1 using [default values][]. +This example deploy Metricbeat 7.11.2-SNAPSHOT using [default values][]. ## Usage diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml index 0769126c6..f9d37652b 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.11.1" + - "metricbeat-7.11.2" 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - "metricbeat-7.11.1" + - "metricbeat-7.11.2" file: /usr/share/metricbeat/metricbeat.yml: @@ -41,4 +41,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.11.1' + - 'version: 7.11.2' diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index 7d435620f..8e0d7247b 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.11.1' + - 'metricbeat-7.11.2' 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.11.1' + - 'metricbeat-7.11.2' file: /usr/share/metricbeat/metricbeat.yml: @@ -45,4 +45,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.11.1' + - 'version: 7.11.2' diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index eb5210836..8f838c385 100644 --- a/metricbeat/examples/oss/README.md +++ b/metricbeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Metricbeat 7.11.1 using [Metricbeat OSS][] version. +This example deploy Metricbeat 7.11.2-SNAPSHOT using [Metricbeat OSS][] version. ## Usage diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml index ab7289909..5bf2c9258 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-oss-7.11.1' + - 'metricbeat-oss-7.11.2' http://elasticsearch-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-oss-7.11.1' + - 'metricbeat-oss-7.11.2' file: /usr/share/metricbeat/metricbeat.yml: diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index 8bc97f52c..c9fe22e7d 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-oss-7.11.1' + - 'metricbeat-oss-7.11.2' http://elasticsearch-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-oss-7.11.1' + - 'metricbeat-oss-7.11.2' file: /usr/share/metricbeat/metricbeat.yml: diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index a38087892..fef1b1f37 100644 --- a/metricbeat/examples/security/README.md +++ b/metricbeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Metricbeat 7.11.1 using authentication and TLS to connect to +This example deploy Metricbeat 7.11.2-SNAPSHOT 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 9aa43c803..100bb7699 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.11.1' + - 'metricbeat-7.11.2' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.11.1' + - 'metricbeat-7.11.2' 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.11.1' + - 'version: 7.11.2' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index ffacfe72c..4081a0769 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.11.1' + - 'metricbeat-7.11.2' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -33,7 +33,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.11.1' + - 'metricbeat-7.11.2' 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.11.1' + - 'version: 7.11.2' diff --git a/metricbeat/examples/upgrade/test/goss-metrics.yaml b/metricbeat/examples/upgrade/test/goss-metrics.yaml index 147dcc940..30995b4b2 100644 --- a/metricbeat/examples/upgrade/test/goss-metrics.yaml +++ b/metricbeat/examples/upgrade/test/goss-metrics.yaml @@ -21,13 +21,13 @@ http: status: 200 timeout: 2000 body: - - "metricbeat-7.11.1" + - "metricbeat-7.11.2" ? "http://upgrade-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat" : status: 200 timeout: 2000 body: - - "metricbeat-7.11.1" + - "metricbeat-7.11.2" file: /usr/share/metricbeat/metricbeat.yml: diff --git a/metricbeat/examples/upgrade/test/goss.yaml b/metricbeat/examples/upgrade/test/goss.yaml index c331e6f86..ff74d90d3 100644 --- a/metricbeat/examples/upgrade/test/goss.yaml +++ b/metricbeat/examples/upgrade/test/goss.yaml @@ -25,12 +25,12 @@ http: status: 200 timeout: 2000 body: - - "metricbeat-7.11.1" + - "metricbeat-7.11.2" ? "http://upgrade-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat" : status: 200 timeout: 2000 body: - - "metricbeat-7.11.1" + - "metricbeat-7.11.2" file: /usr/share/metricbeat/metricbeat.yml: diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 61cd7da18..30f797c79 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -181,7 +181,7 @@ extraInitContainers: "" hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "7.11.1" +imageTag: "7.11.2-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: []