Merge branch 'master' into logstash-headless-service

elastic · Jun 29, 2020 · 4386dc9 · 4386dc9
2 parents 6415080 + e972482
commit 4386dc9
Show file tree

Hide file tree

Showing 103 changed files with 170 additions and 931 deletions.
diff --git 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
@@ -5,8 +5,8 @@ maintainers:
 - email: [email protected]
   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
@@ -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.
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
@@ -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 [email protected]: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
diff --git a/apm-server/examples/6.x/README.md b/apm-server/examples/6.x/README.md
diff --git a/apm-server/examples/6.x/test/goss.yaml b/apm-server/examples/6.x/test/goss.yaml
diff --git a/apm-server/examples/6.x/values.yaml b/apm-server/examples/6.x/values.yaml
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,8 +5,8 @@ maintainers:
 - email: [email protected]
   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
@@ -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.
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
@@ -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 [email protected]: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
diff --git a/elasticsearch/examples/6.x/README.md b/elasticsearch/examples/6.x/README.md
diff --git a/elasticsearch/examples/6.x/test/goss.yaml b/elasticsearch/examples/6.x/test/goss.yaml
diff --git a/elasticsearch/examples/6.x/values.yaml b/elasticsearch/examples/6.x/values.yaml
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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