From d4a5531560ed84021baf4229e503f3089fa4aac6 Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Wed, 29 Jul 2020 07:29:03 +0200 Subject: [PATCH] [meta] add helm 3 beta support (#759) This PR add Helm 3 support in beta as the main blockers were fixed in previous PR. Note that adding automated tests with Helm 3 is still required to add full Helm 3 support. --- README.md | 8 +++++++- apm-server/README.md | 11 ++++++++--- elasticsearch/README.md | 11 ++++++++--- filebeat/README.md | 11 ++++++++--- kibana/README.md | 11 ++++++++--- logstash/README.md | 11 ++++++++--- metricbeat/README.md | 11 ++++++++--- 7 files changed, 55 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 7f73c3d60..1b344f201 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ - [Support Matrix](#support-matrix) - [Kubernetes Versions](#kubernetes-versions) - [Helm versions](#helm-versions) + - [Helm 3 beta](#helm-3-beta) - [ECK](#eck) @@ -77,7 +78,12 @@ exact versions are defined under `KUBERNETES_VERSIONS` in While we are checking backward compatibility, the charts are only tested with Helm version mentioned in [helm-tester Dockerfile][] (currently 2.16.9). -Note that we don't support [Helm 3][] version. + +#### Helm 3 beta + +While we don't have automated tests for [Helm 3][] yet, we fixed the main +blockers to use it. We now have enough feedbacks from internal and external +users to add support in beta. ## ECK diff --git a/apm-server/README.md b/apm-server/README.md index 421a51471..902609dd8 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -50,14 +50,18 @@ This chart is tested with the latest 7.9.0-SNAPSHOT versions. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 7.8 release: -`helm install --name apm-server elastic/apm-server` +* Install it: + - with Helm 2: `helm install --name apm-server elastic/apm-server` + - with [Helm 3 (beta)][]: `helm install apm-server elastic/apm-server` + ### Install development version using 7.9 branch and 7.9.0-SNAPSHOT versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` -* Install it: `helm install --name apm-server ./helm-charts/apm-server` +* Install it: + - with Helm 2: `helm install --name apm-server ./helm-charts/apm-server --set imageTag=7.9.0-SNAPSHOT` + - with [Helm 3 (beta)][]: `helm install apm-server ./helm-charts/apm-server --set imageTag=7.9.0-SNAPSHOT` ## Upgrading @@ -159,6 +163,7 @@ about our development and testing process. [examples/oss]: https://github.com/elastic/helm-charts/tree/7.9/apm-server/examples/oss [examples/security]: https://github.com/elastic/helm-charts/tree/7.9/apm-server/examples/security [helm]: https://helm.sh +[helm 3 (beta)]: https://github.com/elastic/helm-charts/tree/master/README.md#helm-3-beta [horizontal pod autoscaler]: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ [imagePullPolicy]: https://kubernetes.io/docs/concepts/containers/images/#updating-images [imagePullSecrets]: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret diff --git a/elasticsearch/README.md b/elasticsearch/README.md index 6b86c15b1..e9e23f19f 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -60,14 +60,18 @@ This chart is tested with the latest 7.9.0-SNAPSHOT versions. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 7.8 release: -`helm install --name elasticsearch elastic/elasticsearch` +* Install it: + - with Helm 2: `helm install --name elasticsearch elastic/elasticsearch` + - with [Helm 3 (beta)][]: `helm install elasticsearch elastic/elasticsearch` + ### Install development version using 7.9 branch and 7.9.0-SNAPSHOT versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` -* Install it: `helm install --name elasticsearch ./helm-charts/elasticsearch` +* Install it: + - with Helm 2: `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=7.9.0-SNAPSHOT` + - with [Helm 3 (beta)][]: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=7.9.0-SNAPSHOT` ## Upgrading @@ -410,6 +414,7 @@ about our development and testing process. [examples/security]: https://github.com/elastic/helm-charts/tree/7.9/elasticsearch/examples/security [gke]: https://cloud.google.com/kubernetes-engine [helm]: https://helm.sh +[helm 3 (beta)]: https://github.com/elastic/helm-charts/tree/master/README.md#helm-3-beta [helm/charts stable]: https://github.com/helm/charts/tree/master/stable/elasticsearch/ [how to install plugins guide]: https://github.com/elastic/helm-charts/tree/7.9/elasticsearch/README.md#how-to-install-plugins [how to use the keystore]: https://github.com/elastic/helm-charts/tree/7.9/elasticsearch/README.md#how-to-use-the-keystore diff --git a/filebeat/README.md b/filebeat/README.md index 3fd1e245d..fa261fd80 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -47,14 +47,18 @@ This chart is tested with the latest 7.9.0-SNAPSHOT versions. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 7.8 release: -`helm install --name filebeat elastic/filebeat` +* Install it: + - with Helm 2: `helm install --name filebeat elastic/filebeat` + - with [Helm 3 (beta)][]: `helm install filebeat elastic/filebeat` + ### Install development version using 7.9 branch and 7.9.0-SNAPSHOT versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` -* Install it: `helm install --name filebeat ./helm-charts/filebeat` +* Install it: + - with Helm 2: `helm install --name filebeat ./helm-charts/filebeat --set imageTag=7.9.0-SNAPSHOT` + - with [Helm 3 (beta)][]: `helm install filebeat ./helm-charts/filebeat --set imageTag=7.9.0-SNAPSHOT` ## Upgrading @@ -198,6 +202,7 @@ about our development and testing process. [filebeat oss docker image]: https://www.docker.elastic.co/r/beats/filebeat-oss [filebeat outputs]: https://www.elastic.co/guide/en/beats/filebeat/7.9/configuring-output.html [helm]: https://helm.sh +[helm 3 (beta)]: https://github.com/elastic/helm-charts/tree/master/README.md#helm-3-beta [hostNetwork]: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#host-namespaces [hostPath]: https://kubernetes.io/docs/concepts/storage/volumes/#hostpath [imagePullPolicy]: https://kubernetes.io/docs/concepts/containers/images/#updating-images diff --git a/kibana/README.md b/kibana/README.md index b76b8f309..892a1e38c 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -48,14 +48,18 @@ This chart is tested with the latest 7.9.0-SNAPSHOT versions. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 7.8 release: -`helm install --name kibana elastic/kibana` +* Install it: + - with Helm 2: `helm install --name kibana elastic/kibana` + - with [Helm 3 (beta)][]: `helm install kibana elastic/kibana` + ### Install development version using 7.9 branch and 7.9.0-SNAPSHOT versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` -* Install it: `helm install --name kibana ./helm-charts/kibana` +* Install it: + - with Helm 2: `helm install --name kibana ./helm-charts/kibana --set imageTag=7.9.0-SNAPSHOT` + - with [Helm 3 (beta)][]: `helm install kibana ./helm-charts/kibana --set imageTag=7.9.0-SNAPSHOT` ## Upgrading @@ -214,6 +218,7 @@ about our development and testing process. [examples/security]: https://github.com/elastic/helm-charts/tree/7.9/kibana/examples/security [gke]: https://cloud.google.com/kubernetes-engine [helm]: https://helm.sh +[helm 3 (beta)]: https://github.com/elastic/helm-charts/tree/master/README.md#helm-3-beta [imagePullPolicy]: https://kubernetes.io/docs/concepts/containers/images/#updating-images [imagePullSecrets]: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret [ingress]: https://kubernetes.io/docs/concepts/services-networking/ingress/ diff --git a/logstash/README.md b/logstash/README.md index 16ba21117..d04129b92 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -50,14 +50,18 @@ This chart is tested with the latest 7.9.0-SNAPSHOT versions. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 7.8 release: -`helm install --name logstash elastic/logstash` +* Install it: + - with Helm 2: `helm install --name logstash elastic/logstash` + - with [Helm 3 (beta)][]: `helm install logstash elastic/logstash` + ### Install development version using 7.9 branch and 7.9.0-SNAPSHOT versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` -* Install it: `helm install --name logstash ./helm-charts/logstash` +* Install it: + - with Helm 2: `helm install --name logstash ./helm-charts/logstash --set imageTag=7.9.0-SNAPSHOT` + - with [Helm 3 (beta)][]: `helm install logstash ./helm-charts/logstash --set imageTag=7.9.0-SNAPSHOT` ## Upgrading @@ -199,6 +203,7 @@ about our development and testing process. [examples]: https://github.com/elastic/helm-charts/tree/7.9/logstash/examples [examples/oss]: https://github.com/elastic/helm-charts/tree/7.9/logstash/examples/oss [helm]: https://helm.sh +[helm 3 (beta)]: https://github.com/elastic/helm-charts/tree/master/README.md#helm-3-beta [imagePullPolicy]: https://kubernetes.io/docs/concepts/containers/images/#updating-images [imagePullSecrets]: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret [kubernetes secrets]: https://kubernetes.io/docs/concepts/configuration/secret/ diff --git a/metricbeat/README.md b/metricbeat/README.md index dc7633858..6e2acdc39 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -47,14 +47,18 @@ This chart is tested with the latest 7.9.0-SNAPSHOT versions. * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install the latest 7.8 release: -`helm install --name metricbeat elastic/metricbeat` +* Install it: + - with Helm 2: `helm install --name metricbeat elastic/metricbeat` + - with [Helm 3 (beta)][]: `helm install metricbeat elastic/metricbeat` + ### Install development version using 7.9 branch and 7.9.0-SNAPSHOT versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` -* Install it: `helm install --name metricbeat ./helm-charts/metricbeat` +* Install it: + - with Helm 2: `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=7.9.0-SNAPSHOT` + - with [Helm 3 (beta)][]: `helm install metricbeat ./helm-charts/metricbeat --set imageTag=7.9.0-SNAPSHOT` ## Upgrading @@ -219,6 +223,7 @@ about our development and testing process. [examples/oss]: https://github.com/elastic/helm-charts/tree/7.9/metricbeat/examples/oss [examples/security]: https://github.com/elastic/helm-charts/tree/7.9/metricbeat/examples/security [helm]: https://helm.sh +[helm 3 (beta)]: https://github.com/elastic/helm-charts/tree/master/README.md#helm-3-beta [hostPath]: https://kubernetes.io/docs/concepts/storage/volumes/#hostpath [hostNetwork]: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#host-namespaces [imagePullPolicy]: https://kubernetes.io/docs/concepts/containers/images/#updating-images