From 8325aca349376beffb80932f8089d6986a82841b Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 18 Dec 2019 16:47:14 +0100 Subject: [PATCH 1/2] [7.5.1] update changelog --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b5d7084a..08438741e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,32 @@ # Changelog +## 7.5.1 - 2019/12/18 + +* 7.5.1 as the default stack version +* 6.8.6 as 6.x tested version +* Add a notice that Helm v3 is not supported in [#400](https://github.com/elastic/helm-charts/pull/400) [@jmlrt](https://github.com/jmlrt) +* Prefixed helper functions with chart name in [#407](https://github.com/elastic/helm-charts/pull/407) [bpdunni](https://github.com/bpdunni) +* Use details tag around code backticks for 'helm get' output in issue template in [#413](https://github.com/elastic/helm-charts/pull/413) [krichter722](https://github.com/krichter722) + +### Filebeat + +| PR | Author | Title | +| ------------------------------------------------------ | ---------------------------------------- | ----------------------------------------------------- | +|[#403](https://github.com/elastic/helm-charts/pull/403) | [@ChrsMark](https://github.com/ChrsMark) | Remove in_cluster config from add_kubernetes_metadata | + +### Kibana + +| PR | Author | Title | +| ------------------------------------------------------ | ---------------------------------------------------- | ------------------------------------ | +|[#411](https://github.com/elastic/helm-charts/pull/411) | [@usamaahmadkhan](https://github.com/usamaahmadkhan) | Enable labels to be added to service | + +### Metricbeat + +| PR | Author | Title | +| ------------------------------------------------------ | ---------------------------------- | ----------------------------------------------------- | +|[#397](https://github.com/elastic/helm-charts/pull/397) | [@jmlrt](https://github.com/jmlrt) | Add a notice about kube-state-metrics breaking change | + + ## 7.5.0 - 2019/12/02 * 7.5.0 as the default stack version From 290fa8375d779b26a000a2e3c2ce37127ef61d9d Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 18 Dec 2019 16:48:05 +0100 Subject: [PATCH 2/2] [7.5.1] bump versions --- elasticsearch/Chart.yaml | 4 ++-- elasticsearch/README.md | 8 ++++---- elasticsearch/examples/6.x/test/goss.yaml | 2 +- elasticsearch/examples/6.x/values.yaml | 2 +- elasticsearch/examples/default/test/goss.yaml | 2 +- elasticsearch/examples/openshift/test/goss.yaml | 2 +- elasticsearch/examples/oss/test/goss.yaml | 2 +- elasticsearch/examples/upgrade/test/goss.yaml | 2 +- elasticsearch/values.yaml | 2 +- filebeat/Chart.yaml | 4 ++-- filebeat/README.md | 8 ++++---- filebeat/examples/6.x/test/goss.yaml | 2 +- filebeat/examples/6.x/values.yaml | 2 +- filebeat/examples/default/test/goss.yaml | 4 ++-- filebeat/examples/oss/test/goss.yaml | 2 +- filebeat/examples/security/test/goss.yaml | 2 +- filebeat/values.yaml | 2 +- helpers/bumper.py | 6 +++--- helpers/examples.mk | 2 +- kibana/Chart.yaml | 4 ++-- kibana/README.md | 8 ++++---- kibana/examples/6.x/test/goss.yaml | 2 +- kibana/examples/6.x/values.yml | 2 +- kibana/examples/default/test/goss.yaml | 2 +- kibana/values.yaml | 2 +- logstash/Chart.yaml | 4 ++-- logstash/README.md | 8 ++++---- logstash/examples/6.x/test/goss.yaml | 2 +- logstash/examples/6.x/values.yaml | 2 +- logstash/examples/default/test/goss.yaml | 2 +- logstash/examples/elasticsearch/test/goss.yaml | 2 +- logstash/examples/oss/test/goss.yaml | 2 +- logstash/values.yaml | 2 +- metricbeat/Chart.yaml | 4 ++-- metricbeat/README.md | 14 +++++++------- metricbeat/examples/6.x/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/6.x/test/goss.yaml | 6 +++--- metricbeat/examples/6.x/values.yaml | 2 +- metricbeat/examples/default/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/default/test/goss.yaml | 6 +++--- metricbeat/examples/oss/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/oss/test/goss.yaml | 6 +++--- .../examples/security/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/security/test/goss.yaml | 6 +++--- metricbeat/values.yaml | 2 +- 45 files changed, 87 insertions(+), 87 deletions(-) diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 7adcbb189..8f64d020f 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.5.0 -appVersion: 7.5.0 +version: 7.5.1 +appVersion: 7.5.1 sources: - https://github.com/elastic/elasticsearch icon: https://helm.elastic.co/icons/elasticsearch.png diff --git a/elasticsearch/README.md b/elasticsearch/README.md index a0293c373..9bb2e6a95 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -55,14 +55,14 @@ This chart is tested with the latest supported versions. The currently tested ve | 6.x | 7.x | | ----- | ----- | -| 6.8.5 | 7.5.0 | +| 6.8.6 | 7.5.1 | Examples of installing older major versions can be found in the [examples](./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.5.0` of Elasticsearch it would look like this: +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.5.1` of Elasticsearch it would look like this: ``` -helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.5.0 +helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.5.1 ``` ## Configuration @@ -83,7 +83,7 @@ helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.5.0 | `extraInitContainers` | Templatable string of additional init containers to be passed to the `tpl` function | `""` | | `secretMounts` | Allows you easily mount a secret as a file inside the statefulset. Useful for mounting certificates and other secrets. See [values.yaml](./values.yaml) for an example | `[]` | | `image` | The Elasticsearch docker image | `docker.elastic.co/elasticsearch/elasticsearch` | -| `imageTag` | The Elasticsearch docker image tag | `7.5.0` | +| `imageTag` | The Elasticsearch docker image tag | `7.5.1` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` | | `podAnnotations` | Configurable [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) applied to all Elasticsearch pods | `{}` | | `labels` | Configurable [label](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) applied to all Elasticsearch pods | `{}` | diff --git a/elasticsearch/examples/6.x/test/goss.yaml b/elasticsearch/examples/6.x/test/goss.yaml index 198d51d76..ba8fb5406 100644 --- a/elasticsearch/examples/6.x/test/goss.yaml +++ b/elasticsearch/examples/6.x/test/goss.yaml @@ -11,7 +11,7 @@ http: status: 200 timeout: 2000 body: - - '"number" : "6.8.5"' + - '"number" : "6.8.6"' - '"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 index f73a7a15d..39f550dc9 100644 --- a/elasticsearch/examples/6.x/values.yaml +++ b/elasticsearch/examples/6.x/values.yaml @@ -1,4 +1,4 @@ --- clusterName: "six" -imageTag: "6.8.5" +imageTag: "6.8.6" diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml index 1d1285112..055529e5b 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.5.0"' + - '"number" : "7.5.1"' - '"cluster_name" : "elasticsearch"' - '"name" : "elasticsearch-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml index 90c5fa8b2..25de54e81 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.5.0"' + - '"number" : "7.5.1"' - '"cluster_name" : "elasticsearch"' - '"name" : "elasticsearch-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml index 30fee9167..f088dc7c9 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.5.0"' + - '"number" : "7.5.1"' - '"cluster_name" : "oss"' - '"name" : "oss-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/upgrade/test/goss.yaml b/elasticsearch/examples/upgrade/test/goss.yaml index d4aa5d527..319db3ad0 100644 --- a/elasticsearch/examples/upgrade/test/goss.yaml +++ b/elasticsearch/examples/upgrade/test/goss.yaml @@ -11,7 +11,7 @@ http: status: 200 timeout: 2000 body: - - '"number" : "7.5.0"' + - '"number" : "7.5.1"' - '"cluster_name" : "upgrade"' - '"name" : "upgrade-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 8f2d943a7..c667444fa 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -43,7 +43,7 @@ secretMounts: [] # path: /usr/share/elasticsearch/config/certs image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "7.5.0" +imageTag: "7.5.1" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index 182c289aa..1cd9a9eae 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.5.0 -appVersion: 7.5.0 +version: 7.5.1 +appVersion: 7.5.1 sources: - https://github.com/elastic/beats icon: https://helm.elastic.co/icons/beats.png diff --git a/filebeat/README.md b/filebeat/README.md index c42f7b800..e8a7ebbef 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -44,14 +44,14 @@ This chart is tested with the latest supported versions. The currently tested ve | 6.x | 7.x | | ----- | ----- | -| 6.8.5 | 7.5.0 | +| 6.8.6 | 7.5.1 | Examples of installing older major versions can be found in the [examples](./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.5.0` of Filebeat it would look like this: +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.5.1` of Filebeat it would look like this: ``` -helm install --name filebeat elastic/filebeat --set imageTag=7.5.0 +helm install --name filebeat elastic/filebeat --set imageTag=7.5.1 ``` @@ -65,7 +65,7 @@ helm install --name filebeat elastic/filebeat --set imageTag=7.5.0 | `hostPathRoot` | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Filebeat registry data | `/var/lib` | | `hostNetworking` | Use host networking in the daemonset so that hostname is reported correctly | `false` | | `image` | The Filebeat docker image | `docker.elastic.co/beats/filebeat` | -| `imageTag` | The Filebeat docker image tag | `7.5.0` | +| `imageTag` | The Filebeat docker image tag | `7.5.1` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) so that you can use a private registry for your image | `[]` | | `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/6.x/test/goss.yaml b/filebeat/examples/6.x/test/goss.yaml index 59bef4e47..20ba3ea31 100644 --- a/filebeat/examples/6.x/test/goss.yaml +++ b/filebeat/examples/6.x/test/goss.yaml @@ -18,4 +18,4 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-6.8.5' + - 'filebeat-6.8.6' diff --git a/filebeat/examples/6.x/values.yaml b/filebeat/examples/6.x/values.yaml index 852b85d91..f4873e1f3 100644 --- a/filebeat/examples/6.x/values.yaml +++ b/filebeat/examples/6.x/values.yaml @@ -1,4 +1,4 @@ -imageTag: 6.8.5 +imageTag: 6.8.6 extraEnvs: - name: ELASTICSEARCH_HOSTS diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml index e7b37cb0f..95cb21ef5 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.5.0' + - 'filebeat-7.5.1' file: /usr/share/filebeat/filebeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.5.0' + - 'version: 7.5.1' diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml index ddb1a446e..b1f255598 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.5.0' + - 'filebeat-7.5.1' diff --git a/filebeat/examples/security/test/goss.yaml b/filebeat/examples/security/test/goss.yaml index 5ee951b0b..8716a022f 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.5.0' + - 'filebeat-7.5.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' diff --git a/filebeat/values.yaml b/filebeat/values.yaml index a9dc5fd35..b1f2d941b 100755 --- a/filebeat/values.yaml +++ b/filebeat/values.yaml @@ -34,7 +34,7 @@ extraVolumes: [] hostPathRoot: /var/lib hostNetworking: false image: "docker.elastic.co/beats/filebeat" -imageTag: "7.5.0" +imageTag: "7.5.1" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/bumper.py b/helpers/bumper.py index 66e6eed85..79e853988 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -7,11 +7,11 @@ os.chdir(os.path.join(os.path.dirname(__file__), '..')) -chart_version = '7.5.0' +chart_version = '7.5.1' versions = { - 6: '6.8.5', - 7: '7.5.0', + 6: '6.8.6', + 7: '7.5.1', } file_patterns = [ diff --git a/helpers/examples.mk b/helpers/examples.mk index e7e743e34..1bc2bb051 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.5.0 +STACK_VERSION := 7.5.1 goss: GOSS_CONTAINER=$$(kubectl get --no-headers=true pods -l $(GOSS_SELECTOR) -o custom-columns=:metadata.name | sed -n 1p ) && \ diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index 4057b2195..ffdc2386f 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.5.0 -appVersion: 7.5.0 +version: 7.5.1 +appVersion: 7.5.1 sources: - https://github.com/elastic/kibana icon: https://helm.elastic.co/icons/kibana.png diff --git a/kibana/README.md b/kibana/README.md index 23b1d81ff..88e7cee05 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -39,14 +39,14 @@ This chart is tested with the latest supported versions. The currently tested ve | 6.x | 7.x | | ----- | ----- | -| 6.8.5 | 7.5.0 | +| 6.8.6 | 7.5.1 | Examples of installing older major versions can be found in the [examples](./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.5.0` of Kibana it would look like this: +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.5.1` of Kibana it would look like this: ``` -helm install --name kibana elastic/kibana --set imageTag=7.5.0 +helm install --name kibana elastic/kibana --set imageTag=7.5.1 ``` ## Configuration @@ -59,7 +59,7 @@ helm install --name kibana elastic/kibana --set imageTag=7.5.0 | `extraEnvs` | Extra [environment variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config) which will be appended to the `env:` definition for the container | `[]` | | `secretMounts` | Allows you easily mount a secret as a file inside the deployment. Useful for mounting certificates and other secrets. See [values.yaml](./values.yaml) for an example | `[]` | | `image` | The Kibana docker image | `docker.elastic.co/kibana/kibana` | -| `imageTag` | The Kibana docker image tag | `7.5.0` | +| `imageTag` | The Kibana docker image tag | `7.5.1` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` | | `podAnnotations` | Configurable [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) applied to all Kibana pods | `{}` | | `resources` | Allows you to set the [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for the statefulset | `requests.cpu: 100m`
`requests.memory: 500Mi`
`limits.cpu: 1000m`
`limits.memory: 2Gi` | diff --git a/kibana/examples/6.x/test/goss.yaml b/kibana/examples/6.x/test/goss.yaml index 5ad4bb63b..f1bb1076c 100644 --- a/kibana/examples/6.x/test/goss.yaml +++ b/kibana/examples/6.x/test/goss.yaml @@ -3,7 +3,7 @@ http: status: 200 timeout: 2000 body: - - '"number":"6.8.5"' + - '"number":"6.8.6"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/examples/6.x/values.yml b/kibana/examples/6.x/values.yml index fd9a218aa..f513d64bc 100644 --- a/kibana/examples/6.x/values.yml +++ b/kibana/examples/6.x/values.yml @@ -1,4 +1,4 @@ --- -imageTag: 6.8.5 +imageTag: 6.8.6 elasticsearchHosts: "http://six-master:9200" diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml index 88bfb6245..e1d0d47c8 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.5.0"' + - '"number":"7.5.1"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/values.yaml b/kibana/values.yaml index 947e47dd7..7ed80bc42 100755 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -22,7 +22,7 @@ secretMounts: [] # subPath: kibana.keystore # optional image: "docker.elastic.co/kibana/kibana" -imageTag: "7.5.0" +imageTag: "7.5.1" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index 506df20c2..5ef520779 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.5.0 -appVersion: 7.5.0 +version: 7.5.1 +appVersion: 7.5.1 sources: - https://github.com/elastic/logstash icon: https://helm.elastic.co/icons/logstash.png diff --git a/logstash/README.md b/logstash/README.md index cb8a5d00c..05594de7e 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -47,14 +47,14 @@ This chart is tested with the latest supported versions. The currently tested ve | 6.x | 7.x | | ----- | ----- | -| 6.8.5 | 7.5.0 | +| 6.8.6 | 7.5.1 | Examples of installing older major versions can be found in the [examples](./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.5.0` of Logstash it would look like this: +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.5.1` of Logstash it would look like this: ``` -helm install --name logstash elastic/logstash --set imageTag=7.5.0 +helm install --name logstash elastic/logstash --set imageTag=7.5.1 ``` ## Configuration @@ -71,7 +71,7 @@ helm install --name logstash elastic/logstash --set imageTag=7.5.0 | `image` | The Logstash docker image | `docker.elastic.co/logstash/logstash` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) so that you can use a private registry for your image | `[]` | -| `imageTag` | The Logstash docker image tag | `7.5.0` | +| `imageTag` | The Logstash docker image tag | `7.5.1` | | `extraInitContainers` | Templatable string of additional init containers to be passed to the `tpl` function | `""` | | `httpPort` | The http port that Kubernetes will use for the healthchecks and the service. | `9600` | | `labels` | Configurable [labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) applied to all Logstash pods | `{}` | diff --git a/logstash/examples/6.x/test/goss.yaml b/logstash/examples/6.x/test/goss.yaml index 99bee7779..79b1eeace 100644 --- a/logstash/examples/6.x/test/goss.yaml +++ b/logstash/examples/6.x/test/goss.yaml @@ -10,7 +10,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-six-logstash-0"' - - '"version" : "6.8.5"' + - '"version" : "6.8.6"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-six-logstash-0"' diff --git a/logstash/examples/6.x/values.yaml b/logstash/examples/6.x/values.yaml index 2980e8f1e..04d0d6c29 100644 --- a/logstash/examples/6.x/values.yaml +++ b/logstash/examples/6.x/values.yaml @@ -1,3 +1,3 @@ --- -imageTag: "6.8.5" +imageTag: "6.8.6" diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index 142ce3bc3..a97a263ba 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.5.0"' + - '"version" : "7.5.1"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-default-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index 000bfd905..586e75a67 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.5.0"' + - '"version" : "7.5.1"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-elasticsearch-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index d44369156..9168666ed 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.5.0"' + - '"version" : "7.5.1"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-oss-logstash-0"' - '"status" : "green"' diff --git a/logstash/values.yaml b/logstash/values.yaml index 42f9cbf17..97e8668eb 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -32,7 +32,7 @@ extraEnvs: [] secretMounts: [] image: "docker.elastic.co/logstash/logstash" -imageTag: "7.5.0" +imageTag: "7.5.1" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index c39a100ea..d054a1a5d 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.5.0 -appVersion: 7.5.0 +version: 7.5.1 +appVersion: 7.5.1 sources: - https://github.com/elastic/beats icon: https://helm.elastic.co/icons/beats.png diff --git a/metricbeat/README.md b/metricbeat/README.md index 6812f3835..de295973b 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -6,12 +6,12 @@ This helm chart is a lightweight way to configure and run our official [Metricbe ## Breaking Changes -[7.5.0](https://github.com/elastic/helm-charts/releases/tag/7.5.0) release is introducing a breaking change for Metricbeat users upgrading from a previous chart version. +[7.5.1](https://github.com/elastic/helm-charts/releases/tag/7.5.1) release is introducing a breaking change for Metricbeat users upgrading from a previous chart version. The breaking change tracked in [#395](https://github.com/elastic/helm-charts/issues/395) is failing `helm upgrade` command with the following error: ``` UPGRADE FAILED -Error: Deployment.apps "metricbeat-kube-state-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app.kubernetes.io/name":"kube-state-metrics"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable && Deployment.apps "metricbeat-metricbeat-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app":"metricbeat-metricbeat-metrics", "chart":"metricbeat-7.5.0", "heritage":"Tiller", "release":"metricbeat"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable -Error: UPGRADE FAILED: Deployment.apps "metricbeat-kube-state-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app.kubernetes.io/name":"kube-state-metrics"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable && Deployment.apps "metricbeat-metricbeat-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app":"metricbeat-metricbeat-metrics", "chart":"metricbeat-7.5.0", "heritage":"Tiller", "release":"metricbeat"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable +Error: Deployment.apps "metricbeat-kube-state-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app.kubernetes.io/name":"kube-state-metrics"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable && Deployment.apps "metricbeat-metricbeat-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app":"metricbeat-metricbeat-metrics", "chart":"metricbeat-7.5.1", "heritage":"Tiller", "release":"metricbeat"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable +Error: UPGRADE FAILED: Deployment.apps "metricbeat-kube-state-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app.kubernetes.io/name":"kube-state-metrics"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable && Deployment.apps "metricbeat-metricbeat-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app":"metricbeat-metricbeat-metrics", "chart":"metricbeat-7.5.1", "heritage":"Tiller", "release":"metricbeat"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable ``` This is caused by the update of [kube-state-metrics](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) chart dependency which is renaming some labels in [helm/charts#15261](https://github.com/helm/charts/pull/15261). @@ -53,14 +53,14 @@ This chart is tested with the latest supported versions. The currently tested ve | 6.x | 7.x | | ----- | ----- | -| 6.8.5 | 7.5.0 | +| 6.8.6 | 7.5.1 | Examples of installing older major versions can be found in the [examples](./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.5.0` of metricbeat it would look like this: +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.5.1` of metricbeat it would look like this: ``` -helm install --name metricbeat elastic/metricbeat --set imageTag=7.5.0 +helm install --name metricbeat elastic/metricbeat --set imageTag=7.5.1 ``` @@ -73,7 +73,7 @@ helm install --name metricbeat elastic/metricbeat --set imageTag=7.5.0 | `extraVolumes` | Templatable string of additional volumes to be passed to the `tpl` function | `""` | | `hostPathRoot` | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Metricbeat registry data | `/var/lib` | | `image` | The Metricbeat docker image | `docker.elastic.co/beats/metricbeat` | -| `imageTag` | The Metricbeat docker image tag | `7.5.0` | +| `imageTag` | The Metricbeat docker image tag | `7.5.1` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) so that you can use a private registry for your image | `[]` | | `labels` | Configurable [label](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) applied to all Metricbeat pods | `{}` | diff --git a/metricbeat/examples/6.x/test/goss-metrics.yaml b/metricbeat/examples/6.x/test/goss-metrics.yaml index f53900ef2..d700ff86a 100644 --- a/metricbeat/examples/6.x/test/goss-metrics.yaml +++ b/metricbeat/examples/6.x/test/goss-metrics.yaml @@ -21,12 +21,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.5' + - 'metricbeat-6.8.6' http://six-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.5' + - 'metricbeat-6.8.6' file: /usr/share/metricbeat/metricbeat.yml: @@ -40,4 +40,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://six-master:9200' - - 'version: 6.8.5' + - 'version: 6.8.6' diff --git a/metricbeat/examples/6.x/test/goss.yaml b/metricbeat/examples/6.x/test/goss.yaml index 3eed9277e..d6ea9fc7d 100644 --- a/metricbeat/examples/6.x/test/goss.yaml +++ b/metricbeat/examples/6.x/test/goss.yaml @@ -29,12 +29,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.5' + - 'metricbeat-6.8.6' http://six-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.5' + - 'metricbeat-6.8.6' file: /usr/share/metricbeat/metricbeat.yml: @@ -48,4 +48,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://six-master:9200' - - 'version: 6.8.5' + - 'version: 6.8.6' diff --git a/metricbeat/examples/6.x/values.yaml b/metricbeat/examples/6.x/values.yaml index 852b85d91..f4873e1f3 100644 --- a/metricbeat/examples/6.x/values.yaml +++ b/metricbeat/examples/6.x/values.yaml @@ -1,4 +1,4 @@ -imageTag: 6.8.5 +imageTag: 6.8.6 extraEnvs: - name: ELASTICSEARCH_HOSTS diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml index 2ebc7d493..b0d8cba19 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.5.0' + - 'metricbeat-7.5.1' 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.5.0' + - 'metricbeat-7.5.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -42,4 +42,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.5.0' + - 'version: 7.5.1' diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index 73644a7b0..6a44c1d8f 100644 --- a/metricbeat/examples/default/test/goss.yaml +++ b/metricbeat/examples/default/test/goss.yaml @@ -29,12 +29,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.5.0' + - 'metricbeat-7.5.1' 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.5.0' + - 'metricbeat-7.5.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -49,4 +49,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.5.0' + - 'version: 7.5.1' diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml index 4362b61bd..e864c8505 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.5.0' + - 'metricbeat-7.5.1' http://oss-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-7.5.0' + - 'metricbeat-7.5.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -40,4 +40,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.5.0' + - 'version: 7.5.1' diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index 71fbbc2ff..4d2f70fd5 100644 --- a/metricbeat/examples/oss/test/goss.yaml +++ b/metricbeat/examples/oss/test/goss.yaml @@ -29,12 +29,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.5.0' + - 'metricbeat-7.5.1' http://oss-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-7.5.0' + - 'metricbeat-7.5.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -48,4 +48,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.5.0' + - 'version: 7.5.1' diff --git a/metricbeat/examples/security/test/goss-metrics.yaml b/metricbeat/examples/security/test/goss-metrics.yaml index 74ad4d5f4..98c3d6da1 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.5.0' + - 'metricbeat-7.5.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.5.0' + - 'metricbeat-7.5.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -46,4 +46,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 7.5.0' + - 'version: 7.5.1' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index 151c97c2b..f5d759419 100644 --- a/metricbeat/examples/security/test/goss.yaml +++ b/metricbeat/examples/security/test/goss.yaml @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.5.0' + - 'metricbeat-7.5.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -37,7 +37,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.5.0' + - 'metricbeat-7.5.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -54,4 +54,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 7.5.0' + - 'version: 7.5.1' diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 47087591d..4e8b501f6 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -86,7 +86,7 @@ extraVolumes: [] hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "7.5.0" +imageTag: "7.5.1" imagePullPolicy: "IfNotPresent" imagePullSecrets: []