Merge branch 'elastic:main' into main

.backportrc.json

@@ -2,8 +2,7 @@
   "upstream": "elastic/helm-charts",
   "targetBranchChoices": [
     "6.8",
-    "7.14",
-    "7.15",
+    "7.16",
     "7.x"
   ],
   "all": true,

CHANGELOG.md

@@ -1,5 +1,47 @@
 # Changelog
 
+## 7.16.1
+
+* 7.16.1 as default version.
+
+| PR | Author | Title |
+| --- | --- | --- |
+| [#1382](https://github.com/elastic/helm-charts/pull/1382) | [@piglovesyou](https://github.com/piglovesyou) | [elasticsearch] fix typo  |
+| [#1386](https://github.com/elastic/helm-charts/pull/1386) | [@jmlrt](https://github.com/jmlrt) | [meta] fail make test on error  |
+| [#1409](https://github.com/elastic/helm-charts/pull/1409) | [@framsouza](https://github.com/framsouza) | [all] add support to ingress networking.k8s.io/v1 & ingressClassName  |
+| [#1410](https://github.com/elastic/helm-charts/pull/1410) | [@jmlrt](https://github.com/jmlrt) | [meta] add support for K8S 1.21 and remove 1.18  |
+| [#1458](https://github.com/elastic/helm-charts/pull/1458) | [@jmlrt](https://github.com/jmlrt) | [elasticsearch] use bash for readiness script  |
+| [#1460](https://github.com/elastic/helm-charts/pull/1460) | [@jmlrt](https://github.com/jmlrt) | [meta] download goss outside of pods  |
+| [#1464](https://github.com/elastic/helm-charts/pull/1464) | [@jmlrt](https://github.com/jmlrt) | [elasticsearch] use bash for keystore init container  |
+| [#1466](https://github.com/elastic/helm-charts/pull/1466) | [@jmlrt](https://github.com/jmlrt) | [elasticsearch] fix a typo in 4e31e0cf3d025f9ce877ac52d218f49d72e26447  |
+| [#1469](https://github.com/elastic/helm-charts/pull/1469) | [@jmlrt](https://github.com/jmlrt) | [metricbeat] remove es metricset search query for oss example  |
+| [#1474](https://github.com/elastic/helm-charts/pull/1474) | [@framsouza](https://github.com/framsouza) | [elasticsearch] disabling deprecation logs to be indexed  |
+| [#1475](https://github.com/elastic/helm-charts/pull/1475) | [@jmlrt](https://github.com/jmlrt) | [meta] initiate 7.16 branch  |
+| [#1476](https://github.com/elastic/helm-charts/pull/1476) | [@jmlrt](https://github.com/jmlrt) | [meta] update backport config for 7.16 branch  |
+| [#1480](https://github.com/elastic/helm-charts/pull/1480) | [@jmlrt](https://github.com/jmlrt) | [elasticsearch] fix a lines order in example values  |
+
+
+## 6.8.21
+
+* 6.8.21 as default version.
+
+| PR | Author | Title |
+| --- | --- | --- |
+| [#1410](https://github.com/elastic/helm-charts/pull/1410) | [@jmlrt](https://github.com/jmlrt) | [meta] add support for K8S 1.21 and remove 1.18  |
+| [#1300](https://github.com/elastic/helm-charts/pull/1300) | [@jonkerj](https://github.com/jonkerj) | [elasticsearch]: optionally disable SA token automount  |
+| [#1382](https://github.com/elastic/helm-charts/pull/1382) | [@piglovesyou](https://github.com/piglovesyou) | Fix typo  |
+| [#1386](https://github.com/elastic/helm-charts/pull/1386) | [@jmlrt](https://github.com/jmlrt) | [meta] fail make test on error  |
+| [#1319](https://github.com/elastic/helm-charts/pull/1319) | [@cclausss](https://github.com/cclausss) | Fix typos discovered by codespell  |
+| [#1105](https://github.com/elastic/helm-charts/pull/1105) | [@moritazi](https://github.com/moritazi) | [elasticsearch] Add namespace to helm test command in NOTES.txt  |
+| [#1362](https://github.com/elastic/helm-charts/pull/1362) | [@jmlrt](https://github.com/jmlrt) | [meta] remove contributing file from 6.8 branch  |
+| [#1321](https://github.com/elastic/helm-charts/pull/1321) | [@elasticmachine](https://github.com/elasticmachine) | Bump version to 6.8.19-SNAPSHOT  |
+| [#1294](https://github.com/elastic/helm-charts/pull/1294) | [@jmlrt](https://github.com/jmlrt) | [meta] add tests for k8s 1.20  |
+| [#1232](https://github.com/elastic/helm-charts/pull/1232) | [@jmlrt](https://github.com/jmlrt) | [meta] add helm 3.6.2 support  |
+| [#1116](https://github.com/elastic/helm-charts/pull/1116) | [@nflaig](https://github.com/nflaig) | [elasticsearch] add value to disable tests  |
+| [#1115](https://github.com/elastic/helm-charts/pull/1115) | [@nflaig](https://github.com/nflaig) | [elasticsearch] add value to disable service  |
+| [#1337](https://github.com/elastic/helm-charts/pull/1337) | [@jmlrt](https://github.com/jmlrt) | [meta] remove support matrix + nit doc changes  |
+
+
 ## 7.15.0
 
 * 7.15.0 as default version.

README.md

@@ -5,12 +5,13 @@
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
-- [Charts](#charts)
-- [Supported Configurations](#supported-configurations)
-  - [Stack Versions](#stack-versions)
-  - [Kubernetes Versions](#kubernetes-versions)
-  - [Helm Versions](#helm-versions)
-- [ECK](#eck)
+- [Elastic Stack Kubernetes Helm Charts](#elastic-stack-kubernetes-helm-charts)
+  - [Charts](#charts)
+  - [Supported Configurations](#supported-configurations)
+    - [Stack Versions](#stack-versions)
+    - [Kubernetes Versions](#kubernetes-versions)
+    - [Helm Versions](#helm-versions)
+  - [ECK](#eck)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -42,12 +43,12 @@ Note that only the released charts coming from [Elastic Helm repo][] or
 
 | Chart                                      | Latest 7 Version                             | Latest 6 Version                   |
 |--------------------------------------------|----------------------------------------------|------------------------------------|
-| [APM-Server](./apm-server/README.md)       | [`7.15.0`][apm-7] (Beta since 7.7.0)         | [`6.8.18`][apm-6] (Alpha)          |
-| [Elasticsearch](./elasticsearch/README.md) | [`7.15.0`][elasticsearch-7] (GA since 7.7.0) | [`6.8.18`][elasticsearch-6] (Beta) |
-| [Filebeat](./filebeat/README.md)           | [`7.15.0`][filebeat-7] (GA since 7.7.0)      | [`6.8.18`][filebeat-6] (Beta)      |
-| [Kibana](./kibana/README.md)               | [`7.15.0`][kibana-7] (GA since 7.7.0)        | [`6.8.18`][kibana-6] (Beta)        |
-| [Logstash](./logstash/README.md)           | [`7.15.0`][logstash-7] (Beta since 7.5.0)    | [`6.8.18`][logstash-6] (Beta)      |
-| [Metricbeat](./metricbeat/README.md)       | [`7.15.0`][metricbeat-7] (GA since 7.7.0)    | [`6.8.18`][metricbeat-6] (Beta)    |
+| [APM-Server](./apm-server/README.md)       | [`7.16.1`][apm-7] (Beta since 7.7.0)         | [`6.8.21`][apm-6] (Alpha)          |
+| [Elasticsearch](./elasticsearch/README.md) | [`7.16.1`][elasticsearch-7] (GA since 7.7.0) | [`6.8.21`][elasticsearch-6] (Beta) |
+| [Filebeat](./filebeat/README.md)           | [`7.16.1`][filebeat-7] (GA since 7.7.0)      | [`6.8.21`][filebeat-6] (Beta)      |
+| [Kibana](./kibana/README.md)               | [`7.16.1`][kibana-7] (GA since 7.7.0)        | [`6.8.21`][kibana-6] (Beta)        |
+| [Logstash](./logstash/README.md)           | [`7.16.1`][logstash-7] (Beta since 7.5.0)    | [`6.8.21`][logstash-6] (Beta)      |
+| [Metricbeat](./metricbeat/README.md)       | [`7.16.1`][metricbeat-7] (GA since 7.7.0)    | [`6.8.21`][metricbeat-6] (Beta)    |
 
 ### Kubernetes Versions
 
@@ -80,15 +81,15 @@ Kubernetes. There is a dedicated Helm chart for ECK which can be found
 [helpers/matrix.yml]: https://github.com/elastic/helm-charts/blob/main/helpers/matrix.yml
 [operator pattern]: https://kubernetes.io/docs/concepts/extend-kubernetes/operator/
 [elasticsearch-771]: https://github.com/elastic/helm-charts/tree/7.7.1/elasticsearch/
-[apm-7]: https://github.com/elastic/helm-charts/tree/7.15.0/apm-server/README.md
-[apm-6]: https://github.com/elastic/helm-charts/tree/6.8.18/apm-server/README.md
-[elasticsearch-7]: https://github.com/elastic/helm-charts/tree/7.15.0/elasticsearch/README.md
-[elasticsearch-6]: https://github.com/elastic/helm-charts/tree/6.8.18/elasticsearch/README.md
-[filebeat-7]: https://github.com/elastic/helm-charts/tree/7.15.0/filebeat/README.md
-[filebeat-6]: https://github.com/elastic/helm-charts/tree/6.8.18/filebeat/README.md
-[kibana-7]: https://github.com/elastic/helm-charts/tree/7.15.0/kibana/README.md
-[kibana-6]: https://github.com/elastic/helm-charts/tree/6.8.18/kibana/README.md
-[logstash-7]: https://github.com/elastic/helm-charts/tree/7.15.0/logstash/README.md
-[logstash-6]: https://github.com/elastic/helm-charts/tree/6.8.18/logstash/README.md
-[metricbeat-7]: https://github.com/elastic/helm-charts/tree/7.15.0/metricbeat/README.md
-[metricbeat-6]: https://github.com/elastic/helm-charts/tree/6.8.18/metricbeat/README.md
+[apm-7]: https://github.com/elastic/helm-charts/tree/7.16/apm-server/README.md
+[apm-6]: https://github.com/elastic/helm-charts/tree/6.8/apm-server/README.md
+[elasticsearch-7]: https://github.com/elastic/helm-charts/tree/7.16/elasticsearch/README.md
+[elasticsearch-6]: https://github.com/elastic/helm-charts/tree/6.8/elasticsearch/README.md
+[filebeat-7]: https://github.com/elastic/helm-charts/tree/7.16/filebeat/README.md
+[filebeat-6]: https://github.com/elastic/helm-charts/tree/6.8/filebeat/README.md
+[kibana-7]: https://github.com/elastic/helm-charts/tree/7.16/kibana/README.md
+[kibana-6]: https://github.com/elastic/helm-charts/tree/6.8/kibana/README.md
+[logstash-7]: https://github.com/elastic/helm-charts/tree/7.16/logstash/README.md
+[logstash-6]: https://github.com/elastic/helm-charts/tree/6.8/logstash/README.md
+[metricbeat-7]: https://github.com/elastic/helm-charts/tree/7.16/metricbeat/README.md
+[metricbeat-6]: https://github.com/elastic/helm-charts/tree/6.8/metricbeat/README.md

elasticsearch/values.yaml

@@ -246,10 +246,10 @@ tolerations: []
 ingress:
   enabled: false
   annotations: {}
-  className: "nginx"
-  pathtype: ImplementationSpecific
   # kubernetes.io/ingress.class: nginx
   # kubernetes.io/tls-acme: "true"
+  className: "nginx"
+  pathtype: ImplementationSpecific
   hosts:
     - host: chart-example.local
       paths: