Merge pull request #340 from jmlrt/7.4.1

7.4.1 release
elastic · Oct 23, 2019 · fb24331 · fb24331
2 parents 6eb124e + 2701eee
commit fb24331
Show file tree

Hide file tree

Showing 40 changed files with 116 additions and 87 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Changelog
 
+## 7.4.1 - 2019/10/23
+
+* 7.4.1 as the default stack version
+* 6.8.4 as 6.x tested version
+* Helm 2.15.1 support in [#338](https://github.com/elastic/helm-charts/pull/338) [@jmlrt](https://github.com/jmlrt)
+
+### Elasticsearch
+
+| PR                                                      | Author                                    | Title                                        |
+| ------------------------------------------------------- | ----------------------------------------- | -------------------------------------------- |
+|[#313](https://github.com/elastic/helm-charts/pull/313) | [@Crazybus](https://github.com/Crazybus)   | Add logging when adding password to keystore |
+|[#301](https://github.com/elastic/helm-charts/pull/301) | [@ravishivt](https://github.com/ravishivt) | Fix bug in keystore initContainer            |
+|[#274](https://github.com/elastic/helm-charts/pull/274) | [@salaboy](https://github.com/salaboy)     | Add Example for Kubernetes KIND              |
+|[#335](https://github.com/elastic/helm-charts/pull/335) | [@jmlrt](https://github.com/jmlrt)         | Fix deprecated note                          |
+|[#337](https://github.com/elastic/helm-charts/pull/337) | [@jmlrt](https://github.com/jmlrt)         | Remove unused default value                  |
+
+### Kibana
+
+| PR                                                     | Author                             | Title                           |
+| ------------------------------------------------------ | ---------------------------------- | ------------------------------- |
+|[#326](https://github.com/elastic/helm-charts/pull/326) | [@jmlrt](https://github.com/jmlrt) | Remove unused antiAffinity keys |
+
+### Metricbeat
+
+| PR                                                     | Author                             | Title                                                  |
+| ------------------------------------------------------ | ---------------------------------- | ------------------------------------------------------ |
+|[#339](https://github.com/elastic/helm-charts/pull/339) | [@jmlrt](https://github.com/jmlrt) | Allow adding additional labels to Metricbeat Daemonset |
+
+
 ## 7.4.0 - 2019/10/01
 
 * 7.4.0 as the default stack version
@@ -101,7 +130,7 @@
 | [#225](https://github.com/elastic/helm-charts/pull/225) | [@plumcraft](https://github.com/plumcraft) | Add configurable pod labels         |
 | [#230](https://github.com/elastic/helm-charts/pull/230) | [@Crazybus](https://github.com/Crazybus)   | Add subPath support to secretMounts |
 
----
+
 ## 7.2.1-0 - 2019/07/18
 
 * [#195](https://github.com/elastic/helm-charts/pull/195) - @cclauss - Initial steps started to move all python2 code to python3
@@ -131,7 +160,7 @@
 * [#127](https://github.com/elastic/helm-charts/pull/127) - @Crazybus - Add metricbeat chart
 * [#128](https://github.com/elastic/helm-charts/pull/128) - @Crazybus - Add ci jobs for metricbeat
 
----
+
 ## 7.2.0 - 2019/07/01
 
 * 7.2.0 as the default stack version
@@ -148,7 +177,6 @@
 * [#186](https://github.com/elastic/helm-charts/pull/186) - @Crazybus - Fix pvc annotations with multiple fields
 * [#189](https://github.com/elastic/helm-charts/pull/189) - @gnatpat - Add resources to sidecar container
 
-
 ### Kibana
 
 * [#160](https://github.com/elastic/helm-charts/pull/160) - @Crazybus - Add configurable nodePort to the service spec
@@ -162,7 +190,7 @@
 * [#182](https://github.com/elastic/helm-charts/pull/182) - @hxquangnhat - Fix secretName field for secretMounts
 * [#188](https://github.com/elastic/helm-charts/pull/188) - @cclauss - Fix octal literal to work in both Python 2 and Python 3
 
----
+
 ## 7.1.1 - 2019/06/07
 
 * 7.1.1 as the default stack version
@@ -180,7 +208,7 @@
 
 * [#140](https://github.com/elastic/helm-charts/pull/140) - @Crazybus - Remove fsGroup from container level security context
 
----
+
 ## 7.1.0 - 2019/05/21
 
 * 7.1.0 as the default stack version
@@ -204,7 +232,7 @@
 * [#121](https://github.com/elastic/helm-charts/pull/121) - @Crazybus - Add integration tests and other tweaks
 * [#129](https://github.com/elastic/helm-charts/pull/129) - @tylerjl - Add usage notes for filebeat
 
----
+
 ## 7.0.1-alpha1 - 2019/05/01
 
 * 7.0.1 as the default stack version
@@ -218,12 +246,11 @@
 * [#114](https://github.com/elastic/helm-charts/pull/114) - @Crazybus - Make persistent volumes optional
 * [#115](https://github.com/elastic/helm-charts/pull/115) - @Crazybus - Added an integration test for upgrading from the previous release and testing rolling upgrades
 
-
 ### Kibana
 
 * [#107](https://github.com/elastic/helm-charts/pull/107) - @Crazybus - Make the health check path configurable to support webroots and other customizations.
 
----
+
 ## 7.0.0-alpha1 - 2019/04/17
 
 * [#96](https://github.com/elastic/helm-charts/pull/96) - @Crazybus - 7.0.0 as the default stack version

diff --git a/README.md b/README.md
@@ -19,5 +19,7 @@ Please look in the chart directories for the documentation for each chart. These
 
 The charts are [currently tested](https://devops-ci.elastic.co/job/elastic+helm-charts+master/) against all GKE versions available. The exact versions are defined under `KUBERNETES_VERSIONS` in [helpers/matrix.yml](/helpers/matrix.yml)
 
+## Helm versions
 
-
+While we are checking backward compatibility, the charts are only tested with Helm version mentioned in [helm-tester Dockerfile](helpers/helm-tester/Dockerfile) (currently 2.15.1).
+Note that we don't support [Helm 3](https://v3.helm.sh/) version.
diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: [email protected]
   name: Elastic
 name: elasticsearch
-version: 7.4.0
-appVersion: 7.4.0
+version: 7.4.1
+appVersion: 7.4.1
 sources:
   - https://github.com/elastic/elasticsearch
 icon: https://helm.elastic.co/icons/elasticsearch.png
diff --git a/elasticsearch/README.md b/elasticsearch/README.md
@@ -6,7 +6,7 @@ This helm chart is a lightweight way to configure and run our official [Elastics
 
 ## Requirements
 
-* [Helm](https://helm.sh/) >= 2.8.0
+* [Helm](https://helm.sh/) >= 2.8.0 (see parent [README](../README.md) for more details)
 * Kubernetes >= 1.8
 * Minimum cluster requirements include the following to run this chart with default settings. All of these settings are configurable.
   * Three Kubernetes nodes to respect the default "hard" affinity settings
@@ -42,14 +42,14 @@ This chart is tested with the latest supported versions. The currently tested ve
 
 | 6.x   | 7.x   |
 | ----- | ----- |
-| 6.8.3 | 7.4.0 |
+| 6.8.4 | 7.4.1 |
 
 Examples of installing older major versions can be found in the [examples](./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.4.0` 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.4.1` of Elasticsearch it would look like this:
 
 ```
-helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.4.0
+helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.4.1
 ```
 
 ## Configuration
@@ -70,7 +70,7 @@ helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.4.0
 | `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](./values.yaml) for an example                                                                                                                                                     | `[]`                                                                                                                      |
 | `image`                       | The Elasticsearch docker image                                                                                                                                                                                                                                                                                             | `docker.elastic.co/elasticsearch/elasticsearch`                                                                           |
-| `imageTag`                    | The Elasticsearch docker image tag                                                                                                                                                                                                                                                                                         | `7.4.0`                                                                                                                   |
+| `imageTag`                    | The Elasticsearch docker image tag                                                                                                                                                                                                                                                                                         | `7.4.1`                                                                                                                   |
 | `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                                                                                                                                                                                          | `{}`                                                                                                                      |

diff --git a/elasticsearch/examples/6.x/test/goss.yaml b/elasticsearch/examples/6.x/test/goss.yaml
@@ -11,7 +11,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"number" : "6.8.3"'
+      - '"number" : "6.8.4"'
       - '"cluster_name" : "six"'
       - '"name" : "six-master-0"'
       - 'You Know, for Search'
diff --git a/elasticsearch/examples/6.x/values.yaml b/elasticsearch/examples/6.x/values.yaml
@@ -1,4 +1,4 @@
 ---
 
 clusterName: "six"
-imageTag: "6.8.3"
+imageTag: "6.8.4"
diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml
@@ -15,7 +15,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"number" : "7.4.0"'
+      - '"number" : "7.4.1"'
       - '"cluster_name" : "elasticsearch"'
       - '"name" : "elasticsearch-master-0"'
       - 'You Know, for Search'

diff --git a/elasticsearch/examples/kubernetes-kind/values.yaml b/elasticsearch/examples/kubernetes-kind/values.yaml
@@ -23,7 +23,7 @@ volumeClaimTemplate:
 extraInitContainers: |
   - name: create
     image: busybox:1.28
-    command: ['mkdir', '/usr/share/elasticsearch/data/nodes/']  
+    command: ['mkdir', '/usr/share/elasticsearch/data/nodes/']
     volumeMounts:
     - mountPath: /usr/share/elasticsearch/data
       name: elasticsearch-master
@@ -33,4 +33,4 @@ extraInitContainers: |
     volumeMounts:
     - mountPath: /usr/share/elasticsearch/data
       name: elasticsearch-master
-      
+
diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml
@@ -11,7 +11,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"number" : "7.4.0"'
+      - '"number" : "7.4.1"'
       - '"cluster_name" : "elasticsearch"'
       - '"name" : "elasticsearch-master-0"'
       - 'You Know, for Search'
diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml
@@ -11,7 +11,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"number" : "7.4.0"'
+      - '"number" : "7.4.1"'
       - '"cluster_name" : "oss"'
       - '"name" : "oss-master-0"'
       - 'You Know, for Search'
diff --git a/elasticsearch/examples/upgrade/test/goss.yaml b/elasticsearch/examples/upgrade/test/goss.yaml
@@ -11,7 +11,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"number" : "7.4.0"'
+      - '"number" : "7.4.1"'
       - '"cluster_name" : "upgrade"'
       - '"name" : "upgrade-master-0"'
       - 'You Know, for Search'
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
@@ -43,7 +43,7 @@ secretMounts: []
 #    path: /usr/share/elasticsearch/config/certs
 
 image: "docker.elastic.co/elasticsearch/elasticsearch"
-imageTag: "7.4.0"
+imageTag: "7.4.1"
 imagePullPolicy: "IfNotPresent"
 
 podAnnotations: {}

diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: [email protected]
   name: Elastic
 name: filebeat
-version: 7.4.0
-appVersion: 7.4.0
+version: 7.4.1
+appVersion: 7.4.1
 sources:
   - https://github.com/elastic/beats
 icon: https://helm.elastic.co/icons/filebeat.png
diff --git a/filebeat/README.md b/filebeat/README.md
@@ -7,7 +7,7 @@ This helm chart is a lightweight way to configure and run our official [Filebeat
 ## Requirements
 
 * Kubernetes >= 1.9
-* [Helm](https://helm.sh/) >= 2.8.0
+* [Helm](https://helm.sh/) >= 2.8.0 (see parent [README](../README.md) for more details)
 
 ## Usage notes and getting started
 * The default Filebeat configuration file for this chart is configured to use an Elasticsearch endpoint. Without any additional changes, Filebeat will send documents to the service URL that the Elasticsearch helm chart sets up by default. You may either set the `ELASTICSEARCH_HOSTS` environment variable in `extraEnvs` to override this endpoint or modify the default `filebeatConfig` to change this behavior.
@@ -30,14 +30,14 @@ This chart is tested with the latest supported versions. The currently tested ve
 
 | 6.x   | 7.x   |
 | ----- | ----- |
-| 6.8.3 | 7.4.0 |
+| 6.8.4 | 7.4.1 |
 
 Examples of installing older major versions can be found in the [examples](./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.4.0` 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.4.1` of Filebeat it would look like this:
 
 ```
-helm install --name filebeat elastic/filebeat --set imageTag=7.4.0
+helm install --name filebeat elastic/filebeat --set imageTag=7.4.1
 ```
 
 
@@ -50,7 +50,7 @@ helm install --name filebeat elastic/filebeat --set imageTag=7.4.0
 | `extraVolumes`           | Templatable string of additional volumes to be passed to the `tpl` function                                                                                                                                                                                                 | `""`                                                                                                                      |
 | `hostPathRoot`           | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Filebeat registry data                                                                                                                               | `/var/lib`                                                                                                                |
 | `image`                  | The Filebeat docker image                                                                                                                                                                                                                                                   | `docker.elastic.co/beats/filebeat`                                                                                        |
-| `imageTag`               | The Filebeat docker image tag                                                                                                                                                                                                                                               | `7.4.0`                                                                                                                   |
+| `imageTag`               | The Filebeat docker image tag                                                                                                                                                                                                                                               | `7.4.1`                                                                                                                   |
 | `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`                                                                                                                    |

diff --git a/filebeat/examples/6.x/test/goss.yaml b/filebeat/examples/6.x/test/goss.yaml
@@ -18,4 +18,4 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'filebeat-6.8.3'
+      - 'filebeat-6.8.4'
diff --git a/filebeat/examples/6.x/values.yaml b/filebeat/examples/6.x/values.yaml
@@ -1,4 +1,4 @@
-imageTag: 6.8.3
+imageTag: 6.8.4
 
 extraEnvs:
   - name: ELASTICSEARCH_HOSTS

diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml
@@ -29,7 +29,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'filebeat-7.4.0'
+      - 'filebeat-7.4.1'
 
 file:
   /usr/share/filebeat/filebeat.yml:
@@ -44,4 +44,4 @@ command:
     exit-status: 0
     stdout:
       - 'elasticsearch: http://elasticsearch-master:9200'
-      - 'version: 7.4.0'
+      - 'version: 7.4.1'
diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml
@@ -19,4 +19,4 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'filebeat-7.4.0'
+      - 'filebeat-7.4.1'
diff --git a/filebeat/examples/security/test/goss.yaml b/filebeat/examples/security/test/goss.yaml
@@ -3,7 +3,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'filebeat-7.4.0'
+      - 'filebeat-7.4.1'
     allow-insecure: true
     username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
     password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
diff --git a/filebeat/values.yaml b/filebeat/values.yaml
@@ -34,7 +34,7 @@ extraVolumes: ""
 hostPathRoot: /var/lib
 
 image: "docker.elastic.co/beats/filebeat"
-imageTag: "7.4.0"
+imageTag: "7.4.1"
 imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []
 

diff --git a/helpers/bumper.py b/helpers/bumper.py
@@ -7,11 +7,11 @@
 
 os.chdir(os.path.join(os.path.dirname(__file__), '..'))
 
-chart_version = '7.4.0'
+chart_version = '7.4.1'
 
 versions = {
-    6: '6.8.3',
-    7: '7.4.0',
+    6: '6.8.4',
+    7: '7.4.1',
 }
 
 file_patterns = [

diff --git a/helpers/examples.mk b/helpers/examples.mk
@@ -1,7 +1,7 @@
 GOSS_VERSION := v0.3.6
 GOSS_FILE ?= goss.yaml
 GOSS_SELECTOR ?= release=$(RELEASE)
-STACK_VERSION := 7.4.0
+STACK_VERSION := 7.4.1
 
 goss:
 	GOSS_CONTAINER=$$(kubectl get --no-headers=true pods -l $(GOSS_SELECTOR) -o custom-columns=:metadata.name | sed -n 1p ) && \

diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: [email protected]
   name: Elastic
 name: kibana
-version: 7.4.0
-appVersion: 7.4.0
+version: 7.4.1
+appVersion: 7.4.1
 sources:
   - https://github.com/elastic/kibana
 icon: https://helm.elastic.co/icons/kibana.png