From 5bc2b83609be0f32cf84a43ce5938cd061508c43 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Mon, 21 Oct 2019 12:17:48 +0200 Subject: [PATCH 1/6] [helm] bump helm version to 2.15.0 --- helpers/helm-tester/Dockerfile | 2 +- helpers/terraform/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/helm-tester/Dockerfile b/helpers/helm-tester/Dockerfile index cefd3fca6..133ad8c41 100644 --- a/helpers/helm-tester/Dockerfile +++ b/helpers/helm-tester/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.7 -ENV HELM_VERSION=2.14.0 +ENV HELM_VERSION=2.15.0 RUN wget https://storage.googleapis.com/kubernetes-helm/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \ tar xfv helm-v${HELM_VERSION}-linux-amd64.tar.gz && \ diff --git a/helpers/terraform/Dockerfile b/helpers/terraform/Dockerfile index 758f0bb8c..5d5a4990a 100644 --- a/helpers/terraform/Dockerfile +++ b/helpers/terraform/Dockerfile @@ -3,7 +3,7 @@ FROM centos:7 ENV VAULT_VERSION 0.9.3 ENV TERRAFORM_VERSION=0.11.7 ENV KUBECTL_VERSION=1.14.1 -ENV HELM_VERSION=2.14.0 +ENV HELM_VERSION=2.15.0 ENV DOCKER_VERSION=18.09.7 RUN yum -y install \ From 295dde4121ef5bcc6d4cc43111439d102113eac6 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Tue, 22 Oct 2019 18:13:46 +0200 Subject: [PATCH 2/6] [helm] add chart api version This is required witrh Helm 2.15.0 following https://github.com/helm/helm/pull/6180 --- elasticsearch/Chart.yaml | 1 + filebeat/Chart.yaml | 1 + kibana/Chart.yaml | 1 + metricbeat/Chart.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index e9d5d24e9..1ce656815 100755 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -1,3 +1,4 @@ +apiVersion: v1 description: Official Elastic helm chart for Elasticsearch home: https://github.com/elastic/helm-charts maintainers: diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index 42cffb34b..48dbb4f6a 100755 --- a/filebeat/Chart.yaml +++ b/filebeat/Chart.yaml @@ -1,3 +1,4 @@ +apiVersion: v1 description: Official Elastic helm chart for Filebeat home: https://github.com/elastic/helm-charts maintainers: diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index d858b0af6..946bcd90c 100755 --- a/kibana/Chart.yaml +++ b/kibana/Chart.yaml @@ -1,3 +1,4 @@ +apiVersion: v1 description: Official Elastic helm chart for Kibana home: https://github.com/elastic/helm-charts maintainers: diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index d6f0f4bc1..b3010fff2 100755 --- a/metricbeat/Chart.yaml +++ b/metricbeat/Chart.yaml @@ -1,3 +1,4 @@ +apiVersion: v1 description: Official Elastic helm chart for Metricbeat home: https://github.com/elastic/helm-charts maintainers: From 18b2f5603eab3c1c9853154bec15a428b1380d76 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Tue, 22 Oct 2019 18:24:24 +0200 Subject: [PATCH 3/6] [helm ] force empty string to "null" values This fix the following errors during `helm lint --strict`: ``` ==> Linting . [ERROR] templates/: render error in "elasticsearch/templates/service.yaml": template: elasticsearch/templates/service.yaml:24:14: executing "elasticsearch/templates/service.yaml" at <.Values.service.nodePort>: map has no entry for key "nodePort" ``` --- elasticsearch/values.yaml | 2 +- kibana/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index eff281bae..10840e7c3 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -152,7 +152,7 @@ transportPort: 9300 service: type: ClusterIP - nodePort: + nodePort: "" annotations: {} httpPortName: http transportPortName: transport diff --git a/kibana/values.yaml b/kibana/values.yaml index 1c864744e..6791cd388 100755 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -84,7 +84,7 @@ updateStrategy: service: type: ClusterIP port: 5601 - nodePort: + nodePort: "" annotations: {} # cloud.google.com/load-balancer-type: "Internal" # service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0 From bee7fd67251ef3de4a2a936ef28313e8a599e1db Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Tue, 22 Oct 2019 18:27:08 +0200 Subject: [PATCH 4/6] [helm] workaround to adress regression for numeric value type in helm v2.15 - Apply workaround from https://github.com/helm/helm/issues/6708 - Related to https://github.com/helm/helm/pull/6010 --- elasticsearch/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/templates/_helpers.tpl b/elasticsearch/templates/_helpers.tpl index ccfd8c338..7866bca71 100755 --- a/elasticsearch/templates/_helpers.tpl +++ b/elasticsearch/templates/_helpers.tpl @@ -28,7 +28,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- end -}} {{- define "endpoints" -}} -{{- $replicas := .Values.replicas | int }} +{{- $replicas := int (toString (.Values.replicas)) }} {{- $uname := printf "%s-%s" .Values.clusterName .Values.nodeGroup }} {{- range $i, $e := untilStep 0 $replicas 1 -}} {{ $uname }}-{{ $i }}, From 9a9b56a3e4f8011ff48d285c8965a19f0f0a76d4 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 23 Oct 2019 13:01:43 +0200 Subject: [PATCH 5/6] [helm] bump helm version to 2.15.1 This fix a bug on helm upgrade (https://github.com/helm/helm/issues/6718) --- helpers/helm-tester/Dockerfile | 2 +- helpers/terraform/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/helm-tester/Dockerfile b/helpers/helm-tester/Dockerfile index 133ad8c41..a0d32580b 100644 --- a/helpers/helm-tester/Dockerfile +++ b/helpers/helm-tester/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.7 -ENV HELM_VERSION=2.15.0 +ENV HELM_VERSION=2.15.1 RUN wget https://storage.googleapis.com/kubernetes-helm/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \ tar xfv helm-v${HELM_VERSION}-linux-amd64.tar.gz && \ diff --git a/helpers/terraform/Dockerfile b/helpers/terraform/Dockerfile index 5d5a4990a..7d35ba465 100644 --- a/helpers/terraform/Dockerfile +++ b/helpers/terraform/Dockerfile @@ -3,7 +3,7 @@ FROM centos:7 ENV VAULT_VERSION 0.9.3 ENV TERRAFORM_VERSION=0.11.7 ENV KUBECTL_VERSION=1.14.1 -ENV HELM_VERSION=2.15.0 +ENV HELM_VERSION=2.15.1 ENV DOCKER_VERSION=18.09.7 RUN yum -y install \ From 05c73d9a94e4855ac6d67fa2a01031888338412a Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 23 Oct 2019 13:14:38 +0200 Subject: [PATCH 6/6] [helm] test compat 2.14.3 with change done for 2.15 --- helpers/helm-tester/Dockerfile | 2 +- helpers/terraform/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/helm-tester/Dockerfile b/helpers/helm-tester/Dockerfile index a0d32580b..f467bd287 100644 --- a/helpers/helm-tester/Dockerfile +++ b/helpers/helm-tester/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.7 -ENV HELM_VERSION=2.15.1 +ENV HELM_VERSION=2.14.3 RUN wget https://storage.googleapis.com/kubernetes-helm/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \ tar xfv helm-v${HELM_VERSION}-linux-amd64.tar.gz && \ diff --git a/helpers/terraform/Dockerfile b/helpers/terraform/Dockerfile index 7d35ba465..3bcd6bfe5 100644 --- a/helpers/terraform/Dockerfile +++ b/helpers/terraform/Dockerfile @@ -3,7 +3,7 @@ FROM centos:7 ENV VAULT_VERSION 0.9.3 ENV TERRAFORM_VERSION=0.11.7 ENV KUBECTL_VERSION=1.14.1 -ENV HELM_VERSION=2.15.1 +ENV HELM_VERSION=2.14.3 ENV DOCKER_VERSION=18.09.7 RUN yum -y install \