From 496f2afc13360801f21bc892d336c138b54fdab6 Mon Sep 17 00:00:00 2001 From: Taehyun Kim Date: Fri, 12 Apr 2019 18:12:46 +0900 Subject: [PATCH 1/5] bump es version --- elasticsearch/Chart.yaml | 4 ++-- elasticsearch/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 29883446e..099f7ca78 100755 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -4,8 +4,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: elasticsearch -version: 6.6.2-alpha1 -appVersion: 6.6.2 +version: 6.7.1-alpha1 +appVersion: 6.7.1 sources: - https://github.com/elastic/elasticsearch icon: https://helm.elastic.co/icons/elasticsearch.png diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index e0f9f2a48..4b53e5952 100755 --- 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: "6.6.2" +imageTag: "6.7.1" imagePullPolicy: "IfNotPresent" podAnnotations: {} From 944687ce17c011413a3384d4ba04c00a0097e9ff Mon Sep 17 00:00:00 2001 From: Taehyun Kim Date: Fri, 12 Apr 2019 18:22:16 +0900 Subject: [PATCH 2/5] remove standard storageClassName in default values --- elasticsearch/tests/elasticsearch_test.py | 1 - elasticsearch/values.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/elasticsearch/tests/elasticsearch_test.py b/elasticsearch/tests/elasticsearch_test.py index 65c2a9145..d23063b65 100755 --- a/elasticsearch/tests/elasticsearch_test.py +++ b/elasticsearch/tests/elasticsearch_test.py @@ -126,7 +126,6 @@ def test_defaults(): assert v['metadata']['name'] == uname assert v['spec']['accessModes'] == ['ReadWriteOnce'] assert v['spec']['resources']['requests']['storage'] == '30Gi' - assert v['spec']['storageClassName'] == 'standard' # Init container i = r['statefulset'][uname]['spec']['template']['spec']['initContainers'][0] diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 4b53e5952..c78b243c0 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -71,7 +71,6 @@ networkHost: "0.0.0.0" volumeClaimTemplate: accessModes: [ "ReadWriteOnce" ] - storageClassName: "standard" resources: requests: storage: 30Gi From f26bc158a577d79f7d3f680a54eb2d527691ee01 Mon Sep 17 00:00:00 2001 From: Taehyun Kim Date: Tue, 16 Apr 2019 10:54:23 +0900 Subject: [PATCH 3/5] revert chart version bump --- elasticsearch/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 099f7ca78..0f1490062 100755 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -4,7 +4,7 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: elasticsearch -version: 6.7.1-alpha1 +version: 6.6.2-alpha1 appVersion: 6.7.1 sources: - https://github.com/elastic/elasticsearch From 893a2113c4fc3db0cb36879009849e8f7dcf714c Mon Sep 17 00:00:00 2001 From: Taehyun Kim Date: Tue, 16 Apr 2019 10:55:08 +0900 Subject: [PATCH 4/5] update README.md --- elasticsearch/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elasticsearch/README.md b/elasticsearch/README.md index 3b513556a..3f8c9de30 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -55,14 +55,14 @@ If you currently have a cluster deployed with the [helm/charts stable](https://g | `extraInitContainers` | 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 | `6.6.2` | +| `imageTag` | The Elasticsearch docker image tag | `6.7.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 | `{}` | | `esJavaOpts` | [Java options](https://www.elastic.co/guide/en/elasticsearch/reference/current/jvm-options.html) for Elasticsearch. This is where you should configure the [jvm heap size](https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html) | `-Xmx1g -Xms1g` | | `resources` | Allows you to set the [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for the statefulset | `requests.cpu: 100m`
`requests.memory: 2Gi`
`limits.cpu: 1000m`
`limits.memory: 2Gi` | | `initResources` | Allows you to set the [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for the initContainer in the statefulset | {} | | `networkHost` | Value for the [network.host Elasticsearch setting](https://www.elastic.co/guide/en/elasticsearch/reference/current/network.host.html) | `0.0.0.0` | -| `volumeClaimTemplate` | Configuration for the [volumeClaimTemplate for statefulsets](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-storage). You will want to adjust the storage (default `30Gi`) and the `storageClassName` if you are using a different storage class | `accessModes: [ "ReadWriteOnce" ]`
`storageClassName: standard`
`resources.requests.storage: 30Gi` | +| `volumeClaimTemplate` | Configuration for the [volumeClaimTemplate for statefulsets](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-storage). You will want to adjust the storage (default `30Gi`) and the `storageClassName` if you are using a different storage class | `accessModes: [ "ReadWriteOnce" ]`
`resources.requests.storage: 30Gi` | | `persistence.annotations` | Additional persistence annotations for the `volumeClaimTemplate` | `{}` | | `antiAffinityTopologyKey` | The [anti-affinity topology key](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity). By default this will prevent multiple Elasticsearch nodes from running on the same Kubernetes node | `kubernetes.io/hostname` | | `antiAffinity` | Setting this to hard enforces the [anti-affinity rules](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity). If it is set to soft it will be done "best effort". Other values will be ignored. | `hard` | From a1f50725b77ddfa7e3be1b29e9c97decc031f8d2 Mon Sep 17 00:00:00 2001 From: Taehyun Kim Date: Wed, 17 Apr 2019 10:04:56 +0900 Subject: [PATCH 5/5] revert version bumps --- elasticsearch/Chart.yaml | 2 +- elasticsearch/README.md | 2 +- elasticsearch/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 0f1490062..29883446e 100755 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -5,7 +5,7 @@ maintainers: name: Elastic name: elasticsearch version: 6.6.2-alpha1 -appVersion: 6.7.1 +appVersion: 6.6.2 sources: - https://github.com/elastic/elasticsearch icon: https://helm.elastic.co/icons/elasticsearch.png diff --git a/elasticsearch/README.md b/elasticsearch/README.md index 3f8c9de30..89f523fed 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -55,7 +55,7 @@ If you currently have a cluster deployed with the [helm/charts stable](https://g | `extraInitContainers` | 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 | `6.7.1` | +| `imageTag` | The Elasticsearch docker image tag | `6.6.2` | | `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 | `{}` | | `esJavaOpts` | [Java options](https://www.elastic.co/guide/en/elasticsearch/reference/current/jvm-options.html) for Elasticsearch. This is where you should configure the [jvm heap size](https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html) | `-Xmx1g -Xms1g` | diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index dad9bdb03..6e12f7397 100755 --- 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: "6.7.1" +imageTag: "6.6.2" imagePullPolicy: "IfNotPresent" podAnnotations: {}