This repository has been archived by the owner on May 16, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This commit initiates the 6.8 branch which will be dedicated to the 6.8.x releases for the Helm Charts. It will allow to: - test this branch with the daily Stack Docker images 6.8.9-SNAPSHOT via dedicated Jenkins jobs - test the staging 6.8.x Docker images before a release This branch is based on [7.7](https://github.com/elastic/helm-charts/tree/7.7/) which was initiated in #541. [Elasticsearch upgrade test](https://github.com/elastic/helm-charts/tree/7.7/elasticsearch/examples/upgrade) has been removed as doesn't make sense to try an upgrade from `7.0.0-alpha1` to `6.8.x`.
- Loading branch information
Showing
80 changed files
with
307 additions
and
450 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,8 +5,8 @@ maintainers: | |
| - email: [email protected] | ||
| name: Elastic | ||
| name: apm-server | ||
| version: 7.7.0-SNAPSHOT | ||
| appVersion: 7.7.0-SNAPSHOT | ||
| version: 6.8.9-SNAPSHOT | ||
| appVersion: 6.8.9-SNAPSHOT | ||
| sources: | ||
| - https://github.com/elastic/apm | ||
| icon: https://helm.elastic.co/icons/apm.png | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
| - [Requirements](#requirements) | ||
| - [Installing](#installing) | ||
| - [Using Helm repository](#using-helm-repository) | ||
| - [Using the 7.7 branch](#using-the-77-branch) | ||
| - [Using the 6.8 branch](#using-the-68-branch) | ||
| - [Upgrading](#upgrading) | ||
| - [Usage notes](#usage-notes) | ||
| - [Configuration](#configuration) | ||
|
|
@@ -37,27 +37,27 @@ This Helm chart is a lightweight way to configure and run our official | |
|
|
||
| ## Installing | ||
|
|
||
| This chart is tested with the latest 7.7.0-SNAPSHOT versions. | ||
| This chart is tested with the latest 6.8.9-SNAPSHOT versions. | ||
|
|
||
| ### Using Helm repository | ||
|
|
||
| * Add the Elastic Helm charts repo: | ||
| `helm repo add elastic https://helm.elastic.co` | ||
|
|
||
| * Install the latest 7.7 release: | ||
| `helm install --name apm-server elastic/apm-server --version=7.7.0` | ||
| * Install the latest 6.8 release: | ||
| `helm install --name apm-server elastic/apm-server --version=6.8.9` | ||
|
|
||
| ### Using the 7.7 branch | ||
| ### Using the 6.8 branch | ||
|
|
||
| * Clone the git repo and checkout the right branch: | ||
|
|
||
| ```shell | ||
| git clone [email protected]:elastic/helm-charts.git | ||
| cd helm-charts | ||
| git checkout -b 7.7 origin/7.7 | ||
| git checkout -b 6.8 origin/6.8 | ||
| ```` | ||
|
|
||
| * Install the latest 7.7.0-SNAPSHOT: | ||
| * Install the latest 6.8.9-SNAPSHOT: | ||
| `helm install --name apm-server ./helm-charts/apm-server` | ||
|
|
||
|
|
||
|
|
@@ -96,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 | `7.7.0-SNAPSHOT` | | ||
| | `imageTag` | The APM Server Docker image tag | `6.8.9-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 | `{}` | | ||
|
|
@@ -149,14 +149,14 @@ about our development and testing process. | |
| [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md | ||
| [affinity]: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity | ||
| [annotations]: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ | ||
| [apm server docker image]: https://www.elastic.co/guide/en/apm/server/7.7/running-on-docker.html | ||
| [apm server oss docker image]: https://www.docker.elastic.co/#apm-server-7-7-0-oss | ||
| [default elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.7/elasticsearch/README.md#default | ||
| [apm server docker image]: https://www.elastic.co/guide/en/apm/server/6.8/running-on-docker.html | ||
| [apm server oss docker image]: https://www.docker.elastic.co/#apm-server-6-8-9-oss | ||
| [default elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/6.8/elasticsearch/README.md#default | ||
| [environment variables]: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config | ||
| [environment from variables]: https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables | ||
| [examples]: https://github.com/elastic/helm-charts/tree/7.7/apm-server/examples | ||
| [examples/oss]: https://github.com/elastic/helm-charts/tree/7.7/apm-server/examples/oss | ||
| [examples/security]: https://github.com/elastic/helm-charts/tree/7.7/apm-server/examples/security | ||
| [examples]: https://github.com/elastic/helm-charts/tree/6.8/apm-server/examples | ||
| [examples/oss]: https://github.com/elastic/helm-charts/tree/6.8/apm-server/examples/oss | ||
| [examples/security]: https://github.com/elastic/helm-charts/tree/6.8/apm-server/examples/security | ||
| [helm]: https://helm.sh | ||
| [horizontal pod autoscaler]: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ | ||
| [imagePullPolicy]: https://kubernetes.io/docs/concepts/containers/images/#updating-images | ||
|
|
@@ -174,4 +174,4 @@ about our development and testing process. | |
| [serviceAccount]: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ | ||
| [tolerations]: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | ||
| [updateStrategy]: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#updating-a-deployment | ||
| [values.yaml]: https://github.com/elastic/helm-charts/tree/7.7/apm-server/values.yaml | ||
| [values.yaml]: https://github.com/elastic/helm-charts/tree/6.8/apm-server/values.yaml | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,4 +3,4 @@ http: | |
| status: 200 | ||
| timeout: 2000 | ||
| body: | ||
| - '7.7.0' | ||
| - '6.8.9' | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,4 +3,4 @@ http: | |
| status: 200 | ||
| timeout: 2000 | ||
| body: | ||
| - '7.7.0' | ||
| - '6.8.9' | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,4 +3,4 @@ http: | |
| status: 200 | ||
| timeout: 2000 | ||
| body: | ||
| - '7.7.0' | ||
| - '6.8.9' | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,8 +5,8 @@ maintainers: | |
| - email: [email protected] | ||
| name: Elastic | ||
| name: elasticsearch | ||
| version: 7.7.0-SNAPSHOT | ||
| appVersion: 7.7.0-SNAPSHOT | ||
| version: 6.8.9-SNAPSHOT | ||
| appVersion: 6.8.9-SNAPSHOT | ||
| sources: | ||
| - https://github.com/elastic/elasticsearch | ||
| icon: https://helm.elastic.co/icons/elasticsearch.png | ||
Oops, something went wrong.