Rename master - main (#1416)

* Rename master - main in docs, scripts and CI jobs * Return original TOC: CONTRIBUTING.md * Return original TOCs without L1 header. Reconfigured vscode extension to ignore L1 header * Fix bad merge and broken links
elastic · Oct 21, 2021 · 1a3d95c · 1a3d95c
1 parent 57aa59a
commit 1a3d95c
Show file tree

Hide file tree

Showing 56 changed files with 225 additions and 225 deletions.
diff --git a/.ci/jobs/defaults.yml b/.ci/jobs/defaults.yml
@@ -15,7 +15,7 @@
     parameters:
     - string:
         name: branch_specifier
-        default: master
+        default: main
         description: the Git branch specifier to build (&lt;branchName&gt;, &lt;tagName&gt;,
           &lt;commitId&gt;, etc.)
     properties:

diff --git a/...ic+helm-charts+master+cluster-cleanup.yml → ...stic+helm-charts+main+cluster-cleanup.yml b/...ic+helm-charts+master+cluster-cleanup.yml → ...stic+helm-charts+main+cluster-cleanup.yml
@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+cluster-cleanup
-    display-name: elastic / helm-charts - master - cluster cleanup
-    description: Master - cluster cleanup
+    name: elastic+helm-charts+main+cluster-cleanup
+    display-name: elastic / helm-charts - main - cluster cleanup
+    description: Main - cluster cleanup
     scm:
     - git:
         wipe-workspace: 'True'

diff --git a/...c+helm-charts+master+cluster-creation.yml → ...tic+helm-charts+main+cluster-creation.yml b/...c+helm-charts+master+cluster-creation.yml → ...tic+helm-charts+main+cluster-creation.yml
@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+cluster-creation
-    display-name: elastic / helm-charts - master - cluster creation
-    description: Master - cluster creation
+    name: elastic+helm-charts+main+cluster-creation
+    display-name: elastic / helm-charts - main - cluster creation
+    description: Main - cluster creation
     scm:
     - git:
         wipe-workspace: 'True'

diff --git a/...-charts+master+integration-apm-server.yml → ...lm-charts+main+integration-apm-server.yml b/...-charts+master+integration-apm-server.yml → ...lm-charts+main+integration-apm-server.yml
@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+integration-apm-server
-    display-name: elastic / helm-charts - master - integration apm-server
-    description: Master - integration apm-server
+    name: elastic+helm-charts+main+integration-apm-server
+    display-name: elastic / helm-charts - main - integration apm-server
+    description: Main - integration apm-server
     scm:
     - git:
         wipe-workspace: 'True'

diff --git a/...arts+master+integration-elasticsearch.yml → ...charts+main+integration-elasticsearch.yml b/...arts+master+integration-elasticsearch.yml → ...charts+main+integration-elasticsearch.yml
@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+integration-elasticsearch
-    display-name: elastic / helm-charts - master - integration elasticsearch
-    description: Master - integration elasticsearch
+    name: elastic+helm-charts+main+integration-elasticsearch
+    display-name: elastic / helm-charts - main - integration elasticsearch
+    description: Main - integration elasticsearch
     scm:
     - git:
         wipe-workspace: 'True'

diff --git a/...lm-charts+master+integration-filebeat.yml → ...helm-charts+main+integration-filebeat.yml b/...lm-charts+master+integration-filebeat.yml → ...helm-charts+main+integration-filebeat.yml
@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+integration-filebeat
-    display-name: elastic / helm-charts - master - integration filebeat
-    description: Master - integration filebeat
+    name: elastic+helm-charts+main+integration-filebeat
+    display-name: elastic / helm-charts - main - integration filebeat
+    description: Main - integration filebeat
     scm:
     - git:
         wipe-workspace: 'True'

diff --git a/...helm-charts+master+integration-kibana.yml → ...c+helm-charts+main+integration-kibana.yml b/...helm-charts+master+integration-kibana.yml → ...c+helm-charts+main+integration-kibana.yml
@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+integration-kibana
-    display-name: elastic / helm-charts - master - integration kibana
-    description: Master - integration kibana
+    name: elastic+helm-charts+main+integration-kibana
+    display-name: elastic / helm-charts - main - integration kibana
+    description: Main - integration kibana
     scm:
     - git:
         wipe-workspace: 'True'

diff --git a/...lm-charts+master+integration-logstash.yml → ...helm-charts+main+integration-logstash.yml b/...lm-charts+master+integration-logstash.yml → ...helm-charts+main+integration-logstash.yml
@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+integration-logstash
-    display-name: elastic / helm-charts - master - integration logstash
-    description: Master - integration logstash
+    name: elastic+helm-charts+main+integration-logstash
+    display-name: elastic / helm-charts - main - integration logstash
+    description: Main - integration logstash
     scm:
     - git:
         wipe-workspace: 'True'

diff --git a/...-charts+master+integration-metricbeat.yml → ...lm-charts+main+integration-metricbeat.yml b/...-charts+master+integration-metricbeat.yml → ...lm-charts+main+integration-metricbeat.yml
@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+integration-metricbeat
-    display-name: elastic / helm-charts - master - integration metricbeat
-    description: Master - integration metricbeat
+    name: elastic+helm-charts+main+integration-metricbeat
+    display-name: elastic / helm-charts - main - integration metricbeat
+    description: Main - integration metricbeat
     scm:
     - git:
         wipe-workspace: 'True'

diff --git a/...lm-charts+master+template-lint-python.yml → ...helm-charts+main+template-lint-python.yml b/...lm-charts+master+template-lint-python.yml → ...helm-charts+main+template-lint-python.yml
@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+lint-python
-    display-name: elastic / helm-charts - master - lint python
-    description: Master - lint python
+    name: elastic+helm-charts+main+lint-python
+    display-name: elastic / helm-charts - main - lint python
+    description: Main - lint python
     scm:
     - git:
         wipe-workspace: 'True'

diff --git a/...c+helm-charts+master+template-testing.yml → ...tic+helm-charts+main+template-testing.yml b/...c+helm-charts+master+template-testing.yml → ...tic+helm-charts+main+template-testing.yml
@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master+template-testing
-    display-name: elastic / helm-charts - master - template testing
-    description: Master - template testing
+    name: elastic+helm-charts+main+template-testing
+    display-name: elastic / helm-charts - main - template testing
+    description: Main - template testing
     scm:
     - git:
         wipe-workspace: 'True'

diff --git a/.ci/jobs/elastic+helm-charts+master.yml → .ci/jobs/elastic+helm-charts+main.yml b/.ci/jobs/elastic+helm-charts+master.yml → .ci/jobs/elastic+helm-charts+main.yml
@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+helm-charts+master
-    display-name: elastic / helm-charts - master
-    description: Master branch testing
+    name: elastic+helm-charts+main
+    display-name: elastic / helm-charts - main
+    description: Main branch testing
     project-type: multijob
     scm:
     - git:
@@ -15,34 +15,34 @@
         name: template testing and kubernetes cluster creation
         condition: SUCCESSFUL
         projects:
-        - name: elastic+helm-charts+master+template-testing
+        - name: elastic+helm-charts+main+template-testing
           current-parameters: true
-        - name: elastic+helm-charts+master+lint-python
+        - name: elastic+helm-charts+main+lint-python
           current-parameters: true
-        - name: elastic+helm-charts+master+cluster-creation
+        - name: elastic+helm-charts+main+cluster-creation
           current-parameters: true
     - multijob:
         name: elasticsearch integration testing
         condition: ALWAYS
         projects:
-        - name: elastic+helm-charts+master+integration-elasticsearch
+        - name: elastic+helm-charts+main+integration-elasticsearch
           current-parameters: true
     - multijob:
         name: integration testing
         condition: ALWAYS
         projects:
-        - name: elastic+helm-charts+master+integration-kibana
+        - name: elastic+helm-charts+main+integration-kibana
           current-parameters: true
-        - name: elastic+helm-charts+master+integration-filebeat
+        - name: elastic+helm-charts+main+integration-filebeat
           current-parameters: true
-        - name: elastic+helm-charts+master+integration-metricbeat
+        - name: elastic+helm-charts+main+integration-metricbeat
           current-parameters: true
-        - name: elastic+helm-charts+master+integration-logstash
+        - name: elastic+helm-charts+main+integration-logstash
           current-parameters: true
-        - name: elastic+helm-charts+master+integration-apm-server
+        - name: elastic+helm-charts+main+integration-apm-server
           current-parameters: true
     publishers:
     - trigger-parameterized-builds:
-      - project: elastic+helm-charts+master+cluster-cleanup
+      - project: elastic+helm-charts+main+cluster-cleanup
         current-parameters: true
         trigger-with-no-params: false
diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md
@@ -417,12 +417,12 @@ volumeClaimTemplate:
 [container input]: https://www.elastic.co/guide/en/beats/filebeat/7.7/filebeat-input-container.html
 [docker input]: https://www.elastic.co/guide/en/beats/filebeat/7.7/filebeat-input-docker.html
 [elastic blog post]: https://www.elastic.co/blog/licensing-change
-[elastic elasticsearch chart]: https://github.com/elastic/helm-charts/tree/master/elasticsearch
+[elastic elasticsearch chart]: https://github.com/elastic/helm-charts/tree/main/elasticsearch
 [elastic helm repo]: https://helm.elastic.co
 [github releases]: https://github.com/elastic/helm-charts/releases
 [helm 2to3]: https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/
-[migration guide]: https://github.com/elastic/helm-charts/blob/master/elasticsearch/examples/migration/README.md
-[new branching model]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md#branching
+[migration guide]: https://github.com/elastic/helm-charts/blob/main/elasticsearch/examples/migration/README.md
+[new branching model]: https://github.com/elastic/helm-charts/blob/main/CONTRIBUTING.md#branching
 [kube-state-metrics]: https://github.com/helm/charts/tree/master/stable/kube-state-metrics
 [stable elasticsearch chart]: https://github.com/helm/charts/tree/master/stable/elasticsearch
 [stable elasticsearch chart notice]: https://github.com/helm/charts/tree/master/stable#elasticsearch#this-helm-chart-is-deprecated
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -570,7 +570,7 @@
 * Kibana chart is moving to GA
 * Filebeat chart is moving to GA
 * Metricbeat chart is moving to GA
-* Using [new branching model](https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md#branching) in [#541](https://github.com/elastic/helm-charts/pull/541) [@mgreau](https://github.com/mgreau)
+* Using [new branching model](https://github.com/elastic/helm-charts/blob/main/CONTRIBUTING.md#branching) in [#541](https://github.com/elastic/helm-charts/pull/541) [@mgreau](https://github.com/mgreau)
 * Helm 2.16.7 support in [#607](https://github.com/elastic/helm-charts/pull/607) [@jmlrt](https://github.com/jmlrt)
 * Docs improvements in [#593](https://github.com/elastic/helm-charts/pull/593) and [#598](https://github.com/elastic/helm-charts/pull/598) [@jmlrt](https://github.com/jmlrt)
 * Tests with SNAPSHOT Docker images in [#581](https://github.com/elastic/helm-charts/pull/581) [@mgreau](https://github.com/mgreau)
@@ -1107,7 +1107,7 @@
 ## 7.0.1-alpha1 - 2019/05/01
 
 * 7.0.1 as the default stack version
-* [Contributing guide](https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md), [release process](https://github.com/elastic/helm-charts/blob/master/helpers/release.md), [changelog](https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md) and [issue templates](https://github.com/elastic/helm-charts/tree/master/.github/ISSUE_TEMPLATE) added in [#111](https://github.com/elastic/helm-charts/pull/111)
+* [Contributing guide](https://github.com/elastic/helm-charts/blob/main/CONTRIBUTING.md), [release process](https://github.com/elastic/helm-charts/blob/main/helpers/release.md), [changelog](https://github.com/elastic/helm-charts/blob/main/CHANGELOG.md) and [issue templates](https://github.com/elastic/helm-charts/tree/main/.github/ISSUE_TEMPLATE) added in [#111](https://github.com/elastic/helm-charts/pull/111)
 * Automated testing for Kubernetes 1.10 dropped because it is no longer available in GKE
 * Helm client version bumped to 2.13.1
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -69,7 +69,7 @@ official helm-charts repo, which we'll refer to in later code snippets.
 
 ### Branching
 
-* All work on the next major release (`8.0.0`) goes into master.
+* All work on the next major release (`8.0.0`) goes into main.
 * Past major release branches are named `{majorVersion}.x`. They contain work
 that will go into the next minor release. For example, if the next minor release
 is `7.8.0`, work for it should go into the `7.x` branch.
@@ -96,24 +96,24 @@ push a rebased branch remotely will be rejected by git, and you'll be prompted
 to do a `pull`, which is not at all what you should do (this will really mess up
 your branch's history).
 
-Here's how you should rebase master onto your branch, and how to fix merge
+Here's how you should rebase main onto your branch, and how to fix merge
 conflicts when they arise.
 
-First, make sure master is up-to-date.
+First, make sure main is up-to-date.
 
 ```shell
-git checkout master
+git checkout main
 git fetch upstream
-git rebase upstream/master
+git rebase upstream/main
 ```
 
-Then, check out your branch and rebase master on top of it, which will apply all
-of the new commits on master to your branch, and then apply all of your branch's
+Then, check out your branch and rebase main on top of it, which will apply all
+of the new commits on main to your branch, and then apply all of your branch's
 new commits after that.
 
 ```shell
 git checkout name-of-your-branch
-git rebase master
+git rebase main
 ```
 
 You want to make sure there are no merge conflicts. If there are merge
@@ -124,7 +124,7 @@ You can use `git status` to see which files contain conflicts. They'll be the
 ones that aren't staged for commit. Open those files, and look for where git has
 marked the conflicts. Resolve the conflicts so that the changes you want to make
 to the code have been incorporated in a way that doesn't destroy work that's
-been done in master. Refer to master's commit history on GitHub if you need to
+been done in main. Refer to main's commit history on GitHub if you need to
 gain a better understanding of how code is conflicting and how best to resolve
 it.
 
@@ -176,8 +176,8 @@ Push your local changes to your forked copy of the repository and submit a Pull
 Request. In the Pull Request, describe what your changes do and mention the
 number of the issue where discussion has taken place, e.g., `Closes #123`.
 
-Always submit your pull request against `master` unless the bug is only present in an
-older version. If the bug affects both master and another branch say so in your
+Always submit your pull request against `main` unless the bug is only present in an
+older version. If the bug affects both main and another branch say so in your
 pull request.
 
 Then sit back and wait. There will probably be discussion about the Pull Request
@@ -259,11 +259,11 @@ 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/master/elasticsearch/examples/default/test/goss.yaml
+[integration test example]: https://github.com/elastic/helm-charts/blob/main/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/master/elasticsearch/tests/elasticsearch_test.py
+[templating test example]: https://github.com/elastic/helm-charts/blob/main/elasticsearch/tests/elasticsearch_test.py
 [templating tests section]: #templating-tests
 [releases section]: #releases
-[requirements.txt]: https://github.com/elastic/helm-charts/blob/master/requirements.txt
+[requirements.txt]: https://github.com/elastic/helm-charts/blob/main/requirements.txt
diff --git a/README.md b/README.md
@@ -1,11 +1,10 @@
 # Elastic Stack Kubernetes Helm Charts
 
-[![Build Status](https://img.shields.io/jenkins/s/https/devops-ci.elastic.co/job/elastic+helm-charts+master.svg)](https://devops-ci.elastic.co/job/elastic+helm-charts+master/) [![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+main.svg)](https://devops-ci.elastic.co/job/elastic+helm-charts+main/) [![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 -->
 
-
 - [Charts](#charts)
 - [Supported Configurations](#supported-configurations)
   - [Stack Versions](#stack-versions)
@@ -71,14 +70,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+master/
+[currently tested]: https://devops-ci.elastic.co/job/elastic+helm-charts+main/
 [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/master/helpers/helm-tester/Dockerfile
-[helpers/matrix.yml]: https://github.com/elastic/helm-charts/blob/master/helpers/matrix.yml
+[helm-tester Dockerfile]: https://github.com/elastic/helm-charts/blob/main/helpers/helm-tester/Dockerfile
+[helpers/matrix.yml]: https://github.com/elastic/helm-charts/blob/main/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/
 [apm-7]: https://github.com/elastic/helm-charts/tree/7.15.0/apm-server/README.md