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

[release] Initiate 7.7 branch #541

Merged
merged 21 commits into from
Apr 9, 2020
Merged

[release] Initiate 7.7 branch #541

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c489e20
Make use of secure port when accessing Kubelet API
ChrsMark Feb 5, 2020
1e83690
Update values.yaml
ChrsMark Feb 5, 2020
e3848b6
Update values.yaml
ChrsMark Feb 5, 2020
51867fc
Remove CHANGELOG to keep it only on master
mgreau Mar 25, 2020
1a55b3e
[jenkins] Use generic way for generating jobs per branch
mgreau Mar 25, 2020
c05ed6d
[7.7] Resources/Versions dedicated to 7.7.x dev/release versions
mgreau Mar 25, 2020
835df79
Merge remote-tracking branch 'upstream/master' into patch-2
ChrsMark Apr 2, 2020
0826c89
The status number does not contains the snapshot value
mgreau Apr 2, 2020
0d051f4
Do not update release version notice
mgreau Apr 2, 2020
df16e23
[tests] Remove SNAPSHOT values in goss files
mgreau Apr 2, 2020
42f0d66
Fix es test
mgreau Apr 3, 2020
3b2f3ef
Replace HOSTNAME with NODE_NAME to access host without hostNetwork
ChrsMark Apr 3, 2020
2aed960
Add nodes/stats clusterRoleRules
ChrsMark Apr 3, 2020
a03b78e
Merge pull request #471 from ChrsMark/patch-2
jmlrt Apr 3, 2020
a098304
[tests] ES outputs the SNAPSHOT version
mgreau Apr 3, 2020
48589e8
[elasticsearch] fix helm test command
jmlrt Apr 6, 2020
fe92c10
Merge pull request #564 from jmlrt/fix-helm-test
jmlrt Apr 6, 2020
bbdc027
Merge branch 'master' into dev-branch-for-77
mgreau Apr 7, 2020
57683a5
[doc] Update APM Server doc with branching model
mgreau Apr 9, 2020
1e8b48f
Update doc
mgreau Apr 9, 2020
412fe3b
[doc] Update instructions related to the branching model
mgreau Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apm-server/Chart.yaml
View file
Open in desktop
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.6.1
appVersion: 7.6.1
version: 7.7.0-SNAPSHOT
appVersion: 7.7.0-SNAPSHOT
sources:
- https://github.com/elastic/apm
icon: https://helm.elastic.co/icons/apm.png
8 changes: 4 additions & 4 deletions apm-server/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ This chart is tested with the latest supported versions. The currently tested ve

| 6.x | 7.x |
| ----- | ----- |
| 6.8.7 | 7.6.1 |
| 6.8.7 | 7.7.0-SNAPSHOT |

Examples of installing older major versions can be found in the
[examples](https://github.com/elastic/helm-charts/tree/master/apm-server/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.6.1` of APM
or new releases by overriding the `imageTag`. To install version `7.7.0-SNAPSHOT` of APM
Server it would look like this:

```
helm install --name apm-server elastic/apm-server --set imageTag=7.6.1
helm install --name apm-server elastic/apm-server --set imageTag=7.7.0-SNAPSHOT
```


Expand All @@ -72,7 +72,7 @@ helm install --name apm-server elastic/apm-server --set imageTag=7.6.1
| `extraVolumeMounts` | List of additional volumeMounts | `[]` |
| `extraVolumes` | List of additional volumes | `[]` |
| `image` | The APM Server docker image | `docker.elastic.co/apm/apm-server` |
| `imageTag` | The APM Server docker image tag | `7.6.1` |
| `imageTag` | The APM Server docker image tag | `7.7.0-SNAPSHOT` |
| `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` |
| `imagePullSecrets` | Configuration for [imagePullSecrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) so that you can use a private registry for your image | `[]` |
| `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
15 changes: 0 additions & 15 deletions apm-server/examples/6.x/Makefile
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions apm-server/examples/6.x/test/goss.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apm-server/examples/6.x/values.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apm-server/examples/default/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ http:
status: 200
timeout: 2000
body:
- '7.6.1'
- '7.7.0-SNAPSHOT'
2 changes: 1 addition & 1 deletion apm-server/examples/oss/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ http:
status: 200
timeout: 2000
body:
- '7.6.1'
- '7.7.0-SNAPSHOT'
2 changes: 1 addition & 1 deletion apm-server/examples/security/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ http:
status: 200
timeout: 2000
body:
- '7.6.1'
- '7.7.0-SNAPSHOT'
2 changes: 1 addition & 1 deletion apm-server/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ extraVolumes: []
# emptyDir: {}

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

Expand Down
4 changes: 2 additions & 2 deletions elasticsearch/Chart.yaml
View file
Open in desktop
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.6.1
appVersion: 7.6.1
version: 7.7.0-SNAPSHOT
appVersion: 7.7.0-SNAPSHOT
sources:
- https://github.com/elastic/elasticsearch
icon: https://helm.elastic.co/icons/elasticsearch.png
10 changes: 5 additions & 5 deletions elasticsearch/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This helm chart is a lightweight way to configure and run our official [Elastics

## Notice

[7.6.1](https://github.com/elastic/helm-charts/releases/tag/7.6.1) release is introducing a change for Elasticsearch users upgrading from a previous chart version.
[7.7.0-SNAPSHOT](https://github.com/elastic/helm-charts/releases/tag/7.7.0-SNAPSHOT) release is introducing a change for Elasticsearch users upgrading from a previous chart version.
mgreau marked this conversation as resolved.
Show resolved Hide resolved
Following our recommandations, the change tracked in [#458](https://github.com/elastic/helm-charts/pull/458) is setting CPU request to the same value as CPU limit.

For users which don't overwrite default values for CPU requests, Elasticsearch pod will now request `1000m` CPU instead of `100m` CPU. This may impact the resources (nodes) required in your Kubernetes cluster to deploy Elasticsearch chart.
Expand Down Expand Up @@ -76,14 +76,14 @@ This chart is tested with the latest supported versions. The currently tested ve

| 6.x | 7.x |
| ----- | ----- |
| 6.8.7 | 7.6.1 |
| 6.8.7 | 7.7.0-SNAPSHOT |

Examples of installing older major versions can be found in the [examples](https://github.com/elastic/helm-charts/tree/master/elasticsearch/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.6.1` of Elasticsearch it would look like this:
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.0-SNAPSHOT` of Elasticsearch it would look like this:

```
helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.6.1
helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.7.0-SNAPSHOT
```

## Configuration
Expand All @@ -105,7 +105,7 @@ helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.6.1
| `extraInitContainers` | Templatable string of additional init containers to be passed to the `tpl` function | `""` |
| `secretMounts` | Allows you easily mount a secret as a file inside the statefulset. Useful for mounting certificates and other secrets. See [values.yaml](https://github.com/elastic/helm-charts/tree/master/elasticsearch/values.yaml) for an example | `[]` |
| `image` | The Elasticsearch docker image | `docker.elastic.co/elasticsearch/elasticsearch` |
| `imageTag` | The Elasticsearch docker image tag | `7.6.1` |
| `imageTag` | The Elasticsearch docker image tag | `7.7.0-SNAPSHOT` |
| `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` |
| `podAnnotations` | Configurable [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) applied to all Elasticsearch pods | `{}` |
| `labels` | Configurable [label](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) applied to all Elasticsearch pods | `{}` |
Expand Down
15 changes: 0 additions & 15 deletions elasticsearch/examples/6.x/Makefile
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions elasticsearch/examples/6.x/test/goss.yaml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions elasticsearch/examples/6.x/values.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion elasticsearch/examples/default/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ http:
status: 200
timeout: 2000
body:
- '"number" : "7.6.1"'
- '"number" : "7.7.0-SNAPSHOT"'
- '"cluster_name" : "elasticsearch"'
- '"name" : "elasticsearch-master-0"'
- 'You Know, for Search'
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/openshift/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ http:
status: 200
timeout: 2000
body:
- '"number" : "7.6.1"'
- '"number" : "7.7.0-SNAPSHOT"'
- '"cluster_name" : "elasticsearch"'
- '"name" : "elasticsearch-master-0"'
- 'You Know, for Search'
2 changes: 1 addition & 1 deletion elasticsearch/examples/oss/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ http:
status: 200
timeout: 2000
body:
- '"number" : "7.6.1"'
- '"number" : "7.7.0-SNAPSHOT"'
- '"cluster_name" : "oss"'
- '"name" : "oss-master-0"'
- 'You Know, for Search'
2 changes: 1 addition & 1 deletion elasticsearch/examples/upgrade/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ http:
status: 200
timeout: 2000
body:
- '"number" : "7.6.1"'
- '"number" : "7.7.0-SNAPSHOT"'
- '"cluster_name" : "upgrade"'
- '"name" : "upgrade-master-0"'
- 'You Know, for Search'
2 changes: 1 addition & 1 deletion elasticsearch/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ secretMounts: []
# path: /usr/share/elasticsearch/config/certs

image: "docker.elastic.co/elasticsearch/elasticsearch"
imageTag: "7.6.1"
imageTag: "7.7.0-SNAPSHOT"
imagePullPolicy: "IfNotPresent"

podAnnotations: {}
Expand Down
4 changes: 2 additions & 2 deletions filebeat/Chart.yaml
View file
Open in desktop
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.6.1
appVersion: 7.6.1
version: 7.7.0-SNAPSHOT
appVersion: 7.7.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ This chart is tested with the latest supported versions. The currently tested ve

| 6.x | 7.x |
| ----- | ----- |
| 6.8.7 | 7.6.1 |
| 6.8.7 | 7.7.0-SNAPSHOT |

Examples of installing older major versions can be found in the [examples](https://github.com/elastic/helm-charts/tree/master/filebeat/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.6.1` of Filebeat it would look like this:
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.0-SNAPSHOT` of Filebeat it would look like this:

```
helm install --name filebeat elastic/filebeat --set imageTag=7.6.1
helm install --name filebeat elastic/filebeat --set imageTag=7.7.0-SNAPSHOT
```


Expand All @@ -68,7 +68,7 @@ helm install --name filebeat elastic/filebeat --set imageTag=7.6.1
| `hostPathRoot` | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Filebeat registry data | `/var/lib` |
| `hostNetworking` | Use host networking in the daemonset so that hostname is reported correctly | `false` |
| `image` | The Filebeat docker image | `docker.elastic.co/beats/filebeat` |
| `imageTag` | The Filebeat docker image tag | `7.6.1` |
| `imageTag` | The Filebeat docker image tag | `7.7.0-SNAPSHOT` |
| `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` |
| `imagePullSecrets` | Configuration for [imagePullSecrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) so that you can use a private registry for your image | `[]` |
| `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
13 changes: 0 additions & 13 deletions filebeat/examples/6.x/Makefile
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions filebeat/examples/6.x/test/goss.yaml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions filebeat/examples/6.x/values.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions filebeat/examples/default/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ http:
status: 200
timeout: 2000
body:
- 'filebeat-7.6.1'
- 'filebeat-7.7.0-SNAPSHOT'

file:
/usr/share/filebeat/filebeat.yml:
Expand All @@ -44,4 +44,4 @@ command:
exit-status: 0
stdout:
- 'elasticsearch: http://elasticsearch-master:9200'
- 'version: 7.6.1'
- 'version: 7.7.0-SNAPSHOT'
2 changes: 1 addition & 1 deletion filebeat/examples/oss/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ http:
status: 200
timeout: 2000
body:
- 'filebeat-7.6.1'
- 'filebeat-7.7.0-SNAPSHOT'
2 changes: 1 addition & 1 deletion filebeat/examples/security/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ http:
status: 200
timeout: 2000
body:
- 'filebeat-7.6.1'
- 'filebeat-7.7.0-SNAPSHOT'
allow-insecure: true
username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
Loading