Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
[meta] Initiate 7.12 branch (#1102)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmlrt authored Mar 15, 2021
1 parent 82a174c commit c359937
Show file tree
Hide file tree
Showing 36 changed files with 160 additions and 160 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -261,12 +261,12 @@ make goss
[elastic helm repository]: https://helm.elastic.co
[github forking model]: https://help.github.com/articles/fork-a-repo/
[goss]: https://github.com/aelsabbahy/goss/blob/master/docs/manual.md
[integration test example]: https://github.com/elastic/helm-charts/blob/7.x/elasticsearch/examples/default/test/goss.yaml
[integration test example]: https://github.com/elastic/helm-charts/blob/7.12/elasticsearch/examples/default/test/goss.yaml
[integration tests section]: #integration-tests
[pytest]: https://docs.pytest.org/en/latest/
[serverspec]: https://serverspec.org
[templating test example]: https://github.com/elastic/helm-charts/blob/7.x/elasticsearch/tests/elasticsearch_test.py
[templating test example]: https://github.com/elastic/helm-charts/blob/7.12/elasticsearch/tests/elasticsearch_test.py
[templating tests section]: #templating-tests
[release.md]: https://github.com/elastic/helm-charts/blob/master/helpers/release.md
[releases section]: #releases
[requirements.txt]: https://github.com/elastic/helm-charts/blob/7.x/requirements.txt
[requirements.txt]: https://github.com/elastic/helm-charts/blob/7.12/requirements.txt
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Elastic Stack Kubernetes Helm Charts

[![Build Status](https://img.shields.io/jenkins/s/https/devops-ci.elastic.co/job/elastic+helm-charts+7.x.svg)](https://devops-ci.elastic.co/job/elastic+helm-charts+7.x/) [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/elastic)](https://artifacthub.io/packages/search?repo=elastic)
[![Build Status](https://img.shields.io/jenkins/s/https/devops-ci.elastic.co/job/elastic+helm-charts+7.12.svg)](https://devops-ci.elastic.co/job/elastic+helm-charts+7.12/) [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/elastic)](https://artifacthub.io/packages/search?repo=elastic)

<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
Expand Down Expand Up @@ -90,14 +90,14 @@ Kubernetes. There is a dedicated Helm chart for ECK which can be found
[in ECK repo][eck-chart] ([documentation][eck-chart-doc]).


[currently tested]: https://devops-ci.elastic.co/job/elastic+helm-charts+7.x/
[currently tested]: https://devops-ci.elastic.co/job/elastic+helm-charts+7.12/
[eck-chart]: https://github.com/elastic/cloud-on-k8s/tree/master/deploy
[eck-chart-doc]: https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-install-helm.html
[elastic cloud on kubernetes]: https://github.com/elastic/cloud-on-k8s
[elastic helm repo]: https://helm.elastic.co
[github releases]: https://github.com/elastic/helm-charts/releases
[helm-tester Dockerfile]: https://github.com/elastic/helm-charts/blob/7.x/helpers/helm-tester/Dockerfile
[helpers/matrix.yml]: https://github.com/elastic/helm-charts/blob/7.x/helpers/matrix.yml
[helm-tester Dockerfile]: https://github.com/elastic/helm-charts/blob/7.12/helpers/helm-tester/Dockerfile
[helpers/matrix.yml]: https://github.com/elastic/helm-charts/blob/7.12/helpers/matrix.yml
[operator pattern]: https://kubernetes.io/docs/concepts/extend-kubernetes/operator/
[elasticsearch-771]: https://github.com/elastic/helm-charts/tree/7.7.1/elasticsearch/

Expand Down
18 changes: 9 additions & 9 deletions apm-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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).

<!-- development warning placeholder -->
**Warning**: This branch is used for development, please use the latest [7.x][] release for released version.
**Warning**: This branch is used for development, please use the latest [7.12][] 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 -->
Expand Down Expand Up @@ -59,7 +59,7 @@ This chart is tested with the latest 7.12.0-SNAPSHOT version.

* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git`

* Checkout the branch : `git checkout 7.x`
* Checkout the branch : `git checkout 7.12`

* Install it:
- with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=7.12.0-SNAPSHOT`
Expand Down Expand Up @@ -150,20 +150,20 @@ An example of APM Server deployment using OSS version can be found in
Please check [CONTRIBUTING.md][] before any contribution or for any questions
about our development and testing process.

[7.x]: https://github.com/elastic/helm-charts/releases
[7.12]: https://github.com/elastic/helm-charts/releases
[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
[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.12/running-on-docker.html
[apm server oss docker image]: https://www.docker.elastic.co/r/apm/apm-server-oss
[default elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.x/elasticsearch/README.md#default
[default elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.12/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.x/apm-server/examples
[examples/oss]: https://github.com/elastic/helm-charts/tree/7.x/apm-server/examples/oss
[examples/security]: https://github.com/elastic/helm-charts/tree/7.x/apm-server/examples/security
[examples]: https://github.com/elastic/helm-charts/tree/7.12/apm-server/examples
[examples/oss]: https://github.com/elastic/helm-charts/tree/7.12/apm-server/examples/oss
[examples/security]: https://github.com/elastic/helm-charts/tree/7.12/apm-server/examples/security
[helm]: https://helm.sh
[horizontal pod autoscaler]: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
[hostAliases]: https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
Expand All @@ -180,7 +180,7 @@ about our development and testing process.
[resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
[service]: https://kubernetes.io/docs/concepts/services-networking/service/
[serviceAccount]: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
[supported configurations]: https://github.com/elastic/helm-charts/tree/7.x/README.md#supported-configurations
[supported configurations]: https://github.com/elastic/helm-charts/tree/7.12/README.md#supported-configurations
[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.x/apm-server/values.yaml
[values.yaml]: https://github.com/elastic/helm-charts/tree/7.12/apm-server/values.yaml
6 changes: 3 additions & 3 deletions apm-server/examples/default/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ This example deploy APM Server 7.12.0-SNAPSHOT using [default values][].
You can also run [goss integration tests][] using `make test`


[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.x/elasticsearch/examples/default/
[goss integration tests]: https://github.com/elastic/helm-charts/tree/7.x/apm-server/examples/default/test/goss.yaml
[default values]: https://github.com/elastic/helm-charts/tree/7.x/apm-server/values.yaml
[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.12/elasticsearch/examples/default/
[goss integration tests]: https://github.com/elastic/helm-charts/tree/7.12/apm-server/examples/default/test/goss.yaml
[default values]: https://github.com/elastic/helm-charts/tree/7.12/apm-server/values.yaml
4 changes: 2 additions & 2 deletions apm-server/examples/oss/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ You can also run [goss integration tests][] using `make test`


[apm server oss]: https://www.elastic.co/downloads/apm-oss
[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.x/elasticsearch/examples/default/
[goss integration tests]: https://github.com/elastic/helm-charts/tree/7.x/apm-server/examples/oss/test/goss.yaml
[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.12/elasticsearch/examples/default/
[goss integration tests]: https://github.com/elastic/helm-charts/tree/7.12/apm-server/examples/oss/test/goss.yaml
6 changes: 3 additions & 3 deletions apm-server/examples/security/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ Elasticsearch (see [values][]).
You can also run [goss integration tests][] using `make test`


[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.x/elasticsearch/examples/security/
[goss integration tests]: https://github.com/elastic/helm-charts/tree/7.x/apm-server/examples/security/test/goss.yaml
[values]: https://github.com/elastic/helm-charts/tree/7.x/apm-server/examples/security/values.yaml
[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.12/elasticsearch/examples/security/
[goss integration tests]: https://github.com/elastic/helm-charts/tree/7.12/apm-server/examples/security/test/goss.yaml
[values]: https://github.com/elastic/helm-charts/tree/7.12/apm-server/examples/security/values.yaml
Loading

0 comments on commit c359937

Please sign in to comment.