From d9cb34ce6fe71a924ddb4fca0d589dc0195d0516 Mon Sep 17 00:00:00 2001 From: Marco Lecheler Date: Fri, 6 Jan 2023 16:46:20 +0100 Subject: [PATCH 1/4] chore: change default target-branch to main closes #376 Signed-off-by: Marco Lecheler Signed-off-by: Marco Lecheler --- ct/cmd/root.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/cmd/root.go b/ct/cmd/root.go index de8223b4..76a9b9f4 100644 --- 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 From 294f73c6eb385c987d68607875594e845f5cd0fa Mon Sep 17 00:00:00 2001 From: Marco Lecheler Date: Fri, 6 Jan 2023 16:48:13 +0100 Subject: [PATCH 2/4] docs: change default target-branch to main Signed-off-by: Marco Lecheler Signed-off-by: Marco Lecheler --- doc/ct_install.md | 2 +- doc/ct_lint.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ct_install.md b/doc/ct_install.md index 79517855..29d2dc41 100644 --- a/doc/ct_install.md +++ b/doc/ct_install.md @@ -72,7 +72,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.md b/doc/ct_lint.md index f35ee02a..e8190299 100644 --- a/doc/ct_lint.md +++ b/doc/ct_lint.md @@ -67,7 +67,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) From 5b1067d9dff0500610ed864bbb6a1d293af40d1d Mon Sep 17 00:00:00 2001 From: Marco Lecheler Date: Mon, 17 Jul 2023 13:52:44 +0200 Subject: [PATCH 3/4] docs: update missing inclusive naming Signed-off-by: Marco Lecheler Signed-off-by: Marco Lecheler --- code-of-conduct.md | 2 +- doc/ct_lint-and-install.md | 2 +- doc/ct_list-changed.md | 2 +- examples/kind/README.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code-of-conduct.md b/code-of-conduct.md index 91ccaf03..74c5cb7a 100644 --- 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/doc/ct_lint-and-install.md b/doc/ct_lint-and-install.md index 73d13fe0..ac5e3480 100644 --- a/doc/ct_lint-and-install.md +++ b/doc/ct_lint-and-install.md @@ -67,7 +67,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_list-changed.md b/doc/ct_list-changed.md index 4c84f770..5080a62f 100644 --- 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 index 4f29bb73..79424536 100644 --- 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 main 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) From d3e415c5abdb691e25e1cc5ac8e9e47726ff9a31 Mon Sep 17 00:00:00 2001 From: Marco Lecheler Date: Fri, 18 Aug 2023 13:05:20 +0200 Subject: [PATCH 4/4] chore: update kind readme to use inclusive naming Co-authored-by: Carlos Tadeu Panato Junior Signed-off-by: Marco Lecheler --- examples/kind/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/kind/README.md b/examples/kind/README.md index 79424536..3e5464b7 100644 --- 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 main 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)