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

Commit

Permalink
bump 7.x branch to 7.9.0-SNAPSHOT (#661)
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.9.0-SNAPSHOT via dedicated Jenkins jobs
- test the staging 7.9.x Docker images before a release

This is also backporting some updates in README files that were made in other branches and fixing the links to Elastic documentation.
  • Loading branch information
jmlrt authored Jun 12, 2020
1 parent 285914a commit 487e73b
Show file tree
Hide file tree
Showing 71 changed files with 295 additions and 472 deletions.
188 changes: 0 additions & 188 deletions BREAKING_CHANGES.md

This file was deleted.

48 changes: 40 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,19 @@

[![Build Status](https://img.shields.io/jenkins/s/https/devops-ci.elastic.co/job/elastic+helm-charts+7.x.svg)](https://devops-ci.elastic.co/job/elastic+helm-charts+7.x/)

This functionality is in beta and is subject to change. The design and code is
less mature than official GA features and is being provided as-is with no
warranties. Beta features are not subject to the support SLA of official GA
features.
<!-- 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)
- [Support Matrix](#support-matrix)
- [Kubernetes Versions](#kubernetes-versions)
- [Helm versions](#helm-versions)
- [ECK](#eck)

<!-- END doctoc generated TOC please keep comment here to allow auto update -->


## Charts

Expand All @@ -14,22 +23,43 @@ Helm charts are designed to be a lightweight way to configure our official
Docker images. Links to the relevant Docker image documentation has also been
added below.

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

## Kubernetes Versions
## Supported Configurations

Starting with 7.7.0 release, some charts are reaching GA.

Note that only the released charts coming from [Elastic Helm repo][] or
[GitHub releases][] are supported.

### Support Matrix

| | Elasticsearch | Kibana | Logstash | Filebeat | Metricbeat | APM Server |
|-----|---------------|--------|----------|----------|------------|------------|
| 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 |

### Kubernetes Versions

The charts are [currently tested][] against all GKE versions available. The
exact versions are defined under `KUBERNETES_VERSIONS` in
[helpers/matrix.yml][].

## Helm versions
### Helm versions

While we are checking backward compatibility, the charts are only tested with
Helm version mentioned in [helm-tester Dockerfile][] (currently 2.16.8).
Expand All @@ -45,6 +75,8 @@ Kubernetes.

[currently tested]: https://devops-ci.elastic.co/job/elastic+helm-charts+7.x/
[elastic cloud on kubernetes]: https://github.com/elastic/cloud-on-k8s
[elastic helm repo]: https://helm.elastic.co
[github releases]: https://github.com/elastic/helm-charts/releases
[helm 3]: https://v3.helm.sh
[helm-tester Dockerfile]: https://github.com/elastic/helm-charts/blob/7.x/helpers/helm-tester/Dockerfile
[helpers/matrix.yml]: https://github.com/elastic/helm-charts/blob/7.x/helpers/matrix.yml
Expand Down
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: helm-charts@elastic.co
name: Elastic
name: apm-server
version: 7.8.0-SNAPSHOT
appVersion: 7.8.0-SNAPSHOT
version: 7.9.0-SNAPSHOT
appVersion: 7.9.0-SNAPSHOT
sources:
- https://github.com/elastic/apm
icon: https://helm.elastic.co/icons/apm.png
53 changes: 27 additions & 26 deletions apm-server/README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
# APM Server Helm Chart

This Helm chart is a lightweight way to configure and run our official
[APM Server Docker image][].

**Warning**: This functionality is in alpha and is subject to change.
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
for released version.


<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->


- [Requirements](#requirements)
- [Installing](#installing)
- [Using Helm repository](#using-helm-repository)
- [Using the 7.x branch](#using-the-7x-branch)
- [Install released version using Helm repository](#install-released-version-using-helm-repository)
- [Install development version using 7.x branch and 7.9.0-SNAPSHOT versions](#install-development-version-using-7x-branch-and-790-snapshot-versions)
- [Upgrading](#upgrading)
- [Usage notes](#usage-notes)
- [Configuration](#configuration)
Expand All @@ -20,45 +33,31 @@
<!-- docker run --rm -it -v $(pwd):/usr/src jorgeandrada/doctoc --github -->


This functionality is in alpha and is subject to change. 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.

This Helm chart is a lightweight way to configure and run our official
[APM Server Docker image][].


## Requirements

* Kubernetes >= 1.9
* [Helm][] >= 2.8.0

See [supported configurations][] for more details.


## Installing

This chart is tested with the latest 7.8.0-SNAPSHOT versions.
This chart is tested with the latest 7.9.0-SNAPSHOT versions.

### Using Helm repository
### Install released version using Helm repository

* Add the Elastic Helm charts repo:
`helm repo add elastic https://helm.elastic.co`

* Install the latest 7.8 release:
`helm install --name apm-server elastic/apm-server --version=7.8.0`

### Using the 7.x branch
* Install the latest 7.7 release:
`helm install --name apm-server elastic/apm-server`

* Clone the git repo and checkout the right branch:
### Install development version using 7.x branch and 7.9.0-SNAPSHOT versions

```shell
git clone git@github.com:elastic/helm-charts.git
cd helm-charts
git checkout -b 7.x origin/7.x
````
* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git`

* Install the latest 7.8.0-SNAPSHOT:
`helm install --name apm-server ./helm-charts/apm-server`
* Install it: `helm install --name apm-server ./helm-charts/apm-server`


## Upgrading
Expand Down Expand Up @@ -96,7 +95,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.8.0-SNAPSHOT` |
| `imageTag` | The APM Server Docker image tag | `7.9.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 @@ -144,6 +143,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
[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
Expand Down Expand Up @@ -172,6 +172,7 @@ about our development and testing process.
[resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
[service]: https://kubernetes.io/docs/concepts/services-networking/service/
[serviceAccount]: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
[supported configurations]: https://github.com/elastic/helm-charts/tree/7.x/README.md#supported-configurations
[tolerations]: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
[updateStrategy]: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#updating-a-deployment
[values.yaml]: https://github.com/elastic/helm-charts/tree/7.x/apm-server/values.yaml
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.8.0-SNAPSHOT using [default values][].
This example deploy APM Server 7.9.0-SNAPSHOT using [default values][].


## Usage
Expand Down
Loading

0 comments on commit 487e73b

Please sign in to comment.