Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
[meta] bump 7.x branch to 7.11.0-SNAPSHOT (#915)
Browse files Browse the repository at this point in the history
This commit bump the 7.x branch which will be dedicated to the 7.x.x releases for the Helm Charts. It will allow to:

- test this branch with the daily Stack Docker images 7.11.0-SNAPSHOT via dedicated Jenkins jobs
  • Loading branch information
jmlrt authored Nov 19, 2020
1 parent e208bab commit 1f42032
Show file tree
Hide file tree
Showing 69 changed files with 153 additions and 151 deletions.
66 changes: 34 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ The `master` version of these charts are intended to support the latest pre-rele
versions of our products, and therefore may or may not work with current released
versions.

| Chart | Docker documentation | Latest 7 Version | Latest 6 Version |
|--------------------------------------------|---------------------------------------------------------------------------------|----------------------------|-----------------------------|
| [APM-Server](./apm-server/README.md) | https://www.elastic.co/guide/en/apm/server/current/running-on-docker.html | [`7.9.3`][apm-7] | [`6.8.13`][apm-6] |
| [Elasticsearch](./elasticsearch/README.md) | https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html | [`7.9.3`][elasticsearch-7] | [`6.8.13`][elasticsearch-6] |
| [Filebeat](./filebeat/README.md) | https://www.elastic.co/guide/en/beats/filebeat/current/running-on-docker.html | [`7.9.3`][filebeat-7] | [`6.8.13`][filebeat-6] |
| [Kibana](./kibana/README.md) | https://www.elastic.co/guide/en/kibana/current/docker.html | [`7.9.3`][kibana-7] | [`6.8.13`][kibana-6] |
| [Logstash](./logstash/README.md) | https://www.elastic.co/guide/en/logstash/current/docker.html | [`7.9.3`][logstash-7] | [`6.8.13`][logstash-6] |
| [Metricbeat](./metricbeat/README.md) | https://www.elastic.co/guide/en/beats/metricbeat/current/running-on-docker.html | [`7.9.3`][metricbeat-7] | [`6.8.13`][metricbeat-6] |
| Chart | Docker documentation | Latest 7 Version | Latest 6 Version |
|--------------------------------------------|---------------------------------------------------------------------------------|-----------------------------|-----------------------------|
| [APM-Server](./apm-server/README.md) | https://www.elastic.co/guide/en/apm/server/current/running-on-docker.html | [`7.10.0`][apm-7] | [`6.8.13`][apm-6] |
| [Elasticsearch](./elasticsearch/README.md) | https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html | [`7.10.0`][elasticsearch-7] | [`6.8.13`][elasticsearch-6] |
| [Filebeat](./filebeat/README.md) | https://www.elastic.co/guide/en/beats/filebeat/current/running-on-docker.html | [`7.10.0`][filebeat-7] | [`6.8.13`][filebeat-6] |
| [Kibana](./kibana/README.md) | https://www.elastic.co/guide/en/kibana/current/docker.html | [`7.10.0`][kibana-7] | [`6.8.13`][kibana-6] |
| [Logstash](./logstash/README.md) | https://www.elastic.co/guide/en/logstash/current/docker.html | [`7.10.0`][logstash-7] | [`6.8.13`][logstash-6] |
| [Metricbeat](./metricbeat/README.md) | https://www.elastic.co/guide/en/beats/metricbeat/current/running-on-docker.html | [`7.10.0`][metricbeat-7] | [`6.8.13`][metricbeat-6] |

## Supported Configurations

Expand All @@ -53,18 +53,20 @@ Note that only the released charts coming from [Elastic Helm repo][] or

### Support Matrix

| | Elasticsearch | Kibana | Logstash | Filebeat | Metricbeat | APM Server |
|-----|---------------|--------|----------|----------|------------|------------|
| 6.8 | Beta | Beta | Beta | Beta | Beta | Alpha |
| 7.0 | Alpha | Alpha | / | / | / | / |
| 7.1 | Beta | Beta | / | Beta | / | / |
| 7.2 | Beta | Beta | / | Beta | Beta | / |
| 7.3 | Beta | Beta | / | Beta | Beta | / |
| 7.4 | Beta | Beta | / | Beta | Beta | / |
| 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.x | GA | GA | Beta | GA | GA | Beta |
| | Elasticsearch | Kibana | Logstash | Filebeat | Metricbeat | APM Server |
|------|---------------|--------|----------|----------|------------|------------|
| 6.8 | Beta | Beta | Beta | Beta | Beta | Alpha |
| 7.0 | Alpha | Alpha | / | / | / | / |
| 7.1 | Beta | Beta | / | Beta | / | / |
| 7.2 | Beta | Beta | / | Beta | Beta | / |
| 7.3 | Beta | Beta | / | Beta | Beta | / |
| 7.4 | Beta | Beta | / | Beta | Beta | / |
| 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 |
| 7.9 | GA | GA | Beta | GA | GA | Beta |
| 7.10 | GA | GA | Beta | GA | GA | Beta |

### Kubernetes Versions

Expand Down Expand Up @@ -98,15 +100,15 @@ Kubernetes. There is a dedicated Helm chart for ECK which can be found
[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.8.1/apm-server/README.md
[apm-6]: https://github.com/elastic/helm-charts/tree/6.8.10/apm-server/README.md
[elasticsearch-7]: https://github.com/elastic/helm-charts/tree/7.8.1/elasticsearch/README.md
[elasticsearch-6]: https://github.com/elastic/helm-charts/tree/6.8.10/elasticsearch/README.md
[filebeat-7]: https://github.com/elastic/helm-charts/tree/7.8.1/filebeat/README.md
[filebeat-6]: https://github.com/elastic/helm-charts/tree/6.8.10/filebeat/README.md
[kibana-7]: https://github.com/elastic/helm-charts/tree/7.8.1/kibana/README.md
[kibana-6]: https://github.com/elastic/helm-charts/tree/6.8.10/kibana/README.md
[logstash-7]: https://github.com/elastic/helm-charts/tree/7.8.1/logstash/README.md
[logstash-6]: https://github.com/elastic/helm-charts/tree/6.8.10/logstash/README.md
[metricbeat-7]: https://github.com/elastic/helm-charts/tree/7.8.1/metricbeat/README.md
[metricbeat-6]: https://github.com/elastic/helm-charts/tree/6.8.10/metricbeat/README.md
[apm-7]: https://github.com/elastic/helm-charts/tree/7.10.0/apm-server/README.md
[apm-6]: https://github.com/elastic/helm-charts/tree/6.8.13/apm-server/README.md
[elasticsearch-7]: https://github.com/elastic/helm-charts/tree/7.10.0/elasticsearch/README.md
[elasticsearch-6]: https://github.com/elastic/helm-charts/tree/6.8.13/elasticsearch/README.md
[filebeat-7]: https://github.com/elastic/helm-charts/tree/7.10.0/filebeat/README.md
[filebeat-6]: https://github.com/elastic/helm-charts/tree/6.8.13/filebeat/README.md
[kibana-7]: https://github.com/elastic/helm-charts/tree/7.10.0/kibana/README.md
[kibana-6]: https://github.com/elastic/helm-charts/tree/6.8.13/kibana/README.md
[logstash-7]: https://github.com/elastic/helm-charts/tree/7.10.0/logstash/README.md
[logstash-6]: https://github.com/elastic/helm-charts/tree/6.8.13/logstash/README.md
[metricbeat-7]: https://github.com/elastic/helm-charts/tree/7.10.0/metricbeat/README.md
[metricbeat-6]: https://github.com/elastic/helm-charts/tree/6.8.13/metricbeat/README.md
4 changes: 2 additions & 2 deletions apm-server/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ maintainers:
- email: [email protected]
name: Elastic
name: apm-server
version: 7.10.0-SNAPSHOT
appVersion: 7.10.0-SNAPSHOT
version: 7.11.0-SNAPSHOT
appVersion: 7.11.0-SNAPSHOT
sources:
- https://github.com/elastic/apm
icon: https://helm.elastic.co/icons/apm.png
14 changes: 7 additions & 7 deletions apm-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SLA of official GA features (see [supported configurations][] for more details).
- [Requirements](#requirements)
- [Installing](#installing)
- [Install released version using Helm repository](#install-released-version-using-helm-repository)
- [Install development version using 7.x branch and 7.10.0-SNAPSHOT versions](#install-development-version-using-7x-branch-and-7100-snapshot-versions)
- [Install development version using 7.x branch and 7.11.0-SNAPSHOT versions](#install-development-version-using-7x-branch-and-7110-snapshot-versions)
- [Upgrading](#upgrading)
- [Usage notes](#usage-notes)
- [Configuration](#configuration)
Expand All @@ -42,7 +42,7 @@ See [supported configurations][] for more details.

## Installing

This chart is tested with the latest 7.10.0-SNAPSHOT versions.
This chart is tested with the latest 7.11.0-SNAPSHOT versions.

### Install released version using Helm repository

Expand All @@ -54,13 +54,13 @@ This chart is tested with the latest 7.10.0-SNAPSHOT versions.
- with Helm 2 (deprecated): `helm install --name apm-server --version <version> elastic/apm-server`


### Install development version using 7.x branch and 7.10.0-SNAPSHOT versions
### Install development version using 7.x branch and 7.11.0-SNAPSHOT versions

* Clone the git repo: `git clone [email protected]:elastic/helm-charts.git`

* Install it:
- with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=7.10.0-SNAPSHOT`
- with Helm 2 (deprecated): `helm install --name apm-server ./helm-charts/apm-server --set imageTag=7.10.0-SNAPSHOT`
- with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=7.11.0-SNAPSHOT`
- with Helm 2 (deprecated): `helm install --name apm-server ./helm-charts/apm-server --set imageTag=7.11.0-SNAPSHOT`


## Upgrading
Expand Down Expand Up @@ -98,7 +98,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.10.0-SNAPSHOT` |
| `imageTag` | The APM Server Docker image tag | `7.11.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 | `{}` |
Expand Down Expand Up @@ -152,7 +152,7 @@ about our development and testing process.
[CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md
[affinity]: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
[annotations]: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
[apm server docker image]: https://www.elastic.co/guide/en/apm/server/7.9/running-on-docker.html
[apm server docker image]: https://www.elastic.co/guide/en/apm/server/7.10/running-on-docker.html
[apm server oss docker image]: https://www.docker.elastic.co/r/apm/apm-server-oss
[default elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.x/elasticsearch/README.md#default
[environment variables]: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config
Expand Down
2 changes: 1 addition & 1 deletion apm-server/examples/default/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Default

This example deploy APM Server 7.10.0-SNAPSHOT using [default values][].
This example deploy APM Server 7.11.0-SNAPSHOT using [default values][].


## Usage
Expand Down
2 changes: 1 addition & 1 deletion apm-server/examples/default/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ http:
status: 200
timeout: 2000
body:
- '7.10.0'
- "7.11.0"
2 changes: 1 addition & 1 deletion apm-server/examples/oss/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OSS

This example deploy APM Server 7.10.0-SNAPSHOT using [APM Server OSS][] version.
This example deploy APM Server 7.11.0-SNAPSHOT using [APM Server OSS][] version.


## Usage
Expand Down
2 changes: 1 addition & 1 deletion apm-server/examples/oss/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ http:
status: 200
timeout: 2000
body:
- '7.10.0'
- "7.11.0"
2 changes: 1 addition & 1 deletion apm-server/examples/security/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Security

This example deploy APM Server 7.10.0-SNAPSHOT using authentication and TLS to connect to
This example deploy APM Server 7.11.0-SNAPSHOT using authentication and TLS to connect to
Elasticsearch (see [values][]).


Expand Down
2 changes: 1 addition & 1 deletion apm-server/examples/security/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ http:
status: 200
timeout: 2000
body:
- '7.10.0'
- "7.11.0"
2 changes: 1 addition & 1 deletion apm-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ extraVolumes: []
# emptyDir: {}

image: "docker.elastic.co/apm/apm-server"
imageTag: "7.10.0-SNAPSHOT"
imageTag: "7.11.0-SNAPSHOT"
imagePullPolicy: "IfNotPresent"
imagePullSecrets: []

Expand Down
4 changes: 2 additions & 2 deletions elasticsearch/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ maintainers:
- email: [email protected]
name: Elastic
name: elasticsearch
version: 7.10.0-SNAPSHOT
appVersion: 7.10.0-SNAPSHOT
version: 7.11.0-SNAPSHOT
appVersion: 7.11.0-SNAPSHOT
sources:
- https://github.com/elastic/elasticsearch
icon: https://helm.elastic.co/icons/elasticsearch.png
12 changes: 6 additions & 6 deletions elasticsearch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This Helm chart is a lightweight way to configure and run our official
- [Requirements](#requirements)
- [Installing](#installing)
- [Install released version using Helm repository](#install-released-version-using-helm-repository)
- [Install development version using 7.x branch and 7.10.0-SNAPSHOT versions](#install-development-version-using-7x-branch-and-7100-snapshot-versions)
- [Install development version using 7.x branch and 7.11.0-SNAPSHOT versions](#install-development-version-using-7x-branch-and-7110-snapshot-versions)
- [Upgrading](#upgrading)
- [Usage notes](#usage-notes)
- [Configuration](#configuration)
Expand Down Expand Up @@ -52,7 +52,7 @@ See [supported configurations][] for more details.

## Installing

This chart is tested with the latest 7.10.0-SNAPSHOT versions.
This chart is tested with the latest 7.11.0-SNAPSHOT versions.

### Install released version using Helm repository

Expand All @@ -65,13 +65,13 @@ This chart is tested with the latest 7.10.0-SNAPSHOT versions.



### Install development version using 7.x branch and 7.10.0-SNAPSHOT versions
### Install development version using 7.x branch and 7.11.0-SNAPSHOT versions

* Clone the git repo: `git clone [email protected]:elastic/helm-charts.git`

* Install it:
- with Helm 3: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=7.10.0-SNAPSHOT`
- with Helm 2 (deprecated): `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=7.10.0-SNAPSHOT`
- with Helm 3: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=7.11.0-SNAPSHOT`
- with Helm 2 (deprecated): `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=7.11.0-SNAPSHOT`


## Upgrading
Expand Down Expand Up @@ -127,7 +127,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.10.0-SNAPSHOT` |
| `imageTag` | The Elasticsearch Docker image tag | `7.11.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 | `{}` |
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/config/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Config

This example deploy a single node Elasticsearch 7.10.0-SNAPSHOT with authentication and
This example deploy a single node Elasticsearch 7.11.0-SNAPSHOT with authentication and
custom [values][].


Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/default/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Default

This example deploy a 3 nodes Elasticsearch 7.10.0-SNAPSHOT cluster using
This example deploy a 3 nodes Elasticsearch 7.11.0-SNAPSHOT cluster using
[default values][].


Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/default/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ http:
status: 200
timeout: 2000
body:
- '"number" : "7.10.0-SNAPSHOT"'
- '"number" : "7.11.0-SNAPSHOT"'
- '"cluster_name" : "elasticsearch"'
- '"name" : "elasticsearch-master-0"'
- 'You Know, for Search'
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/docker-for-mac/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docker for Mac

This example deploy a 3 nodes Elasticsearch 7.10.0-SNAPSHOT cluster on [Docker for Mac][]
This example deploy a 3 nodes Elasticsearch 7.11.0-SNAPSHOT cluster on [Docker for Mac][]
using [custom values][].

Note that this configuration should be used for test only and isn't recommended
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/kubernetes-kind/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# KIND

This example deploy a 3 nodes Elasticsearch 7.10.0-SNAPSHOT cluster on [Kind][]
This example deploy a 3 nodes Elasticsearch 7.11.0-SNAPSHOT cluster on [Kind][]
using [custom values][].

Note that this configuration should be used for test only and isn't recommended
Expand Down
Loading

0 comments on commit 1f42032

Please sign in to comment.