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

Commit

Permalink
Bump 6.8 branch to 6.8.14-SNAPSHOT (elastic#871)
Browse files Browse the repository at this point in the history
Co-authored-by: Nassim Kammah <nassim.kammah@elastic.co>
  • Loading branch information
elasticmachine and nkammah authored Oct 26, 2020
1 parent 3d92c5f commit 3ef7a27
Show file tree
Hide file tree
Showing 65 changed files with 126 additions and 120 deletions.
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: 6.8.13
appVersion: 6.8.13
version: 6.8.14-SNAPSHOT
appVersion: 6.8.14-SNAPSHOT
sources:
- https://github.com/elastic/apm
icon: https://helm.elastic.co/icons/apm.png
15 changes: 8 additions & 7 deletions apm-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ 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 the latest [6.x][] 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)
- [Install released version using Helm repository](#install-released-version-using-helm-repository)
- [Install development version using 6.8 branch and 6.8.13 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
- [Install development version using 6.8 branch and 6.8.14-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
- [Upgrading](#upgrading)
- [Usage notes](#usage-notes)
- [Configuration](#configuration)
Expand All @@ -39,7 +40,7 @@ See [supported configurations][] for more details.

## Installing

This chart is tested with the latest 6.8.13 version.
This chart is tested with the latest 6.8.14-SNAPSHOT version.

### Install released version using Helm repository

Expand All @@ -50,15 +51,15 @@ This chart is tested with the latest 6.8.13 version.
- with Helm 2: `helm install --name apm-server --version <version> elastic/apm-server`
- with [Helm 3 (beta)][]: `helm install apm-server --version <version> elastic/apm-server`

### Install development version using 6.8 branch and 6.8.13 versions
### Install development version using 6.8 branch and 6.8.14-SNAPSHOT versions

* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git`

* Checkout the branch : git checkout 6.8

* Install it:
- with Helm 2: `helm install --name apm-server --version 6.8.13 ./helm-charts/apm-server`
- with [Helm 3 (beta)][]: `helm install apm-server --version 6.8.13 ./helm-charts/apm-server`
- with Helm 2: `helm install --name apm-server --version 6.8.14-SNAPSHOT ./helm-charts/apm-server`
- with [Helm 3 (beta)][]: `helm install apm-server --version 6.8.14-SNAPSHOT ./helm-charts/apm-server`


## Upgrading
Expand Down Expand Up @@ -96,7 +97,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 | `6.8.13` |
| `imageTag` | The APM Server Docker image tag | `6.8.14-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 @@ -145,7 +146,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions
about our development and testing process.

[6.x]: https://github.com/elastic/helm-charts/releases
[6.8.13]: https://github.com/elastic/helm-charts/blob/6.8.13/apm-server/README.md
[6.8.14-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.14-SNAPSHOT/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
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 6.8.13 using [default values][].
This example deploy APM Server 6.8.14-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:
- '6.8.13'
- '6.8.14'
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 6.8.13 using [APM Server OSS][] version.
This example deploy APM Server 6.8.14-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:
- '6.8.13'
- '6.8.14'
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 6.8.13 using authentication and TLS to connect to
This example deploy APM Server 6.8.14-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:
- '6.8.13'
- '6.8.14'
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: "6.8.13"
imageTag: "6.8.14-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: helm-charts@elastic.co
name: Elastic
name: elasticsearch
version: 6.8.13
appVersion: 6.8.13
version: 6.8.14-SNAPSHOT
appVersion: 6.8.14-SNAPSHOT
sources:
- https://github.com/elastic/elasticsearch
icon: https://helm.elastic.co/icons/elasticsearch.png
15 changes: 8 additions & 7 deletions elasticsearch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
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 the latest [6.x][] 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)
- [Install released version using Helm repository](#install-released-version-using-helm-repository)
- [Install development version using 6.8 branch and 6.8.13 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
- [Install development version using 6.8 branch and 6.8.14-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
- [Upgrading](#upgrading)
- [Usage notes](#usage-notes)
- [Configuration](#configuration)
Expand Down Expand Up @@ -50,7 +51,7 @@ See [supported configurations][] for more details.

## Installing

This chart is tested with the latest 6.8.13 version.
This chart is tested with the latest 6.8.14-SNAPSHOT version.

### Install released version using Helm repository

Expand All @@ -61,15 +62,15 @@ This chart is tested with the latest 6.8.13 version.
- with Helm 2: `helm install --name elasticsearch --version <version> elastic/elasticsearch`
- with [Helm 3 (beta)][]: `helm install elasticsearch --version <version> elastic/elasticsearch`

### Install development version using 6.8 branch and 6.8.13 versions
### Install development version using 6.8 branch and 6.8.14-SNAPSHOT versions

* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git`

* Checkout the branch : git checkout 6.8

* Install it:
- with Helm 2: `helm install --name elasticsearch --version 6.8.13 ./helm-charts/elasticsearch`
- with [Helm 3 (beta)][]: `helm install elasticsearch --version 6.8.13 ./helm-charts/elasticsearch`
- with Helm 2: `helm install --name elasticsearch --version 6.8.14-SNAPSHOT ./helm-charts/elasticsearch`
- with [Helm 3 (beta)][]: `helm install elasticsearch --version 6.8.14-SNAPSHOT ./helm-charts/elasticsearch`

## Upgrading

Expand Down Expand Up @@ -124,7 +125,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 | `6.8.13` |
| `imageTag` | The Elasticsearch Docker image tag | `6.8.14-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 Expand Up @@ -387,7 +388,7 @@ about our development and testing process.
[6.x]: https://github.com/elastic/helm-charts/releases
[#63]: https://github.com/elastic/helm-charts/issues/63
[6.8.13]: https://github.com/elastic/helm-charts/blob/6.8.13/elasticsearch/README.md
[6.8.14-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.14-SNAPSHOT/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
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 6.8.13 with authentication and
This example deploy a single node Elasticsearch 6.8.14-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 6.8.13 cluster using
This example deploy a 3 nodes Elasticsearch 6.8.14-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" : "6.8.13"'
- '"number" : "6.8.14"'
- '"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 6.8.13 cluster on [Docker for Mac][]
This example deploy a 3 nodes Elasticsearch 6.8.14-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 6.8.13 cluster on [Kind][]
This example deploy a 3 nodes Elasticsearch 6.8.14-SNAPSHOT cluster on [Kind][]
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/microk8s/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MicroK8S

This example deploy a 3 nodes Elasticsearch 6.8.13 cluster on [MicroK8S][]
This example deploy a 3 nodes Elasticsearch 6.8.14-SNAPSHOT cluster on [MicroK8S][]
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/minikube/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Minikube

This example deploy a 3 nodes Elasticsearch 6.8.13 cluster on [Minikube][]
This example deploy a 3 nodes Elasticsearch 6.8.14-SNAPSHOT cluster on [Minikube][]
using [custom values][].

If helm or kubectl timeouts occur, you may consider creating a minikube VM with
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/multi/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Multi

This example deploy an Elasticsearch 6.8.13 cluster composed of 2 different Helm
This example deploy an Elasticsearch 6.8.14-SNAPSHOT cluster composed of 2 different Helm
releases:

- `helm-es-multi-master` for the 3 master nodes using [master values][]
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/openshift/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OpenShift

This example deploy a 3 nodes Elasticsearch 6.8.13 cluster on [OpenShift][]
This example deploy a 3 nodes Elasticsearch 6.8.14-SNAPSHOT cluster on [OpenShift][]
using [custom values][].

## Usage
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/openshift/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ http:
status: 200
timeout: 2000
body:
- '"number" : "6.8.13"'
- '"number" : "6.8.14"'
- '"cluster_name" : "elasticsearch"'
- '"name" : "elasticsearch-master-0"'
- 'You Know, for Search'
2 changes: 1 addition & 1 deletion elasticsearch/examples/oss/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OSS

This example deploy a 3 nodes Elasticsearch 6.8.13 cluster using
This example deploy a 3 nodes Elasticsearch 6.8.14-SNAPSHOT cluster using
[Elasticsearch OSS][] version.

## Usage
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/oss/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ http:
status: 200
timeout: 2000
body:
- '"number" : "6.8.13"'
- '"number" : "6.8.14"'
- '"cluster_name" : "oss"'
- '"name" : "oss-master-0"'
- 'You Know, for Search'
2 changes: 1 addition & 1 deletion elasticsearch/examples/security/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Security

This example deploy a 3 nodes Elasticsearch 6.8.13 with authentication and
This example deploy a 3 nodes Elasticsearch 6.8.14-SNAPSHOT with authentication and
autogenerated certificates for TLS (see [values][]).

Note that this configuration should be used for test only. For a production
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ secretMounts: []
# defaultMode: 0755

image: "docker.elastic.co/elasticsearch/elasticsearch"
imageTag: "6.8.13"
imageTag: "6.8.14-SNAPSHOT"
imagePullPolicy: "IfNotPresent"

podAnnotations: {}
Expand Down
4 changes: 2 additions & 2 deletions filebeat/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: filebeat
version: 6.8.13
appVersion: 6.8.13
version: 6.8.14-SNAPSHOT
appVersion: 6.8.14-SNAPSHOT
sources:
- https://github.com/elastic/beats
icon: https://helm.elastic.co/icons/beats.png
Loading

0 comments on commit 3ef7a27

Please sign in to comment.