(Breaking change) chore: change default target-branch to main (#510)

* chore: change default target-branch to main closes #376 Signed-off-by: Marco Lecheler <[email protected]> Signed-off-by: Marco Lecheler <[email protected]> * docs: change default target-branch to main Signed-off-by: Marco Lecheler <[email protected]> Signed-off-by: Marco Lecheler <[email protected]> * docs: update missing inclusive naming Signed-off-by: Marco Lecheler <[email protected]> Signed-off-by: Marco Lecheler <[email protected]> * chore: update kind readme to use inclusive naming Co-authored-by: Carlos Tadeu Panato Junior <[email protected]> Signed-off-by: Marco Lecheler <[email protected]> --------- Signed-off-by: Marco Lecheler <[email protected]> Signed-off-by: Marco Lecheler <[email protected]> Co-authored-by: Carlos Tadeu Panato Junior <[email protected]>
helm · Nov 19, 2023 · 61b5438 · 61b5438
1 parent d6d6030
commit 61b5438
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -1,3 +1,3 @@
 # Community Code of Conduct
 
-Helm follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+Helm follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
diff --git a/ct/cmd/root.go b/ct/cmd/root.go
@@ -65,7 +65,7 @@ func Execute() {
 func addCommonFlags(flags *pflag.FlagSet) {
 	flags.StringVar(&cfgFile, "config", "", "Config file")
 	flags.String("remote", "origin", "The name of the Git remote used to identify changed charts")
-	flags.String("target-branch", "master", "The name of the target branch used to identify changed charts")
+	flags.String("target-branch", "main", "The name of the target branch used to identify changed charts")
 	flags.String("since", "HEAD", "The Git reference used to identify changed charts")
 	flags.StringSlice("chart-dirs", []string{"charts"}, heredoc.Doc(`
 		Directories containing Helm charts. May be specified multiple times

diff --git a/doc/ct_install.md b/doc/ct_install.md
@@ -74,7 +74,7 @@ ct install [flags]
       --skip-missing-values                  When --upgrade has been passed, this flag will skip testing CI values files from the
                                              previous chart revision if they have been deleted or renamed at the current chart
                                              revision
-      --target-branch string                 The name of the target branch used to identify changed charts (default "master")
+      --target-branch string                 The name of the target branch used to identify changed charts (default "main")
       --upgrade                              Whether to test an in-place upgrade of each chart from its previous revision if the
                                              current version should not introduce a breaking change according to the SemVer spec
 ```

diff --git a/doc/ct_lint-and-install.md b/doc/ct_lint-and-install.md
@@ -69,7 +69,7 @@ ct lint-and-install [flags]
       --skip-missing-values                  When --upgrade has been passed, this flag will skip testing CI values files from the
                                              previous chart revision if they have been deleted or renamed at the current chart
                                              revision
-      --target-branch string                 The name of the target branch used to identify changed charts (default "master")
+      --target-branch string                 The name of the target branch used to identify changed charts (default "main")
       --upgrade                              Whether to test an in-place upgrade of each chart from its previous revision if the
                                              current version should not introduce a breaking change according to the SemVer spec
       --validate-chart-schema                Enable schema validation of 'Chart.yaml' using Yamale (default true)

diff --git a/doc/ct_lint.md b/doc/ct_lint.md
@@ -69,7 +69,7 @@ ct lint [flags]
                                              expose sensitive data when helm-repo-extra-args contains passwords)
       --remote string                        The name of the Git remote used to identify changed charts (default "origin")
       --since string                         The Git reference used to identify changed charts (default "HEAD")
-      --target-branch string                 The name of the target branch used to identify changed charts (default "master")
+      --target-branch string                 The name of the target branch used to identify changed charts (default "main")
       --validate-chart-schema                Enable schema validation of 'Chart.yaml' using Yamale (default true)
       --validate-maintainers                 Enable validation of maintainer account names in chart.yml.
                                              Works for GitHub, GitLab, and Bitbucket (default true)

diff --git a/doc/ct_list-changed.md b/doc/ct_list-changed.md
@@ -27,7 +27,7 @@ ct list-changed [flags]
                                   expose sensitive data when helm-repo-extra-args contains passwords)
       --remote string             The name of the Git remote used to identify changed charts (default "origin")
       --since string              The Git reference used to identify changed charts (default "HEAD")
-      --target-branch string      The name of the target branch used to identify changed charts (default "master")
+      --target-branch string      The name of the target branch used to identify changed charts (default "main")
 ```
 
 ### SEE ALSO

diff --git a/examples/kind/README.md b/examples/kind/README.md
@@ -3,5 +3,5 @@
 `kind` is a tool for running local Kubernetes clusters using Docker container "nodes".
 
 This example shows how to lint and test charts using CircleCi and [kind](https://github.com/kubernetes-sigs/kind).
-It creates a cluster with a single master node and one worker node.
+It creates a cluster with a single control-plane node and one worker node.
 The cluster configuration can be adjusted in [kind-config.yaml](test/kind-config.yaml). You can check for available configuration options in `kind` [docs](https://kind.sigs.k8s.io/docs/user/quick-start#configuring-your-kind-cluster)