From 96c5155124d9ed2e954d615e914ac62c4ecc39ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= Date: Mon, 29 Jun 2020 17:15:56 +0200 Subject: [PATCH 1/2] Elasticsearch: set PVC labels through setting all StatefulSet labels to its volumeClaimTemplate (#665) --- elasticsearch/templates/statefulset.yaml | 10 ++++++++++ elasticsearch/tests/elasticsearch_test.py | 16 ++++++++++++++++ elasticsearch/values.yaml | 3 +++ 3 files changed, 29 insertions(+) diff --git a/elasticsearch/templates/statefulset.yaml b/elasticsearch/templates/statefulset.yaml index f79b8f48f..6cc70377a 100644 --- a/elasticsearch/templates/statefulset.yaml +++ b/elasticsearch/templates/statefulset.yaml @@ -26,6 +26,16 @@ spec: volumeClaimTemplates: - metadata: name: {{ template "elasticsearch.uname" . }} + {{- if .Values.persistence.labels.enabled }} + labels: + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}" + app: "{{ template "elasticsearch.uname" . }}" + {{- range $key, $value := .Values.labels }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end }} {{- with .Values.persistence.annotations }} annotations: {{ toYaml . | indent 8 }} diff --git a/elasticsearch/tests/elasticsearch_test.py b/elasticsearch/tests/elasticsearch_test.py index d5f583a18..dfbff9033 100755 --- a/elasticsearch/tests/elasticsearch_test.py +++ b/elasticsearch/tests/elasticsearch_test.py @@ -84,8 +84,10 @@ def test_defaults(): assert c["volumeMounts"][0]["mountPath"] == "/usr/share/elasticsearch/data" assert c["volumeMounts"][0]["name"] == uname + # volumeClaimTemplates v = r["statefulset"][uname]["spec"]["volumeClaimTemplates"][0] assert v["metadata"]["name"] == uname + assert "labels" not in v["metadata"] assert v["spec"]["accessModes"] == ["ReadWriteOnce"] assert v["spec"]["resources"]["requests"]["storage"] == "30Gi" @@ -479,6 +481,20 @@ def test_adding_multiple_persistence_annotations(): assert annotations["world"] == "hello" +def test_enabling_persistence_label_in_volumeclaimtemplate(): + config = """ +persistence: + labels: + enabled: true +""" + r = helm_template(config) + volume_claim_template_labels = r["statefulset"][uname]["spec"][ + "volumeClaimTemplates" + ][0]["metadata"]["labels"] + statefulset_labels = r["statefulset"][uname]["metadata"]["labels"] + assert volume_claim_template_labels == statefulset_labels + + def test_adding_a_secret_mount(): config = """ secretMounts: diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 0bd6e442e..65f560e61 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -119,6 +119,9 @@ podSecurityPolicy: persistence: enabled: true + labels: + # Add default labels for the volumeClaimTemplate fo the StatefulSet + enabled: false annotations: {} extraVolumes: [] From e97248271e3da4d0a86069d7dbacf9da79b65c4f Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Mon, 29 Jun 2020 17:22:45 +0200 Subject: [PATCH 2/2] Bump master branch to 8.0.0-SNAPSHOT (#682) Following the new branching model, this PR bump master branch to tests 8.0.0-SNAPSHOT Docker images (next major release). This also drop compatibility with 6.x Elastic stack versions in master branch (cf 6.8 branch for 6.8 compatibility). --- README.md | 1 + apm-server/Chart.yaml | 4 +- apm-server/README.md | 30 +------ apm-server/examples/6.x/Makefile | 15 ---- apm-server/examples/6.x/README.md | 26 ------- apm-server/examples/6.x/test/goss.yaml | 6 -- apm-server/examples/6.x/values.yaml | 1 - 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 | 30 +------ elasticsearch/examples/6.x/Makefile | 15 ---- elasticsearch/examples/6.x/README.md | 23 ------ elasticsearch/examples/6.x/test/goss.yaml | 17 ---- elasticsearch/examples/6.x/values.yaml | 4 - 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/Makefile | 8 +- elasticsearch/examples/security/README.md | 2 +- .../examples/security/test/goss.yaml | 2 +- elasticsearch/examples/upgrade/Makefile | 16 ---- elasticsearch/examples/upgrade/README.md | 27 ------- .../examples/upgrade/scripts/upgrade.sh | 76 ------------------ elasticsearch/examples/upgrade/test/goss.yaml | 17 ---- elasticsearch/templates/_helpers.tpl | 2 +- elasticsearch/tests/elasticsearch_test.py | 78 +++---------------- elasticsearch/values.yaml | 2 +- filebeat/Chart.yaml | 4 +- filebeat/README.md | 30 +------ filebeat/examples/6.x/Makefile | 13 ---- filebeat/examples/6.x/README.md | 26 ------- filebeat/examples/6.x/test/goss.yaml | 21 ----- filebeat/examples/6.x/values.yaml | 18 ----- filebeat/examples/default/README.md | 2 +- filebeat/examples/default/test/goss.yaml | 3 +- 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 | 59 +++++++------- helpers/examples.mk | 3 +- helpers/matrix.yml | 7 -- kibana/Chart.yaml | 4 +- kibana/README.md | 30 +------ kibana/examples/6.x/Makefile | 12 --- kibana/examples/6.x/README.md | 26 ------- kibana/examples/6.x/test/goss.yaml | 10 --- kibana/examples/6.x/values.yml | 4 - 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 | 29 +------ logstash/examples/6.x/Makefile | 16 ---- logstash/examples/6.x/README.md | 17 ---- logstash/examples/6.x/test/goss.yaml | 38 --------- logstash/examples/6.x/values.yaml | 3 - 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/README.md | 2 +- logstash/examples/security/test/goss.yaml | 2 +- logstash/values.yaml | 2 +- metricbeat/Chart.yaml | 4 +- metricbeat/README.md | 30 +------ metricbeat/examples/6.x/Makefile | 17 ---- metricbeat/examples/6.x/README.md | 26 ------- .../examples/6.x/test/goss-metrics.yaml | 42 ---------- metricbeat/examples/6.x/test/goss.yaml | 47 ----------- metricbeat/examples/6.x/values.yaml | 5 -- metricbeat/examples/default/README.md | 2 +- .../examples/default/test/goss-metrics.yaml | 5 +- metricbeat/examples/default/test/goss.yaml | 5 +- metricbeat/examples/oss/README.md | 2 +- .../examples/oss/test/goss-metrics.yaml | 5 +- metricbeat/examples/oss/test/goss.yaml | 5 +- metricbeat/examples/security/README.md | 2 +- .../examples/security/test/goss-metrics.yaml | 5 +- metricbeat/examples/security/test/goss.yaml | 5 +- metricbeat/values.yaml | 2 +- 102 files changed, 141 insertions(+), 931 deletions(-) delete mode 100644 apm-server/examples/6.x/Makefile delete mode 100644 apm-server/examples/6.x/README.md delete mode 100644 apm-server/examples/6.x/test/goss.yaml delete mode 100644 apm-server/examples/6.x/values.yaml delete mode 100644 elasticsearch/examples/6.x/Makefile delete mode 100644 elasticsearch/examples/6.x/README.md delete mode 100644 elasticsearch/examples/6.x/test/goss.yaml delete mode 100644 elasticsearch/examples/6.x/values.yaml delete mode 100644 elasticsearch/examples/upgrade/Makefile delete mode 100644 elasticsearch/examples/upgrade/README.md delete mode 100755 elasticsearch/examples/upgrade/scripts/upgrade.sh delete mode 100644 elasticsearch/examples/upgrade/test/goss.yaml delete mode 100644 filebeat/examples/6.x/Makefile delete mode 100644 filebeat/examples/6.x/README.md delete mode 100644 filebeat/examples/6.x/test/goss.yaml delete mode 100644 filebeat/examples/6.x/values.yaml delete mode 100644 kibana/examples/6.x/Makefile delete mode 100644 kibana/examples/6.x/README.md delete mode 100644 kibana/examples/6.x/test/goss.yaml delete mode 100644 kibana/examples/6.x/values.yml delete mode 100644 logstash/examples/6.x/Makefile delete mode 100644 logstash/examples/6.x/README.md delete mode 100644 logstash/examples/6.x/test/goss.yaml delete mode 100644 logstash/examples/6.x/values.yaml delete mode 100644 metricbeat/examples/6.x/Makefile delete mode 100644 metricbeat/examples/6.x/README.md delete mode 100644 metricbeat/examples/6.x/test/goss-metrics.yaml delete mode 100644 metricbeat/examples/6.x/test/goss.yaml delete mode 100644 metricbeat/examples/6.x/values.yaml diff --git a/README.md b/README.md index 26a95c45a..5c9c0012a 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ Note that only the released charts coming from [Elastic Helm repo][] or | 7.5 | Beta | Beta | Beta | Beta | Beta | Alpha | | 7.6 | Beta | Beta | Beta | Beta | Beta | Alpha | | 7.7 | GA | GA | Beta | GA | GA | Beta | +| 7.8 | GA | GA | Beta | GA | GA | Beta | ### Kubernetes Versions diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index 8304bd9c6..ddffae12e 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.7.1 -appVersion: 7.7.1 +version: 8.0.0-SNAPSHOT +appVersion: 8.0.0-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 883f16d75..1a4e0b834 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -8,7 +8,7 @@ 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 +**Warning**: This branch is used for development, please use [7.8.0][] release for released version. @@ -20,7 +20,6 @@ for released version. - [Install released version using Helm repository](#install-released-version-using-helm-repository) - [Install development version using master branch](#install-development-version-using-master-branch) - [Upgrading](#upgrading) -- [Compatibility](#compatibility) - [Usage notes](#usage-notes) - [Configuration](#configuration) - [FAQ](#faq) @@ -54,7 +53,7 @@ See [supported configurations][] for more details. * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` -* Install it: `helm install --name apm-server ./helm-charts/apm-server --set imageTag=7.7.1` +* Install it: `helm install --name apm-server ./helm-charts/apm-server --set imageTag=8.0.0-SNAPSHOT` ## Upgrading @@ -63,27 +62,6 @@ Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before upgrading to a new chart version. -## Compatibility - -This chart is tested with the latest supported versions. The currently tested -versions are: - -| 6.x | 7.x | -|-------|-------| -| 6.8.10 | 7.7.1 | - -Examples of installing older major versions can be found in the [examples][] -directory. - -While only the latest releases are tested, it is possible to easily install old -or new releases by overriding the `imageTag`. To install version `7.7.1` of APM -Server it would look like this: - -``` -helm install --name apm-server elastic/apm-server --set imageTag=7.7.1 -``` - - ## Usage notes * The default APM Server configuration file for this chart is configured to use @@ -113,7 +91,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.7.1` | +| `imageTag` | The APM Server Docker image tag | `8.0.0-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 | `{}` | @@ -162,7 +140,7 @@ 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 +[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/6.x/Makefile b/apm-server/examples/6.x/Makefile deleted file mode 100644 index 539cc2548..000000000 --- a/apm-server/examples/6.x/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -default: test -include ../../../helpers/examples.mk - -RELEASE := helm-es-apm-six - -install: - helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../ - -restart: - helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../ - -test: install goss - -purge: - helm del --purge $(RELEASE) diff --git a/apm-server/examples/6.x/README.md b/apm-server/examples/6.x/README.md deleted file mode 100644 index 9433e0e13..000000000 --- a/apm-server/examples/6.x/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# 6.x - -This example deploy APM Server 6.8.10. - - -## Usage - -* Deploy [Elasticsearch Helm chart][]. - -* Deploy APM Server chart with the default values: `make install` - -* You can now setup a port forward to query APM indices: - - ``` - kubectl port-forward svc/six-master 9200 - curl localhost:9200/_cat/indices - ``` - - -## Testing - -You can also run [goss integration tests][] using `make test` - - -[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/master/elasticsearch/examples/6.x/ -[goss integration tests]: https://github.com/elastic/helm-charts/tree/master/apm-server/examples/6.x/test/goss.yaml diff --git a/apm-server/examples/6.x/test/goss.yaml b/apm-server/examples/6.x/test/goss.yaml deleted file mode 100644 index 69d1a8163..000000000 --- a/apm-server/examples/6.x/test/goss.yaml +++ /dev/null @@ -1,6 +0,0 @@ -http: - http://localhost:8200?pretty: - status: 200 - timeout: 2000 - body: - - '6.8.10' diff --git a/apm-server/examples/6.x/values.yaml b/apm-server/examples/6.x/values.yaml deleted file mode 100644 index 3ed62a82c..000000000 --- a/apm-server/examples/6.x/values.yaml +++ /dev/null @@ -1 +0,0 @@ -imageTag: "6.8.10" diff --git a/apm-server/examples/default/README.md b/apm-server/examples/default/README.md index a480b7e68..15644e4b1 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.7.1 using [default values][]. +This example deploy APM Server 8.0.0-SNAPSHOT using [default values][]. ## Usage diff --git a/apm-server/examples/default/test/goss.yaml b/apm-server/examples/default/test/goss.yaml index fe74521cd..35a521382 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.7.1' + - '8.0.0' diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index 05150f29d..2e198cbba 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.7.1 using [APM Server OSS][] version. +This example deploy APM Server 8.0.0-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 fe74521cd..35a521382 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.7.1' + - '8.0.0' diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md index f2b8f5a84..d1e08d55d 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.7.1 using authentication and TLS to connect to +This example deploy APM Server 8.0.0-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 fe74521cd..35a521382 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.7.1' + - '8.0.0' diff --git a/apm-server/values.yaml b/apm-server/values.yaml index 23dce1341..55b3d06a5 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.7.1" +imageTag: "8.0.0-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index ecc6a25d8..e843fba58 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.7.1 -appVersion: 7.7.1 +version: 8.0.0-SNAPSHOT +appVersion: 8.0.0-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 c234def4b..2917dd277 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -3,7 +3,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 [7.7.1][] release +**Warning**: This branch is used for development, please use [7.8.0][] release for supported version. @@ -15,7 +15,6 @@ for supported version. - [Install released version using Helm repository](#install-released-version-using-helm-repository) - [Install development version using master branch](#install-development-version-using-master-branch) - [Upgrading](#upgrading) -- [Compatibility](#compatibility) - [Usage notes](#usage-notes) - [Configuration](#configuration) - [Deprecated](#deprecated) @@ -65,7 +64,7 @@ See [supported configurations][] for more details. * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` -* Install it: `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=7.7.1` +* Install it: `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=8.0.0-SNAPSHOT` ## Upgrading @@ -74,27 +73,6 @@ Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before upgrading to a new chart version. -## Compatibility - -This chart is tested with the latest supported versions. The currently tested -versions are: - -| 6.x | 7.x | -|-------|-------| -| 6.8.10 | 7.7.1 | - -Examples of installing older major versions can be found in the [examples][] -directory. - -While only the latest releases are tested, it is possible to easily install old -or new releases by overriding the `imageTag`. To install version `7.7.1` of -Elasticsearch it would look like this: - -``` -helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.7.1 -``` - - ## Usage notes * This repo includes a number of [examples][] configurations which can be used @@ -142,7 +120,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.7.1` | +| `imageTag` | The Elasticsearch Docker image tag | `8.0.0-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 | `{}` | @@ -404,7 +382,7 @@ 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 +[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/6.x/Makefile b/elasticsearch/examples/6.x/Makefile deleted file mode 100644 index 2020d4a04..000000000 --- a/elasticsearch/examples/6.x/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -default: test -include ../../../helpers/examples.mk - -RELEASE := helm-es-six - -install: - helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../ - -restart: - helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../ - -test: install goss - -purge: - helm del --purge $(RELEASE) diff --git a/elasticsearch/examples/6.x/README.md b/elasticsearch/examples/6.x/README.md deleted file mode 100644 index be536f580..000000000 --- a/elasticsearch/examples/6.x/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# 6.x - -This example deploy a 3 nodes Elasticsearch 6.8.10 cluster. - - -## Usage - -* Deploy Elasticsearch chart with the default values: `make install` - -* You can now setup a port forward to query Elasticsearch API: - - ``` - kubectl port-forward svc/six-master 9200 - curl localhost:9200/_cat/indices - ``` - - -## Testing - -You can also run [goss integration tests][] using `make test` - - -[goss integration tests]: https://github.com/elastic/helm-charts/tree/master/elasticsearch/examples/6.x/test/goss.yaml diff --git a/elasticsearch/examples/6.x/test/goss.yaml b/elasticsearch/examples/6.x/test/goss.yaml deleted file mode 100644 index 1ce978d8f..000000000 --- a/elasticsearch/examples/6.x/test/goss.yaml +++ /dev/null @@ -1,17 +0,0 @@ -http: - http://localhost:9200/_cluster/health: - status: 200 - timeout: 2000 - body: - - 'green' - - '"number_of_nodes":3' - - '"number_of_data_nodes":3' - - http://localhost:9200: - status: 200 - timeout: 2000 - body: - - '"number" : "6.8.10"' - - '"cluster_name" : "six"' - - '"name" : "six-master-0"' - - 'You Know, for Search' diff --git a/elasticsearch/examples/6.x/values.yaml b/elasticsearch/examples/6.x/values.yaml deleted file mode 100644 index 203bebd32..000000000 --- a/elasticsearch/examples/6.x/values.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -clusterName: "six" -imageTag: "6.8.10" diff --git a/elasticsearch/examples/config/README.md b/elasticsearch/examples/config/README.md index d0773ed6f..433b3d247 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.7.1 with authentication and +This example deploy a single node Elasticsearch 8.0.0-SNAPSHOT with authentication and custom [values][]. diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md index daaae4f10..2f997acda 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.7.1 cluster using +This example deploy a 3 nodes Elasticsearch 8.0.0-SNAPSHOT cluster using [default values][]. diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml index 7db2ca9c6..eacfc0d5e 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.7.1"' + - '"number" : "8.0.0-SNAPSHOT"' - '"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 a6ce4b3d0..488e0619d 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.7.1 cluster on [Docker for Mac][] +This example deploy a 3 nodes Elasticsearch 8.0.0-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 76d675784..79068996d 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.7.1 cluster on [Kind][] +This example deploy a 3 nodes Elasticsearch 8.0.0-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 f8adb2534..3cd98da14 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.7.1 cluster on [MicroK8S][] +This example deploy a 3 nodes Elasticsearch 8.0.0-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 1deb531a1..86f818757 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.7.1 cluster on [Minikube][] +This example deploy a 3 nodes Elasticsearch 8.0.0-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 56d72c8a5..a3faf140f 100644 --- a/elasticsearch/examples/multi/README.md +++ b/elasticsearch/examples/multi/README.md @@ -1,6 +1,6 @@ # Multi -This example deploy an Elasticsearch 7.7.1 cluster composed of 2 different Helm +This example deploy an Elasticsearch 8.0.0-SNAPSHOT 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 118f8481e..fbfdb00ce 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.7.1 cluster on [OpenShift][] +This example deploy a 3 nodes Elasticsearch 8.0.0-SNAPSHOT cluster on [OpenShift][] using [custom values][]. ## Usage diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml index 2bf9beb6c..88b4bd83a 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.7.1"' + - '"number" : "8.0.0-SNAPSHOT"' - '"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 64174d1b3..50c2c9a32 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.7.1 cluster using +This example deploy a 3 nodes Elasticsearch 8.0.0-SNAPSHOT cluster using [Elasticsearch OSS][] version. ## Usage diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml index 398fa3a61..b50702357 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.7.1"' + - '"number" : "8.0.0-SNAPSHOT"' - '"cluster_name" : "oss"' - '"name" : "oss-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/security/Makefile b/elasticsearch/examples/security/Makefile index 46f0ee783..6b097c6eb 100644 --- a/elasticsearch/examples/security/Makefile +++ b/elasticsearch/examples/security/Makefile @@ -21,12 +21,12 @@ secrets: docker rm -f elastic-helm-charts-certs || true rm -f elastic-certificates.p12 elastic-certificate.pem elastic-certificate.crt elastic-stack-ca.p12 || true password=$$([ ! -z "$$ELASTIC_PASSWORD" ] && echo $$ELASTIC_PASSWORD || echo $$(docker run --rm busybox:1.31.1 /bin/sh -c "< /dev/urandom tr -cd '[:alnum:]' | head -c20")) && \ - docker run --name elastic-helm-charts-certs -i -w /app \ + docker run --name elastic-helm-charts-certs -i -w /tmp \ $(ELASTICSEARCH_IMAGE) \ /bin/sh -c " \ - elasticsearch-certutil ca --out /app/elastic-stack-ca.p12 --pass '' && \ - elasticsearch-certutil cert --name security-master --dns security-master --ca /app/elastic-stack-ca.p12 --pass '' --ca-pass '' --out /app/elastic-certificates.p12" && \ - docker cp elastic-helm-charts-certs:/app/elastic-certificates.p12 ./ && \ + elasticsearch-certutil ca --out /tmp/elastic-stack-ca.p12 --pass '' && \ + elasticsearch-certutil cert --name security-master --dns security-master --ca /tmp/elastic-stack-ca.p12 --pass '' --ca-pass '' --out /tmp/elastic-certificates.p12" && \ + docker cp elastic-helm-charts-certs:/tmp/elastic-certificates.p12 ./ && \ docker rm -f elastic-helm-charts-certs && \ openssl pkcs12 -nodes -passin pass:'' -in elastic-certificates.p12 -out elastic-certificate.pem && \ openssl x509 -outform der -in elastic-certificate.pem -out elastic-certificate.crt && \ diff --git a/elasticsearch/examples/security/README.md b/elasticsearch/examples/security/README.md index 306b6063c..019a17a20 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.7.1 with authentication and +This example deploy a 3 nodes Elasticsearch 8.0.0-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/security/test/goss.yaml b/elasticsearch/examples/security/test/goss.yaml index c6d4b987b..00be5fbb4 100644 --- a/elasticsearch/examples/security/test/goss.yaml +++ b/elasticsearch/examples/security/test/goss.yaml @@ -21,7 +21,7 @@ http: - '"name" : "security-master-0"' - 'You Know, for Search' - https://localhost:9200/_xpack/license: + https://localhost:9200/_license: status: 200 timeout: 2000 allow-insecure: true diff --git a/elasticsearch/examples/upgrade/Makefile b/elasticsearch/examples/upgrade/Makefile deleted file mode 100644 index f890d502c..000000000 --- a/elasticsearch/examples/upgrade/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -default: test - -include ../../../helpers/examples.mk - -RELEASE := helm-es-upgrade - -install: - ./scripts/upgrade.sh --release $(RELEASE) - -init: - helm init --client-only - -test: init install goss - -purge: - helm del --purge $(RELEASE) diff --git a/elasticsearch/examples/upgrade/README.md b/elasticsearch/examples/upgrade/README.md deleted file mode 100644 index 8b26d7636..000000000 --- a/elasticsearch/examples/upgrade/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# Upgrade - -This example will deploy a 3 node Elasticsearch cluster using an old chart version, -then upgrade it to version 7.7.1. - -The following upgrades are tested: -- Upgrade from [7.0.0-alpha1][] version on K8S <1.16 -- Upgrade from [7.4.0][] version on K8S >=1.16 (Elasticsearch chart < 7.4.0 are -not compatible with K8S >= 1.16) - - -## Usage - -Running `make install` command will do first install and 7.7.1 upgrade. - -Note: [jq][] is a requirement for this make target. - - -## Testing - -You can also run [goss integration tests][] using `make test`. - - -[7.0.0-alpha1]: https://github.com/elastic/helm-charts/releases/tag/7.0.0-alpha1 -[7.4.0]: https://github.com/elastic/helm-charts/releases/tag/7.4.0 -[goss integration tests]: https://github.com/elastic/helm-charts/tree/master/elasticsearch/examples/upgrade/test/goss.yaml -[jq]: https://stedolan.github.io/jq/ diff --git a/elasticsearch/examples/upgrade/scripts/upgrade.sh b/elasticsearch/examples/upgrade/scripts/upgrade.sh deleted file mode 100755 index 6d0aa9ffc..000000000 --- a/elasticsearch/examples/upgrade/scripts/upgrade.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -usage() { - cat <<-EOF - USAGE: - $0 [--release ] [--from ] - $0 --help - - OPTIONS: - --release - Name of the Helm release to install - --from - Elasticsearch version to use for first install - EOF - exit 1 -} - -RELEASE="helm-es-upgrade" -FROM="" - -while [[ $# -gt 0 ]] -do - key="$1" - - case $key in - --help) - usage - ;; - --release) - RELEASE="$2" - shift 2 - ;; - --from) - FROM="$2" - shift 2 - ;; - *) - log "Unrecognized argument: '$key'" - usage - ;; - esac -done - -if ! command -v jq > /dev/null -then - echo 'jq is required to use this script' - echo 'please check https://stedolan.github.io/jq/download/ to install it' - exit 1 -fi - -# Elasticsearch chart < 7.4.0 are not compatible with K8S >= 1.16) -if [[ -z $FROM ]] -then - KUBE_MINOR_VERSION=$(kubectl version -o json | jq --raw-output --exit-status '.serverVersion.minor' | sed 's/[^0-9]*//g') - - if [ "$KUBE_MINOR_VERSION" -lt 16 ] - then - FROM="7.0.0-alpha1" - else - FROM="7.4.0" - fi -fi - -helm repo add elastic https://helm.elastic.co - -# Initial install -printf "Installing Elasticsearch chart %s\n" "$FROM" -helm upgrade --wait --timeout=600 --install "$RELEASE" elastic/elasticsearch --version "$FROM" --set clusterName=upgrade -kubectl rollout status sts/upgrade-master --timeout=600s - -# Upgrade -printf "Upgrading Elasticsearch chart\n" -helm upgrade --wait --timeout=600 --set terminationGracePeriod=121 --install "$RELEASE" ../../ --set clusterName=upgrade -kubectl rollout status sts/upgrade-master --timeout=600s diff --git a/elasticsearch/examples/upgrade/test/goss.yaml b/elasticsearch/examples/upgrade/test/goss.yaml deleted file mode 100644 index bc6d8959e..000000000 --- a/elasticsearch/examples/upgrade/test/goss.yaml +++ /dev/null @@ -1,17 +0,0 @@ -http: - http://localhost:9200/_cluster/health: - status: 200 - timeout: 2000 - body: - - 'green' - - '"number_of_nodes":3' - - '"number_of_data_nodes":3' - - http://localhost:9200: - status: 200 - timeout: 2000 - body: - - '"number" : "7.7.1"' - - '"cluster_name" : "upgrade"' - - '"name" : "upgrade-master-0"' - - 'You Know, for Search' diff --git a/elasticsearch/templates/_helpers.tpl b/elasticsearch/templates/_helpers.tpl index f7f212893..251d16b43 100755 --- a/elasticsearch/templates/_helpers.tpl +++ b/elasticsearch/templates/_helpers.tpl @@ -59,7 +59,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- if and (contains "docker.elastic.co/elasticsearch/elasticsearch" .Values.image) (not (eq $version 0)) -}} {{ $version }} {{- else -}} -7 +8 {{- end -}} {{- end -}} {{- end -}} diff --git a/elasticsearch/tests/elasticsearch_test.py b/elasticsearch/tests/elasticsearch_test.py index dfbff9033..3162d2d6f 100755 --- a/elasticsearch/tests/elasticsearch_test.py +++ b/elasticsearch/tests/elasticsearch_test.py @@ -171,53 +171,8 @@ def test_overriding_the_image_and_tag(): ) -def test_set_discovery_hosts_to_custom_master_service(): +def test_set_initial_master_nodes(): config = """ -esMajorVersion: 6 -masterService: "elasticsearch-custommaster" -""" - r = helm_template(config) - env = r["statefulset"][uname]["spec"]["template"]["spec"]["containers"][0]["env"] - assert { - "name": "discovery.zen.ping.unicast.hosts", - "value": "elasticsearch-custommaster-headless", - } in env - - -def test_set_master_service_to_default_nodegroup_name_if_not_set(): - config = """ -esMajorVersion: 6 -nodeGroup: "data" -""" - r = helm_template(config) - env = r["statefulset"]["elasticsearch-data"]["spec"]["template"]["spec"][ - "containers" - ][0]["env"] - assert { - "name": "discovery.zen.ping.unicast.hosts", - "value": "elasticsearch-master-headless", - } in env - - -def test_set_master_service_to_default_nodegroup_name_with_custom_cluster_name(): - config = """ -esMajorVersion: 6 -clusterName: "custom" -nodeGroup: "data" -""" - r = helm_template(config) - env = r["statefulset"]["custom-data"]["spec"]["template"]["spec"]["containers"][0][ - "env" - ] - assert { - "name": "discovery.zen.ping.unicast.hosts", - "value": "custom-master-headless", - } in env - - -def test_set_initial_master_nodes_when_using_v_7(): - config = """ -esMajorVersion: 7 roles: master: "true" """ @@ -234,9 +189,8 @@ def test_set_initial_master_nodes_when_using_v_7(): assert e["name"] != "discovery.zen.minimum_master_nodes" -def test_dont_set_initial_master_nodes_if_not_master_when_using_es_version_7(): +def test_dont_set_initial_master_nodes_if_not_master(): config = """ -esMajorVersion: 7 roles: master: "false" """ @@ -246,9 +200,8 @@ def test_dont_set_initial_master_nodes_if_not_master_when_using_es_version_7(): assert e["name"] != "cluster.initial_master_nodes" -def test_set_discovery_seed_host_when_using_v_7(): +def test_set_discovery_seed_host(): config = """ -esMajorVersion: 7 roles: master: "true" """ @@ -958,41 +911,32 @@ def test_esMajorVersion_detect_default_version(): config = "" r = helm_template(config) - assert r["statefulset"][uname]["metadata"]["annotations"]["esMajorVersion"] == "7" + assert r["statefulset"][uname]["metadata"]["annotations"]["esMajorVersion"] == "8" -def test_esMajorVersion_default_to_7_if_not_elastic_image(): +def test_esMajorVersion_default_to_8_if_not_elastic_image(): config = """ image: notElastic imageTag: 1.0.0 """ r = helm_template(config) - assert r["statefulset"][uname]["metadata"]["annotations"]["esMajorVersion"] == "7" + assert r["statefulset"][uname]["metadata"]["annotations"]["esMajorVersion"] == "8" -def test_esMajorVersion_default_to_7_if_no_version_is_found(): +def test_esMajorVersion_default_to_8_if_no_version_is_found(): config = """ imageTag: not_a_number """ r = helm_template(config) - assert r["statefulset"][uname]["metadata"]["annotations"]["esMajorVersion"] == "7" - - -def test_esMajorVersion_set_to_6_based_on_image_tag(): - config = """ - imageTag: 6.8.1 - """ - - r = helm_template(config) - assert r["statefulset"][uname]["metadata"]["annotations"]["esMajorVersion"] == "6" + assert r["statefulset"][uname]["metadata"]["annotations"]["esMajorVersion"] == "8" def test_esMajorVersion_always_wins(): config = """ esMajorVersion: 7 - imageTag: 6.0.0 + imageTag: 8.0.0 """ r = helm_template(config) @@ -1002,11 +946,11 @@ def test_esMajorVersion_always_wins(): def test_esMajorVersion_parse_image_tag_for_oss_image(): config = """ image: docker.elastic.co/elasticsearch/elasticsearch-oss - imageTag: 6.3.2 + imageTag: 8.0.0 """ r = helm_template(config) - assert r["statefulset"][uname]["metadata"]["annotations"]["esMajorVersion"] == "6" + assert r["statefulset"][uname]["metadata"]["annotations"]["esMajorVersion"] == "8" def test_set_pod_security_context(): diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 65f560e61..42cefab14 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -51,7 +51,7 @@ secretMounts: [] # defaultMode: 0755 image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "7.7.1" +imageTag: "8.0.0-SNAPSHOT" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index 327ce4907..2fa86a2f7 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.7.1 -appVersion: 7.7.1 +version: 8.0.0-SNAPSHOT +appVersion: 8.0.0-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 2e7063293..42dae533b 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -3,7 +3,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 [7.7.1][] release +**Warning**: This branch is used for development, please use [7.8.0][] release for supported version. @@ -15,7 +15,6 @@ for supported version. - [Install released version using Helm repository](#install-released-version-using-helm-repository) - [Install development version using master branch](#install-development-version-using-master-branch) - [Upgrading](#upgrading) -- [Compatibility](#compatibility) - [Usage notes](#usage-notes) - [Configuration](#configuration) - [FAQ](#faq) @@ -50,7 +49,7 @@ See [supported configurations][] for more details. * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` -* Install it: `helm install --name filebeat ./helm-charts/filebeat --set imageTag=7.7.1` +* Install it: `helm install --name filebeat ./helm-charts/filebeat --set imageTag=8.0.0-SNAPSHOT` ## Upgrading @@ -59,27 +58,6 @@ Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before upgrading to a new chart version. -## Compatibility - -This chart is tested with the latest supported versions. The currently tested -versions are: - -| 6.x | 7.x | -|-------|-------| -| 6.8.10 | 7.7.1 | - -Examples of installing older major versions can be found in the [examples][] -directory. - -While only the latest releases are tested, it is possible to easily install old -or new releases by overriding the `imageTag`. To install version `7.7.1` of -Filebeat it would look like this: - -``` -helm install --name filebeat elastic/filebeat --set imageTag=7.7.1 -``` - - ## Usage notes * The default Filebeat configuration file for this chart is configured to use an @@ -119,7 +97,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.7.1` | +| `imageTag` | The Filebeat Docker image tag | `8.0.0-SNAPSHOT` | | `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][] | @@ -177,7 +155,7 @@ 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 +[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/6.x/Makefile b/filebeat/examples/6.x/Makefile deleted file mode 100644 index 34bc979b4..000000000 --- a/filebeat/examples/6.x/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -default: test - -include ../../../helpers/examples.mk - -RELEASE := helm-filebeat-six - -install: - helm upgrade --wait --timeout=600 --install $(RELEASE) --values values.yaml ../../ - -test: install goss - -purge: - helm del --purge $(RELEASE) diff --git a/filebeat/examples/6.x/README.md b/filebeat/examples/6.x/README.md deleted file mode 100644 index 47099a8a6..000000000 --- a/filebeat/examples/6.x/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# 6.x - -This example deploy Filebeat 6.8.10. - - -## Usage - -* Deploy [Elasticsearch Helm chart][]. - -* Deploy Filebeat chart with the default values: `make install` - -* You can now setup a port forward to query Filebeat indices: - - ``` - kubectl port-forward svc/six-master 9200 - curl localhost:9200/_cat/indices - ``` - - -## Testing - -You can also run [goss integration tests][] using `make test` - - -[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/master/elasticsearch/examples/6.x/ -[goss integration tests]: https://github.com/elastic/helm-charts/tree/master/filebeat/examples/6.x/test/goss.yaml diff --git a/filebeat/examples/6.x/test/goss.yaml b/filebeat/examples/6.x/test/goss.yaml deleted file mode 100644 index 99e1c18cf..000000000 --- a/filebeat/examples/6.x/test/goss.yaml +++ /dev/null @@ -1,21 +0,0 @@ -port: - tcp:5066: - listening: true - ip: - - '127.0.0.1' - -mount: - /usr/share/filebeat/data: - exists: true -user: - filebeat: - exists: true - uid: 1000 - gid: 1000 - -http: - http://six-master:9200/_cat/indices: - status: 200 - timeout: 2000 - body: - - 'filebeat-6.8.10' diff --git a/filebeat/examples/6.x/values.yaml b/filebeat/examples/6.x/values.yaml deleted file mode 100644 index 036acf085..000000000 --- a/filebeat/examples/6.x/values.yaml +++ /dev/null @@ -1,18 +0,0 @@ -imageTag: 6.8.10 - -extraEnvs: - - name: ELASTICSEARCH_HOSTS - value: six-master:9200 - -filebeatConfig: - filebeat.yml: | - filebeat.inputs: - - type: docker - containers.ids: - - '*' - processors: - - add_kubernetes_metadata: - in_cluster: true - output.elasticsearch: - host: '${NODE_NAME}' - hosts: '${ELASTICSEARCH_HOSTS:elasticsearch-master:9200}' diff --git a/filebeat/examples/default/README.md b/filebeat/examples/default/README.md index 0f906e6f1..83b99eb6e 100644 --- a/filebeat/examples/default/README.md +++ b/filebeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 7.7.1 using [default values][]. +This example deploy Filebeat 8.0.0-SNAPSHOT using [default values][]. ## Usage diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml index 6d7e22365..43d93354d 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.7.1' + - 'filebeat-8.0.0' file: /usr/share/filebeat/filebeat.yml: @@ -44,4 +44,3 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.7.1' diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index e781cdc4c..30b43f929 100644 --- a/filebeat/examples/oss/README.md +++ b/filebeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Filebeat 7.7.1 using [Filebeat OSS][] version. +This example deploy Filebeat 8.0.0-SNAPSHOT using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml index 35a7d242e..4518d5125 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.7.1' + - 'filebeat-8.0.0' diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index b4b39030d..48886211e 100644 --- a/filebeat/examples/security/README.md +++ b/filebeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Filebeat 7.7.1 using authentication and TLS to connect to +This example deploy Filebeat 8.0.0-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 869fa39d9..98e4eda16 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.7.1' + - 'filebeat-8.0.0' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' diff --git a/filebeat/values.yaml b/filebeat/values.yaml index c2b812f1e..e8c4ce22d 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.7.1" +imageTag: "8.0.0-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/bumper.py b/helpers/bumper.py index 8a3391e12..8635190a5 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -5,8 +5,6 @@ # ./bumper.py # # Configurable environment variables: -# - BUMPER_VERSION_6 overrides the 6.x.x version. -# - BUMPER_VERSION_7 overrides the 7.x.x version. # - BUMPER_USE_STAGING_IMAGES set to "true" causes the # docker.elastic.co/staging/ docker registry namespace to be used. # @@ -19,12 +17,10 @@ os.chdir(os.path.join(os.path.dirname(__file__), "..")) -versions = { - 6: os.environ.get("BUMPER_VERSION_6", "6.8.10"), - 7: os.environ.get("BUMPER_VERSION_7", "7.7.1"), -} +version = "8.0.0-SNAPSHOT" +major = "8" -chart_version = versions[7] +chart_version = version file_patterns = [ "*/examples/*/*.y*ml", @@ -44,33 +40,32 @@ # shouldn't be bumped blacklist = re.compile(r".*127.0.0.1.*|.*7.0.0-alpha1.*|.*7.4.0.*") -print("Updating versions...") +print("Updating version...") -for major, version in versions.iteritems(): - r = re.compile(r"{0}\.[0-9]*\.[0-9]*-?[0-9]?".format(major)) - for pattern in file_patterns: - for f in glob.glob(pattern): - print(f) - for line in fileinput.input([f], inplace=True): - if re.match(blacklist, line): - print(line.rstrip()) - else: - if f.endswith("Chart.yaml") and line.startswith("version:"): - print(r.sub(chart_version, line.rstrip())) - else: - print(r.sub(version, line.rstrip())) - for pattern in goss_files: - for f in glob.glob(pattern): - print(f) - for line in fileinput.input([f], inplace=True): - # If we have a version with a build id, like 7.7.0-abcdabcd, - # strip off the latter part and only use the 7.7.0 in the goss - # tests - version_without_build_id = re.sub(r"-.*", "", version) - if re.match(blacklist, line): - print(line.rstrip()) +r = re.compile(r"{0}\.[0-9]*\.[0-9]*-?[0-9]?".format(major)) +for pattern in file_patterns: + for f in glob.glob(pattern): + print(f) + for line in fileinput.input([f], inplace=True): + if re.match(blacklist, line): + print(line.rstrip()) + else: + if f.endswith("Chart.yaml") and line.startswith("version:"): + print(r.sub(chart_version, line.rstrip())) else: - print(r.sub(version_without_build_id, line.rstrip())) + print(r.sub(version, line.rstrip())) +for pattern in goss_files: + for f in glob.glob(pattern): + print(f) + for line in fileinput.input([f], inplace=True): + # If we have a version with a build id, like 7.7.0-abcdabcd, + # strip off the latter part and only use the 7.7.0 in the goss + # tests + version_without_build_id = re.sub(r"-.*", "", version) + if re.match(blacklist, line): + print(line.rstrip()) + else: + print(r.sub(version_without_build_id, line.rstrip())) if os.environ.get("BUMPER_USE_STAGING_IMAGES") == "true": diff --git a/helpers/examples.mk b/helpers/examples.mk index 3a88e3213..66c9f2ae1 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.7.1 +STACK_VERSION := 8.0.0-SNAPSHOT .PHONY: help help: ## Display this help @@ -13,4 +13,3 @@ goss: ## Run goss tests echo Testing with pod: $$GOSS_CONTAINER && \ kubectl cp test/$(GOSS_FILE) $$GOSS_CONTAINER:/tmp/$(GOSS_FILE) && \ kubectl exec $$GOSS_CONTAINER -- sh -c "cd /tmp/ && curl -s -L https://github.com/aelsabbahy/goss/releases/download/$(GOSS_VERSION)/goss-linux-amd64 -o goss && chmod +rx ./goss && ./goss --gossfile $(GOSS_FILE) validate --retry-timeout 300s --sleep 5s --color --format documentation" - diff --git a/helpers/matrix.yml b/helpers/matrix.yml index 3ebffaec6..b1f9c1c3f 100644 --- a/helpers/matrix.yml +++ b/helpers/matrix.yml @@ -10,34 +10,27 @@ ES_SUITE: - multi - oss - security - - upgrade - - 6.x KIBANA_SUITE: - default - oss - security - - 6.x FILEBEAT_SUITE: - default - oss - security - - 6.x METRICBEAT_SUITE: - default - oss - security - - 6.x LOGSTASH_SUITE: - default - oss - elasticsearch - security - - 6.x APM_SERVER_SUITE: - default - oss - security - - 6.x KUBERNETES_VERSION: - '1.14' - '1.15' diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index 7d3c13b48..94b9a6ce8 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.7.1 -appVersion: 7.7.1 +version: 8.0.0-SNAPSHOT +appVersion: 8.0.0-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 ac9884a64..810e83dc0 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -3,7 +3,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 [7.7.1][] release +**Warning**: This branch is used for development, please use [7.8.0][] release for supported version. @@ -15,7 +15,6 @@ for supported version. - [Install released version using Helm repository](#install-released-version-using-helm-repository) - [Install development version using master branch](#install-development-version-using-master-branch) - [Upgrading](#upgrading) -- [Compatibility](#compatibility) - [Usage notes](#usage-notes) - [Configuration](#configuration) - [Deprecated](#deprecated) @@ -53,7 +52,7 @@ See [supported configurations][] for more details. * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` -* Install it: `helm install --name kibana ./helm-charts/kibana --set imageTag=7.7.1` +* Install it: `helm install --name kibana ./helm-charts/kibana --set imageTag=8.0.0-SNAPSHOT` ## Upgrading @@ -62,27 +61,6 @@ Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before upgrading to a new chart version. -## Compatibility - -This chart is tested with the latest supported versions. The currently tested -versions are: - -| 6.x | 7.x | -|-------|-------| -| 6.8.10 | 7.7.1 | - -Examples of installing older major versions can be found in the [examples][] -directory. - -While only the latest releases are tested, it is possible to easily install old -or new releases by overriding the `imageTag`. To install version `7.7.1` of -Kibana it would look like this: - -``` -helm install --name kibana elastic/kibana --set imageTag=7.7.1 -``` - - ## Usage notes * Automated testing of this chart is currently only run against GKE (Google @@ -107,7 +85,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.7.1` | +| `imageTag` | The Kibana Docker image tag | `8.0.0-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 | `{}` | @@ -219,7 +197,7 @@ 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 +[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/6.x/Makefile b/kibana/examples/6.x/Makefile deleted file mode 100644 index 468e2b84a..000000000 --- a/kibana/examples/6.x/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -default: test -include ../../../helpers/examples.mk - -RELEASE := helm-kibana-six - -install: - helm upgrade --wait --timeout=600 --install --values ./values.yml $(RELEASE) ../../ - -purge: - helm del --purge $(RELEASE) - -test: install goss diff --git a/kibana/examples/6.x/README.md b/kibana/examples/6.x/README.md deleted file mode 100644 index 8a0f89f4d..000000000 --- a/kibana/examples/6.x/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# 6.x - -This example deploy Kibana 6.8.10. - - -## Usage - -* Deploy [Elasticsearch Helm chart][]. - -* Deploy Kibana chart with the default values: `make install` - -* You can now setup a port forward to query Kibana indices: - - ``` - kubectl port-forward svc/six-master 9200 - curl localhost:9200/_cat/indices - ``` - - -## Testing - -You can also run [goss integration tests][] using `make test` - - -[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/master/elasticsearch/examples/6.x/ -[goss integration tests]: https://github.com/elastic/helm-charts/tree/master/kibana/examples/6.x/test/goss.yaml diff --git a/kibana/examples/6.x/test/goss.yaml b/kibana/examples/6.x/test/goss.yaml deleted file mode 100644 index e5bbce4ca..000000000 --- a/kibana/examples/6.x/test/goss.yaml +++ /dev/null @@ -1,10 +0,0 @@ -http: - http://localhost:5601/api/status: - status: 200 - timeout: 2000 - body: - - '"number":"6.8.10"' - - http://localhost:5601/app/kibana: - status: 200 - timeout: 2000 diff --git a/kibana/examples/6.x/values.yml b/kibana/examples/6.x/values.yml deleted file mode 100644 index c9c744dd8..000000000 --- a/kibana/examples/6.x/values.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -imageTag: 6.8.10 -elasticsearchHosts: "http://six-master:9200" diff --git a/kibana/examples/default/README.md b/kibana/examples/default/README.md index d4dfbb14d..e5a4a2a6c 100644 --- a/kibana/examples/default/README.md +++ b/kibana/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Kibana 7.7.1 using [default values][]. +This example deploy Kibana 8.0.0-SNAPSHOT using [default values][]. ## Usage diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml index 08e27047b..5621c0718 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.7.1"' + - '"number":"8.0.0"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index 357b5ed56..5f7af4939 100644 --- a/kibana/examples/openshift/README.md +++ b/kibana/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy Kibana 7.7.1 on [OpenShift][] using [custom values][]. +This example deploy Kibana 8.0.0-SNAPSHOT on [OpenShift][] using [custom values][]. ## Usage diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md index 89a6b5b4e..250fdd56b 100644 --- a/kibana/examples/oss/README.md +++ b/kibana/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Kibana 7.7.1 using [Kibana OSS][] version. +This example deploy Kibana 8.0.0-SNAPSHOT using [Kibana OSS][] version. ## Usage diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md index 541e72ac3..75858a5ac 100644 --- a/kibana/examples/security/README.md +++ b/kibana/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Kibana 7.7.1 using authentication and TLS to connect to +This example deploy Kibana 8.0.0-SNAPSHOT using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/kibana/values.yaml b/kibana/values.yaml index 486954a47..ba6746c90 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.7.1" +imageTag: "8.0.0-SNAPSHOT" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index 312b91f5d..56a298f41 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.7.1 -appVersion: 7.7.1 +version: 8.0.0-SNAPSHOT +appVersion: 8.0.0-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 7fd7cc042..93de6b8ee 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -8,7 +8,7 @@ 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 +**Warning**: This branch is used for development, please use [7.8.0][] release for released version. @@ -20,7 +20,6 @@ for released version. - [Install released version using Helm repository](#install-released-version-using-helm-repository) - [Install development version using master branch](#install-development-version-using-master-branch) - [Upgrading](#upgrading) -- [Compatibility](#compatibility) - [Usage notes](#usage-notes) - [Configuration](#configuration) - [FAQ](#faq) @@ -53,7 +52,7 @@ See [supported configurations][] for more details. * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` -* Install it: `helm install --name logstash ./helm-charts/logstash --set imageTag=7.7.1` +* Install it: `helm install --name logstash ./helm-charts/logstash --set imageTag=8.0.0-SNAPSHOT` ## Upgrading @@ -62,26 +61,6 @@ Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before upgrading to a new chart version. -## Compatibility - -This chart is tested with the latest supported versions. The currently tested -versions are: - -| 6.x | 7.x | -|-------|-------| -| 6.8.10 | 7.7.1 | - -Examples of installing older major versions can be found in the [examples][] -directory. - -While only the latest releases are tested, it is possible to easily install old -or new releases by overriding the `imageTag` To install version `7.7.1` of -Logstash it would look like this: - -``` -helm install --name logstash elastic/logstash --set imageTag=7.7.1 -``` - ## Usage notes * This repo includes a number of [examples][] configurations which can be used @@ -127,7 +106,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.7.1` | +| `imageTag` | The Logstash Docker image tag | `8.0.0-SNAPSHOT` | | `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 | `{}` | @@ -200,7 +179,7 @@ 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 +[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/6.x/Makefile b/logstash/examples/6.x/Makefile deleted file mode 100644 index b44d6b24d..000000000 --- a/logstash/examples/6.x/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -default: test - -include ../../../helpers/examples.mk - -RELEASE := helm-logstash-six - -install: - helm upgrade --wait --timeout=900 --install $(RELEASE) --values ./values.yaml ../../ - -restart: - helm upgrade --set terminationGracePeriod=121 --wait --timeout=900 --install $(RELEASE) --values ./values.yaml ../../ - -test: install goss - -purge: - helm del --purge $(RELEASE) diff --git a/logstash/examples/6.x/README.md b/logstash/examples/6.x/README.md deleted file mode 100644 index e18b26ace..000000000 --- a/logstash/examples/6.x/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# 6.x - -This example deploy Logstash 6.8.10 using [default values][]. - - -## Usage - -* Deploy Logstash chart with the default values: `make install` - - -## Testing - -You can also run [goss integration tests][] using `make test` - - -[goss integration tests]: https://github.com/elastic/helm-charts/tree/master/logstash/examples/6.x/test/goss.yaml -[default values]: https://github.com/elastic/helm-charts/tree/master/logstash/values.yaml diff --git a/logstash/examples/6.x/test/goss.yaml b/logstash/examples/6.x/test/goss.yaml deleted file mode 100644 index 7b942055b..000000000 --- a/logstash/examples/6.x/test/goss.yaml +++ /dev/null @@ -1,38 +0,0 @@ -user: - logstash: - exists: true - uid: 1000 - gid: 1000 - -http: - http://localhost:9600?pretty: - status: 200 - timeout: 2000 - body: - - '"host" : "helm-logstash-six-logstash-0"' - - '"version" : "6.8.10"' - - '"http_address" : "0.0.0.0:9600"' - - '"name" : "helm-logstash-six-logstash-0"' - -file: - /usr/share/logstash/config/logstash.yml: - exists: true - mode: "0644" - owner: logstash - group: root - filetype: file - contains: - - 'http.host: "0.0.0.0"' - /usr/share/logstash/pipeline/logstash.conf: - exists: true - mode: "0644" - owner: logstash - group: root - filetype: file - contains: - - 'input {' - - 'beats {' - - 'port => 5044' - - 'output {' - - 'stdout {' - - 'codec => rubydebug' diff --git a/logstash/examples/6.x/values.yaml b/logstash/examples/6.x/values.yaml deleted file mode 100644 index e1128dffd..000000000 --- a/logstash/examples/6.x/values.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -imageTag: "6.8.10" diff --git a/logstash/examples/default/README.md b/logstash/examples/default/README.md index 7ac691ef8..8997fbda7 100644 --- a/logstash/examples/default/README.md +++ b/logstash/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Logstash 7.7.1 using [default values][]. +This example deploy Logstash 8.0.0-SNAPSHOT using [default values][]. ## Usage diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index 98d6d7ad8..13b15955d 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.7.1"' + - '"version" : "8.0.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 029da47ac..54ae82ca2 100644 --- a/logstash/examples/elasticsearch/README.md +++ b/logstash/examples/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -This example deploy Logstash 7.7.1 which connects to Elasticsearch (see +This example deploy Logstash 8.0.0-SNAPSHOT which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index 811767844..e24fdadd0 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.7.1"' + - '"version" : "8.0.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 edcf55937..a06ab1a18 100644 --- a/logstash/examples/oss/README.md +++ b/logstash/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Logstash 7.7.1 using [Logstash OSS][] version. +This example deploy Logstash 8.0.0-SNAPSHOT using [Logstash OSS][] version. ## Usage diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index 25a9e9419..29cf3b528 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.7.1"' + - '"version" : "8.0.0"' - '"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 0f9af83dd..a678c25ff 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 8.0.0-SNAPSHOT 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..f6a2fbe0a 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" : "8.0.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 74db65794..d3677222b 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -43,7 +43,7 @@ envFrom: [] secretMounts: [] image: "docker.elastic.co/logstash/logstash" -imageTag: "7.7.1" +imageTag: "8.0.0-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index 05b502392..0324a45db 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.7.1 -appVersion: 7.7.1 +version: 8.0.0-SNAPSHOT +appVersion: 8.0.0-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 7c99da98a..a12bfbfc6 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -3,7 +3,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 [7.7.1][] release +**Warning**: This branch is used for development, please use [7.8.0][] release for supported version. @@ -15,7 +15,6 @@ for supported version. - [Install released version using Helm repository](#install-released-version-using-helm-repository) - [Install development version using master branch](#install-development-version-using-master-branch) - [Upgrading](#upgrading) -- [Compatibility](#compatibility) - [Usage notes](#usage-notes) - [Configuration](#configuration) - [Deprecated](#deprecated) @@ -52,7 +51,7 @@ See [supported configurations][] for more details. * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` -* Install it: `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=7.7.1` +* Install it: `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=8.0.0-SNAPSHOT` ## Upgrading @@ -61,27 +60,6 @@ Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before upgrading to a new chart version. -## Compatibility - -This chart is tested with the latest supported versions. The currently tested -versions are: - -| 6.x | 7.x | -|-------|-------| -| 6.8.10 | 7.7.1 | - -Examples of installing older major versions can be found in the [examples][] -directory. - -While only the latest releases are tested, it is possible to easily install old -or new releases by overriding the `imageTag` To install version `7.7.1` of -Metricbeat it would look like this: - -``` -helm install --name metricbeat elastic/metricbeat --set imageTag=7.7.1 -``` - - ## Usage notes * The default Metricbeat configuration file for this chart is configured to use @@ -135,7 +113,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.7.1` | +| `imageTag` | The Metricbeat Docker image tag | `8.0.0-SNAPSHOT` | | `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][] | @@ -218,7 +196,7 @@ 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 +[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/6.x/Makefile b/metricbeat/examples/6.x/Makefile deleted file mode 100644 index 05a66d2bc..000000000 --- a/metricbeat/examples/6.x/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -default: test - -include ../../../helpers/examples.mk - -RELEASE := helm-metricbeat-six -GOSS_SELECTOR = release=$(RELEASE),app=helm-metricbeat-six-metricbeat - -install: - helm upgrade --wait --timeout=600 --install $(RELEASE) --values values.yaml ../../ - -purge: - helm del --purge $(RELEASE) - -test-metrics: - GOSS_FILE=goss-metrics.yaml make goss GOSS_SELECTOR=release=$(RELEASE),app=helm-metricbeat-six-metricbeat-metrics - -test: install goss test-metrics diff --git a/metricbeat/examples/6.x/README.md b/metricbeat/examples/6.x/README.md deleted file mode 100644 index 97a48b224..000000000 --- a/metricbeat/examples/6.x/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# 6.x - -This example deploy Metricbeat 6.8.10. - - -## Usage - -* Deploy [Elasticsearch Helm chart][]. - -* Deploy Metricbeat chart with the default values: `make install` - -* You can now setup a port forward to query Metricbeat indices: - - ``` - kubectl port-forward svc/six-master 9200 - curl localhost:9200/_cat/indices - ``` - - -## Testing - -You can also run [goss integration tests][] using `make test` - - -[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/master/elasticsearch/examples/6.x/ -[goss integration tests]: https://github.com/elastic/helm-charts/tree/master/metricbeat/examples/6.x/test/goss.yaml diff --git a/metricbeat/examples/6.x/test/goss-metrics.yaml b/metricbeat/examples/6.x/test/goss-metrics.yaml deleted file mode 100644 index a2760146b..000000000 --- a/metricbeat/examples/6.x/test/goss-metrics.yaml +++ /dev/null @@ -1,42 +0,0 @@ -port: - tcp:5066: - listening: true - ip: - - '127.0.0.1' - -mount: - /usr/share/metricbeat/metricbeat.yml: - exists: true - opts: - - ro - -user: - metricbeat: - exists: true - uid: 1000 - gid: 1000 - -http: - http://six-master:9200/_cat/indices: - status: 200 - timeout: 2000 - body: - - 'metricbeat-6.8.10' - http://six-master:9200/_search?q=metricset.name:state_deployment: - status: 200 - timeout: 2000 - body: - - 'metricbeat-6.8.10' - -file: - /usr/share/metricbeat/metricbeat.yml: - exists: true - contains: - - 'output.elasticsearch' - -command: - cd /usr/share/metricbeat && metricbeat test output: - exit-status: 0 - stdout: - - 'elasticsearch: http://six-master:9200' - - 'version: 6.8.10' diff --git a/metricbeat/examples/6.x/test/goss.yaml b/metricbeat/examples/6.x/test/goss.yaml deleted file mode 100644 index f12130f32..000000000 --- a/metricbeat/examples/6.x/test/goss.yaml +++ /dev/null @@ -1,47 +0,0 @@ -port: - tcp:5066: - listening: true - ip: - - '127.0.0.1' - -mount: - /usr/share/metricbeat/data: - exists: true - /run/docker.sock: - exists: true - /usr/share/metricbeat/metricbeat.yml: - exists: true - opts: - - ro - -user: - metricbeat: - exists: true - uid: 1000 - gid: 1000 - -http: - http://six-master:9200/_cat/indices: - status: 200 - timeout: 2000 - body: - - 'metricbeat-6.8.10' - http://six-master:9200/_search?q=metricset.name:container: - status: 200 - timeout: 2000 - body: - - 'metricbeat-6.8.10' - -file: - /usr/share/metricbeat/metricbeat.yml: - exists: true - contains: - - 'add_kubernetes_metadata' - - 'output.elasticsearch' - -command: - cd /usr/share/metricbeat && metricbeat test output: - exit-status: 0 - stdout: - - 'elasticsearch: http://six-master:9200' - - 'version: 6.8.10' diff --git a/metricbeat/examples/6.x/values.yaml b/metricbeat/examples/6.x/values.yaml deleted file mode 100644 index 04cb5bcd1..000000000 --- a/metricbeat/examples/6.x/values.yaml +++ /dev/null @@ -1,5 +0,0 @@ -imageTag: 6.8.10 - -extraEnvs: - - name: ELASTICSEARCH_HOSTS - value: six-master:9200 diff --git a/metricbeat/examples/default/README.md b/metricbeat/examples/default/README.md index 07085cbde..904fa4dd2 100644 --- a/metricbeat/examples/default/README.md +++ b/metricbeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Metricbeat 7.7.1 using [default values][]. +This example deploy Metricbeat 8.0.0-SNAPSHOT using [default values][]. ## Usage diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml index 79deefedc..b7f25edb4 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.7.1' + - 'metricbeat-8.0.0' 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.7.1' + - 'metricbeat-8.0.0' file: /usr/share/metricbeat/metricbeat.yml: @@ -41,4 +41,3 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.7.1' diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index d3a5f290c..bc3cba119 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.7.1' + - 'metricbeat-8.0.0' 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.7.1' + - 'metricbeat-8.0.0' file: /usr/share/metricbeat/metricbeat.yml: @@ -45,4 +45,3 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.7.1' diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index 7690975e0..07e0422a1 100644 --- a/metricbeat/examples/oss/README.md +++ b/metricbeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Metricbeat 7.7.1 using [Metricbeat OSS][] version. +This example deploy Metricbeat 8.0.0-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 b60cb535c..f2f004bfe 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.7.1' + - 'metricbeat-8.0.0' http://oss-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-7.7.1' + - 'metricbeat-8.0.0' file: /usr/share/metricbeat/metricbeat.yml: @@ -39,4 +39,3 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.7.1' diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index d2ccef74b..54599a4b4 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.7.1' + - 'metricbeat-8.0.0' http://oss-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-7.7.1' + - 'metricbeat-8.0.0' file: /usr/share/metricbeat/metricbeat.yml: @@ -44,4 +44,3 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.7.1' diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index c461afb06..39644bc63 100644 --- a/metricbeat/examples/security/README.md +++ b/metricbeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Metricbeat 7.7.1 using authentication and TLS to connect to +This example deploy Metricbeat 8.0.0-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 a9da3a1ce..07a9df32a 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.7.1' + - 'metricbeat-8.0.0' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.7.1' + - 'metricbeat-8.0.0' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -45,4 +45,3 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 7.7.1' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index ecd9386f6..491cec112 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.7.1' + - 'metricbeat-8.0.0' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -33,7 +33,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.7.1' + - 'metricbeat-8.0.0' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -50,4 +50,3 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 7.7.1' diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index e8016ac52..ad670fdb9 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.7.1" +imageTag: "8.0.0-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: []