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.15.0-SNAPSHOT (#1316)
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.15.0-SNAPSHOT via dedicated Jenkins jobs
  • Loading branch information
jmlrt authored Aug 30, 2021
1 parent 496c604 commit e68195c
Show file tree
Hide file tree
Showing 72 changed files with 113 additions and 113 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: 7.14.0-SNAPSHOT
appVersion: 7.14.0-SNAPSHOT
version: 7.15.0-SNAPSHOT
appVersion: 7.15.0-SNAPSHOT
sources:
- https://github.com/elastic/apm
icon: https://helm.elastic.co/icons/apm.png
10 changes: 5 additions & 5 deletions apm-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ See [supported configurations][] for more details.

## Installing

This chart is tested with the latest 7.14.0-SNAPSHOT version.
This chart is tested with the latest 7.15.0-SNAPSHOT version.

### Install released version using Helm repository

Expand All @@ -62,8 +62,8 @@ This chart is tested with the latest 7.14.0-SNAPSHOT version.
* Checkout the branch : `git checkout 7.x`

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


## Upgrading
Expand Down Expand Up @@ -102,7 +102,7 @@ as a reference. They are also used in the automated testing of this chart.
| `hostAliases` | Configurable [hostAliases][] | `[]` |
| `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.14.0-SNAPSHOT` |
| `imageTag` | The APM Server Docker image tag | `7.15.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 @@ -156,7 +156,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.14/running-on-docker.html
[apm server docker image]: https://www.elastic.co/guide/en/apm/server/7.15/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.14.0-SNAPSHOT using [default values][].
This example deploy APM Server 7.15.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.14.0"
- "7.15.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.14.0-SNAPSHOT using [APM Server OSS][] version.
This example deploy APM Server 7.15.0-SNAPSHOT using [APM Server OSS][] version.


## Usage
Expand Down
4 changes: 2 additions & 2 deletions apm-server/examples/oss/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ http:
status: 200
timeout: 2000
body:
- "7.14.0"
- "7.15.0"
http://elasticsearch-master:9200/_cat/indices:
status: 200
timeout: 2000
body:
- "apm-oss-7.14.0"
- "apm-oss-7.15.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.14.0-SNAPSHOT using authentication and TLS to connect to
This example deploy APM Server 7.15.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.14.0"
- "7.15.0"
2 changes: 1 addition & 1 deletion apm-server/examples/upgrade/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.14.0"
- "7.15.0"
2 changes: 1 addition & 1 deletion apm-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ hostAliases: []
# - "bar.local"

image: "docker.elastic.co/apm/apm-server"
imageTag: "7.14.0-SNAPSHOT"
imageTag: "7.15.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: helm-charts@elastic.co
name: Elastic
name: elasticsearch
version: 7.14.0-SNAPSHOT
appVersion: 7.14.0-SNAPSHOT
version: 7.15.0-SNAPSHOT
appVersion: 7.15.0-SNAPSHOT
sources:
- https://github.com/elastic/elasticsearch
icon: https://helm.elastic.co/icons/elasticsearch.png
8 changes: 4 additions & 4 deletions elasticsearch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ See [supported configurations][] for more details.

## Installing

This chart is tested with the latest 7.14.0-SNAPSHOT version.
This chart is tested with the latest 7.15.0-SNAPSHOT version.

### Install released version using Helm repository

Expand All @@ -71,8 +71,8 @@ This chart is tested with the latest 7.14.0-SNAPSHOT version.
* Checkout the branch : `git checkout 7.x`

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


## Upgrading
Expand Down Expand Up @@ -130,7 +130,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.14.0-SNAPSHOT` |
| `imageTag` | The Elasticsearch Docker image tag | `7.15.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.14.0-SNAPSHOT with authentication and
This example deploy a single node Elasticsearch 7.15.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.14.0-SNAPSHOT cluster using
This example deploy a 3 nodes Elasticsearch 7.15.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.14.0-SNAPSHOT"'
- '"number" : "7.15.0-SNAPSHOT"'
- '"cluster_name" : "elasticsearch"'
- "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.14.0-SNAPSHOT cluster on [Docker for Mac][]
This example deploy a 3 nodes Elasticsearch 7.15.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.14.0-SNAPSHOT cluster on [Kind][]
This example deploy a 3 nodes Elasticsearch 7.15.0-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 7.14.0-SNAPSHOT cluster on [MicroK8S][]
This example deploy a 3 nodes Elasticsearch 7.15.0-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 7.14.0-SNAPSHOT cluster on [Minikube][]
This example deploy a 3 nodes Elasticsearch 7.15.0-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 7.14.0-SNAPSHOT cluster composed of 3 different Helm
This example deploy an Elasticsearch 7.15.0-SNAPSHOT cluster composed of 3 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 7.14.0-SNAPSHOT cluster on [OpenShift][]
This example deploy a 3 nodes Elasticsearch 7.15.0-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,6 +11,6 @@ http:
status: 200
timeout: 2000
body:
- '"number" : "7.14.0"'
- '"number" : "7.15.0"'
- '"cluster_name" : "elasticsearch"'
- "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 7.14.0-SNAPSHOT with authentication and
This example deploy a 3 nodes Elasticsearch 7.15.0-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/examples/upgrade/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ http:
status: 200
timeout: 2000
body:
- '"number" : "7.14.0-SNAPSHOT"'
- '"number" : "7.15.0-SNAPSHOT"'
- '"cluster_name" : "upgrade"'
- "You Know, for Search"
2 changes: 1 addition & 1 deletion elasticsearch/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ hostAliases: []
# - "bar.local"

image: "docker.elastic.co/elasticsearch/elasticsearch"
imageTag: "7.14.0-SNAPSHOT"
imageTag: "7.15.0-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: 7.14.0-SNAPSHOT
appVersion: 7.14.0-SNAPSHOT
version: 7.15.0-SNAPSHOT
appVersion: 7.15.0-SNAPSHOT
sources:
- https://github.com/elastic/beats
icon: https://helm.elastic.co/icons/beats.png
8 changes: 4 additions & 4 deletions filebeat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ See [supported configurations][] for more details.

## Installing

This chart is tested with the latest 7.14.0-SNAPSHOT version.
This chart is tested with the latest 7.15.0-SNAPSHOT version.

### Install released version using Helm repository

Expand All @@ -60,8 +60,8 @@ This chart is tested with the latest 7.14.0-SNAPSHOT version.

* Checkout the branch : `git checkout 7.x`
* Install it:
- with Helm 3: `helm install filebeat ./helm-charts/filebeat --set imageTag=7.14.0-SNAPSHOT`
- with Helm 2 (deprecated): `helm install --name filebeat ./helm-charts/filebeat --set imageTag=7.14.0-SNAPSHOT`
- with Helm 3: `helm install filebeat ./helm-charts/filebeat --set imageTag=7.15.0-SNAPSHOT`
- with Helm 2 (deprecated): `helm install --name filebeat ./helm-charts/filebeat --set imageTag=7.15.0-SNAPSHOT`


## Upgrading
Expand Down Expand Up @@ -136,7 +136,7 @@ as a reference. They are also used in the automated testing of this chart.
| `hostPathRoot` | Fully-qualified [hostPath][] that will be used to persist filebeat registry data | `/var/lib` |
| `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` |
| `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` |
| `imageTag` | The filebeat Docker image tag | `7.14.0-SNAPSHOT` |
| `imageTag` | The filebeat Docker image tag | `7.15.0-SNAPSHOT` |
| `image` | The filebeat Docker image | `docker.elastic.co/beats/filebeat` |
| `livenessProbe` | Parameters to pass to liveness [probe][] checks for values such as timeouts and thresholds | see [values.yaml][] |
| `managedServiceAccount` | Whether the `serviceAccount` should be managed by this helm chart. Set this to `false` in order to manage your own service account and related roles | `true` |
Expand Down
2 changes: 1 addition & 1 deletion filebeat/examples/default/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Default

This example deploy Filebeat 7.14.0-SNAPSHOT using [default values][].
This example deploy Filebeat 7.15.0-SNAPSHOT using [default values][].


## Usage
Expand Down
4 changes: 2 additions & 2 deletions filebeat/examples/default/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ http:
status: 200
timeout: 2000
body:
- "filebeat-7.14.0"
- "filebeat-7.15.0"

file:
/usr/share/filebeat/filebeat.yml:
Expand All @@ -44,4 +44,4 @@ command:
exit-status: 0
stdout:
- "elasticsearch: http://elasticsearch-master:9200"
- "version: 7.14.0"
- "version: 7.15.0"
2 changes: 1 addition & 1 deletion filebeat/examples/deployment/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Default

This example deploy Filebeat 7.14.0-SNAPSHOT using [default values][] as a Kubernetes Deployment.
This example deploy Filebeat 7.15.0-SNAPSHOT using [default values][] as a Kubernetes Deployment.


## Usage
Expand Down
2 changes: 1 addition & 1 deletion filebeat/examples/deployment/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:
- "filebeat-7.14.0"
- "filebeat-7.15.0"
2 changes: 1 addition & 1 deletion filebeat/examples/oss/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OSS

This example deploy Filebeat 7.14.0-SNAPSHOT using [Filebeat OSS][] version.
This example deploy Filebeat 7.15.0-SNAPSHOT using [Filebeat OSS][] version.


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

This example deploy Filebeat 7.14.0-SNAPSHOT using authentication and TLS to connect to
This example deploy Filebeat 7.15.0-SNAPSHOT using authentication and TLS to connect to
Elasticsearch (see [values][]).


Expand Down
2 changes: 1 addition & 1 deletion filebeat/examples/security/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ http:
status: 200
timeout: 2000
body:
- "filebeat-7.14.0"
- "filebeat-7.15.0"
allow-insecure: true
username: "{{ .Env.ELASTICSEARCH_USERNAME }}"
password: "{{ .Env.ELASTICSEARCH_PASSWORD }}"
2 changes: 1 addition & 1 deletion filebeat/examples/upgrade/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ http:
status: 200
timeout: 2000
body:
- "filebeat-7.14.0"
- "filebeat-7.15.0"

file:
/usr/share/filebeat/filebeat.yml:
Expand Down
2 changes: 1 addition & 1 deletion filebeat/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ hostAliases: []
# - "foo.local"
# - "bar.local"
image: "docker.elastic.co/beats/filebeat"
imageTag: "7.14.0-SNAPSHOT"
imageTag: "7.15.0-SNAPSHOT"
imagePullPolicy: "IfNotPresent"
imagePullSecrets: []

Expand Down
2 changes: 1 addition & 1 deletion helpers/bumper.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
os.chdir(os.path.join(os.path.dirname(__file__), ".."))

versions = {
7: os.environ.get("BUMPER_VERSION_7", "7.14.0-SNAPSHOT"),
7: os.environ.get("BUMPER_VERSION_7", "7.15.0-SNAPSHOT"),
}

chart_version = versions[7]
Expand Down
Loading

0 comments on commit e68195c

Please sign in to comment.