Revert "6.8.10 Release (elastic#651)"

This reverts commit 46bbee1.
jmlrt · Jun 11, 2020 · 59adf87 · 59adf87
1 parent 46bbee1
commit 59adf87
Show file tree

Hide file tree

Showing 46 changed files with 166 additions and 58 deletions.
diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: apm-server
-version: 6.8.10
-appVersion: 6.8.10
+version: 6.8.10-SNAPSHOT
+appVersion: 6.8.10-SNAPSHOT
 sources:
   - https://github.com/elastic/apm
 icon: https://helm.elastic.co/icons/apm.png
diff --git a/apm-server/README.md b/apm-server/README.md
@@ -8,13 +8,18 @@ The design and code is less mature than official GA features and is being
 provided as-is with no warranties. Alpha features are not subject to the support
 SLA of official GA features (see [supported configurations][] for more details).
 
+**Warning**: This branch is used for development, please use [6.8.9][] release
+for released version.
+
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 
 - [Requirements](#requirements)
 - [Installing](#installing)
+  - [Install released version using Helm repository](#install-released-version-using-helm-repository)
+  - [Install development version using 6.8 branch and 6.8.10-SNAPSHOT versions](#install-development-version-using-68-branch-and-6810-snapshot-versions)
 - [Upgrading](#upgrading)
 - [Usage notes](#usage-notes)
 - [Configuration](#configuration)
@@ -38,10 +43,22 @@ See [supported configurations][] for more details.
 
 ## Installing
 
+This chart is tested with the latest 6.8.10-SNAPSHOT versions.
+
+### Install released version using Helm repository
+
 * Add the Elastic Helm charts repo:
 `helm repo add elastic https://helm.elastic.co`
 
-* Install it: `helm install --name apm-server --version 6.8.10 elastic/apm-server`
+* Install the latest 6.8 release:
+`helm install --name apm-server elastic/apm-server`
+* Install it: `helm install --name apm-server elastic/apm-server`
+
+### Install development version using 6.8 branch and 6.8.10-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`
 
 
 ## Upgrading
@@ -79,7 +96,7 @@ as a reference. They are also used in the automated testing of this chart.
 | `fullnameOverride`       | Overrides the full name of the resources. If not set the name will default to `.Release.Name` - `.Values.nameOverride` or `.Chart.Name`                    | `""`                               |
 | `imagePullPolicy`        | The Kubernetes [imagePullPolicy][] value                                                                                                                   | `IfNotPresent`                     |
 | `imagePullSecrets`       | Configuration for [imagePullSecrets][] so that you can use a private registry for your image                                                               | `[]`                               |
-| `imageTag`               | The APM Server Docker image tag                                                                                                                            | `6.8.10`                            |
+| `imageTag`               | The APM Server Docker image tag                                                                                                                            | `6.8.10-SNAPSHOT`                            |
 | `image`                  | The APM Server Docker image                                                                                                                                | `docker.elastic.co/apm/apm-server` |
 | `ingress`                | Configurable [ingress][] to expose the APM Server service                                                                                                  | see [values.yaml][]                |
 | `labels`                 | Configurable [labels][] applied to all APM server pods                                                                                                     | `{}`                               |
@@ -127,6 +144,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions
 about our development and testing process.
 
 
+[6.8.9]: https://github.com/elastic/helm-charts/blob/6.8.9/apm-server/README.md
 [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md
 [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md
 [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md

diff --git a/apm-server/examples/default/README.md b/apm-server/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy APM Server 6.8.10 using [default values][].
+This example deploy APM Server 6.8.10-SNAPSHOT using [default values][].
 
 
 ## Usage

diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md
@@ -1,6 +1,6 @@
 # OSS
 
-This example deploy APM Server 6.8.10 using [APM Server OSS][] version.
+This example deploy APM Server 6.8.10-SNAPSHOT using [APM Server OSS][] version.
 
 
 ## Usage

diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md
@@ -1,6 +1,6 @@
 # Security
 
-This example deploy APM Server 6.8.10 using authentication and TLS to connect to
+This example deploy APM Server 6.8.10-SNAPSHOT using authentication and TLS to connect to
 Elasticsearch (see [values][]).
 
 

diff --git a/apm-server/values.yaml b/apm-server/values.yaml
@@ -62,7 +62,7 @@ extraVolumes: []
   #   emptyDir: {}
 
 image: "docker.elastic.co/apm/apm-server"
-imageTag: "6.8.10"
+imageTag: "6.8.10-SNAPSHOT"
 imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []
 

diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: elasticsearch
-version: 6.8.10
-appVersion: 6.8.10
+version: 6.8.10-SNAPSHOT
+appVersion: 6.8.10-SNAPSHOT
 sources:
   - https://github.com/elastic/elasticsearch
 icon: https://helm.elastic.co/icons/elasticsearch.png
diff --git a/elasticsearch/README.md b/elasticsearch/README.md
@@ -3,13 +3,18 @@
 This Helm chart is a lightweight way to configure and run our official
 [Elasticsearch Docker image][].
 
+**Warning**: This branch is used for development, please use [6.8.9][] release
+for released version.
+
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 
 - [Requirements](#requirements)
 - [Installing](#installing)
+  - [Install released version using Helm repository](#install-released-version-using-helm-repository)
+  - [Install development version using 6.8 branch and 6.8.10-SNAPSHOT versions](#install-development-version-using-68-branch-and-6810-snapshot-versions)
 - [Upgrading](#upgrading)
 - [Usage notes](#usage-notes)
 - [Configuration](#configuration)
@@ -48,10 +53,22 @@ See [supported configurations][] for more details.
 
 ## Installing
 
+This chart is tested with the latest 6.8.10-SNAPSHOT versions.
+
+### Install released version using Helm repository
+
 * Add the Elastic Helm charts repo:
 `helm repo add elastic https://helm.elastic.co`
 
-* Install it: `helm install --name elasticsearch --version 6.8.10 elastic/elasticsearch`
+* Install the latest 6.8 release:
+`helm install --name elasticsearch elastic/elasticsearch`
+* Install it: `helm install --name elasticsearch elastic/elasticsearch`
+
+### Install development version using 6.8 branch and 6.8.10-SNAPSHOT versions
+
+* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git`
+
+* Install it: `helm install --name elasticsearch ./helm-charts/elasticsearch`
 
 
 ## Upgrading
@@ -106,7 +123,7 @@ support multiple versions with minimal changes.
 | `httpPort`                         | The http port that Kubernetes will use for the healthchecks and the service. If you change this you will also need to set [http.port][] in `extraEnvs`                                                                                                    | `9200`                                          |
 | `imagePullPolicy`                  | The Kubernetes [imagePullPolicy][] value                                                                                                                                                                                                                  | `IfNotPresent`                                  |
 | `imagePullSecrets`                 | Configuration for [imagePullSecrets][] so that you can use a private registry for your image                                                                                                                                                              | `[]`                                            |
-| `imageTag`                         | The Elasticsearch Docker image tag                                                                                                                                                                                                                        | `6.8.10`                                         |
+| `imageTag`                         | The Elasticsearch Docker image tag                                                                                                                                                                                                                        | `6.8.10-SNAPSHOT`                                         |
 | `image`                            | The Elasticsearch Docker image                                                                                                                                                                                                                            | `docker.elastic.co/elasticsearch/elasticsearch` |
 | `ingress`                          | Configurable [ingress][] to expose the Elasticsearch service. See [values.yaml][] for an example                                                                                                                                                          | see [values.yaml][]                             |
 | `initResources`                    | Allows you to set the [resources][] for the `initContainer` in the StatefulSet                                                                                                                                                                            | `{}`                                            |
@@ -368,6 +385,7 @@ about our development and testing process.
 
 
 [#63]: https://github.com/elastic/helm-charts/issues/63
+[6.8.9]: https://github.com/elastic/helm-charts/blob/6.8.9/elasticsearch/README.md
 [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md
 [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md
 [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md

diff --git a/elasticsearch/examples/config/README.md b/elasticsearch/examples/config/README.md
@@ -1,6 +1,6 @@
 # Config
 
-This example deploy a single node Elasticsearch 6.8.10 with authentication and
+This example deploy a single node Elasticsearch 6.8.10-SNAPSHOT with authentication and
 custom [values][].
 
 

diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy a 3 nodes Elasticsearch 6.8.10 cluster using
+This example deploy a 3 nodes Elasticsearch 6.8.10-SNAPSHOT cluster using
 [default values][].
 
 

diff --git a/elasticsearch/examples/docker-for-mac/README.md b/elasticsearch/examples/docker-for-mac/README.md
@@ -1,6 +1,6 @@
 # Docker for Mac
 
-This example deploy a 3 nodes Elasticsearch 6.8.10 cluster on [Docker for Mac][]
+This example deploy a 3 nodes Elasticsearch 6.8.10-SNAPSHOT cluster on [Docker for Mac][]
 using [custom values][].
 
 Note that this configuration should be used for test only and isn't recommended

diff --git a/elasticsearch/examples/kubernetes-kind/README.md b/elasticsearch/examples/kubernetes-kind/README.md
@@ -1,6 +1,6 @@
 # KIND
 
-This example deploy a 3 nodes Elasticsearch 6.8.10 cluster on [Kind][]
+This example deploy a 3 nodes Elasticsearch 6.8.10-SNAPSHOT cluster on [Kind][]
 using [custom values][].
 
 Note that this configuration should be used for test only and isn't recommended

diff --git a/elasticsearch/examples/microk8s/README.md b/elasticsearch/examples/microk8s/README.md
@@ -1,6 +1,6 @@
 # MicroK8S
 
-This example deploy a 3 nodes Elasticsearch 6.8.10 cluster on [MicroK8S][]
+This example deploy a 3 nodes Elasticsearch 6.8.10-SNAPSHOT cluster on [MicroK8S][]
 using [custom values][].
 
 Note that this configuration should be used for test only and isn't recommended

diff --git a/elasticsearch/examples/minikube/README.md b/elasticsearch/examples/minikube/README.md
@@ -1,6 +1,6 @@
 # Minikube
 
-This example deploy a 3 nodes Elasticsearch 6.8.10 cluster on [Minikube][]
+This example deploy a 3 nodes Elasticsearch 6.8.10-SNAPSHOT cluster on [Minikube][]
 using [custom values][].
 
 If helm or kubectl timeouts occur, you may consider creating a minikube VM with

diff --git a/elasticsearch/examples/multi/README.md b/elasticsearch/examples/multi/README.md
@@ -1,6 +1,6 @@
 # Multi
 
-This example deploy an Elasticsearch 6.8.10 cluster composed of 2 different Helm
+This example deploy an Elasticsearch 6.8.10-SNAPSHOT cluster composed of 2 different Helm
 releases:
 
 - `helm-es-multi-master` for the 3 master nodes using [master values][]

diff --git a/elasticsearch/examples/openshift/README.md b/elasticsearch/examples/openshift/README.md
@@ -1,6 +1,6 @@
 # OpenShift
 
-This example deploy a 3 nodes Elasticsearch 6.8.10 cluster on [OpenShift][]
+This example deploy a 3 nodes Elasticsearch 6.8.10-SNAPSHOT cluster on [OpenShift][]
 using [custom values][].
 
 ## Usage

diff --git a/elasticsearch/examples/oss/README.md b/elasticsearch/examples/oss/README.md
@@ -1,6 +1,6 @@
 # OSS
 
-This example deploy a 3 nodes Elasticsearch 6.8.10 cluster using
+This example deploy a 3 nodes Elasticsearch 6.8.10-SNAPSHOT cluster using
 [Elasticsearch OSS][] version.
 
 ## Usage

diff --git a/elasticsearch/examples/security/README.md b/elasticsearch/examples/security/README.md
@@ -1,6 +1,6 @@
 # Security
 
-This example deploy a 3 nodes Elasticsearch 6.8.10 with authentication and
+This example deploy a 3 nodes Elasticsearch 6.8.10-SNAPSHOT with authentication and
 autogenerated certificates for TLS (see [values][]).
 
 Note that this configuration should be used for test only. For a production

diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
@@ -51,7 +51,7 @@ secretMounts: []
 #    defaultMode: 0755
 
 image: "docker.elastic.co/elasticsearch/elasticsearch"
-imageTag: "6.8.10"
+imageTag: "6.8.10-SNAPSHOT"
 imagePullPolicy: "IfNotPresent"
 
 podAnnotations: {}

diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: filebeat
-version: 6.8.10
-appVersion: 6.8.10
+version: 6.8.10-SNAPSHOT
+appVersion: 6.8.10-SNAPSHOT
 sources:
   - https://github.com/elastic/beats
 icon: https://helm.elastic.co/icons/beats.png
diff --git a/filebeat/README.md b/filebeat/README.md
@@ -3,13 +3,18 @@
 This Helm chart is a lightweight way to configure and run our official
 [Filebeat Docker image][].
 
+**Warning**: This branch is used for development, please use [6.8.9][] release
+for released version.
+
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 
 - [Requirements](#requirements)
 - [Installing](#installing)
+  - [Install released version using Helm repository](#install-released-version-using-helm-repository)
+  - [Install development version using 6.8 branch and 6.8.10-SNAPSHOT versions](#install-development-version-using-68-branch-and-6810-snapshot-versions)
 - [Upgrading](#upgrading)
 - [Usage notes](#usage-notes)
 - [Configuration](#configuration)
@@ -34,10 +39,22 @@ See [supported configurations][] for more details.
 
 ## Installing
 
+This chart is tested with the latest 6.8.10-SNAPSHOT versions.
+
+### Install released version using Helm repository
+
 * Add the Elastic Helm charts repo:
 `helm repo add elastic https://helm.elastic.co`
 
-* Install it: `helm install --name filebeat --version 6.8.10 elastic/filebeat`
+* Install the latest 6.8 release:
+`helm install --name filebeat elastic/filebeat`
+* Install it: `helm install --name filebeat elastic/filebeat`
+
+### Install development version using 6.8 branch and 6.8.10-SNAPSHOT versions
+
+* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git`
+
+* Install it: `helm install --name filebeat ./helm-charts/filebeat`
 
 
 ## Upgrading
@@ -85,7 +102,7 @@ as a reference. They are also used in the automated testing of this chart.
 | `hostPathRoot`           | Fully-qualified [hostPath][] that will be used to persist Filebeat registry data                                                                                                | `/var/lib`                         |
 | `imagePullPolicy`        | The Kubernetes [imagePullPolicy][] value                                                                                                                                        | `IfNotPresent`                     |
 | `imagePullSecrets`       | Configuration for [imagePullSecrets][] so that you can use a private registry for your image                                                                                    | `[]`                               |
-| `imageTag`               | The Filebeat Docker image tag                                                                                                                                                   | `6.8.10`                            |
+| `imageTag`               | The Filebeat Docker image tag                                                                                                                                                   | `6.8.10-SNAPSHOT`                            |
 | `image`                  | The Filebeat Docker image                                                                                                                                                       | `docker.elastic.co/beats/filebeat` |
 | `labels`                 | Configurable [labels][] applied to all Filebeat pods                                                                                                                            | `{}`                               |
 | `livenessProbe`          | Parameters to pass to liveness [probe][] checks for values such as timeouts and thresholds                                                                                      | see [values.yaml][]                |
@@ -142,6 +159,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions
 about our development and testing process.
 
 
+[6.8.9]: https://github.com/elastic/helm-charts/blob/6.8.9/filebeat/README.md
 [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md
 [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md
 [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md

diff --git a/filebeat/examples/default/README.md b/filebeat/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy Filebeat 6.8.10 using [default values][].
+This example deploy Filebeat 6.8.10-SNAPSHOT using [default values][].
 
 
 ## Usage

diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md
@@ -1,6 +1,6 @@
 # OSS
 
-This example deploy Filebeat 6.8.10 using [Filebeat OSS][] version.
+This example deploy Filebeat 6.8.10-SNAPSHOT using [Filebeat OSS][] version.
 
 
 ## Usage

diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md
@@ -1,6 +1,6 @@
 # Security
 
-This example deploy Filebeat 6.8.10 using authentication and TLS to connect to
+This example deploy Filebeat 6.8.10-SNAPSHOT using authentication and TLS to connect to
 Elasticsearch (see [values][]).
 
 

diff --git a/filebeat/values.yaml b/filebeat/values.yaml
@@ -48,7 +48,7 @@ envFrom: []
 hostPathRoot: /var/lib
 hostNetworking: false
 image: "docker.elastic.co/beats/filebeat"
-imageTag: "6.8.10"
+imageTag: "6.8.10-SNAPSHOT"
 imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []
 

diff --git a/helpers/bumper.py b/helpers/bumper.py
@@ -19,7 +19,7 @@
 os.chdir(os.path.join(os.path.dirname(__file__), ".."))
 
 versions = {
-    6: os.environ.get("BUMPER_VERSION_6", "6.8.10"),
+    6: os.environ.get("BUMPER_VERSION_6", "6.8.10-SNAPSHOT"),
 }
 
 chart_version = versions[6]

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 := 6.8.10
+STACK_VERSION := 6.8.10-SNAPSHOT
 
 .PHONY: help
 help: ## Display this help

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