Updated branches references from "master" to "main"

Author: Hector Vido

cmd/autoconfigbrancher/README.md

@@ -15,27 +15,27 @@ be automatically merged (does not need a human approval).
 
 _(subject to bitrot, always consult the code)_
 
-- [ci-operator-yaml-creator](https://github.com/openshift/ci-tools/tree/master/cmd/ci-operator-yaml-creator): ensures
+- [ci-operator-yaml-creator](https://github.com/openshift/ci-tools/tree/main/cmd/ci-operator-yaml-creator): ensures
   that repositories with in-repo `.ci-operator.yaml` file use `build_root.from_repository: true` in their ci-operator
   configs
-- [registry-replacer](https://github.com/openshift/ci-tools/tree/master/cmd/registry-replacer): ensures that all builds
+- [registry-replacer](https://github.com/openshift/ci-tools/tree/main/cmd/registry-replacer): ensures that all builds
   specified in ci-operator configs use a local cluster registry (replaces central registry pullspecs with local
   ImageStreamTag references)
-- [config-brancher](https://github.com/openshift/ci-tools/tree/master/cmd/config-brancher): propagates ci-operator
+- [config-brancher](https://github.com/openshift/ci-tools/tree/main/cmd/config-brancher): propagates ci-operator
   config changes from `master`/`main` configs to future release branches
-- [ci-operator-config-mirror](https://github.com/openshift/ci-tools/tree/master/cmd/ci-operator-config-mirror):
+- [ci-operator-config-mirror](https://github.com/openshift/ci-tools/tree/main/cmd/ci-operator-config-mirror):
   propagates ci-operator config changes to private forks in `openshift-priv` organization
-- [determinize-ci-operator](https://github.com/openshift/ci-tools/tree/master/cmd/determinize-ci-operator): loads and
+- [determinize-ci-operator](https://github.com/openshift/ci-tools/tree/main/cmd/determinize-ci-operator): loads and
   saves ci-operator config to fix ordering, formatting etc
-- [ci-operator-prowgen](https://github.com/openshift/ci-tools/tree/master/cmd/ci-operator-prowgen): generates Prow job
+- [ci-operator-prowgen](https://github.com/openshift/ci-tools/tree/main/cmd/ci-operator-prowgen): generates Prow job
   configuration from ci-operator configuration
-- [private-prow-configs-mirror](https://github.com/openshift/ci-tools/tree/master/cmd/private-prow-configs-mirror):
+- [private-prow-configs-mirror](https://github.com/openshift/ci-tools/tree/main/cmd/private-prow-configs-mirror):
   propagates Prow configuration changes to private forks in `openshift-priv` organization
-- [determinize-prow-config](https://github.com/openshift/ci-tools/tree/master/cmd/private-prow-configs-mirror): loads
+- [determinize-prow-config](https://github.com/openshift/ci-tools/tree/main/cmd/private-prow-configs-mirror): loads
   and saves Prow configuration to fix ordering, formatting, proper sharding etc
-- [sanitize-prow-jobs](https://github.com/openshift/ci-tools/tree/master/cmd/sanitize-prow-jobs): loads and saves Prow
+- [sanitize-prow-jobs](https://github.com/openshift/ci-tools/tree/main/cmd/sanitize-prow-jobs): loads and saves Prow
   job configuration to fix ordering, formatting etc. This tool also assigns jobs to build farm clusters.
-- [clusterimageset-updater](https://github.com/openshift/ci-tools/tree/master/cmd/clusterimageset-updater): updates
+- [clusterimageset-updater](https://github.com/openshift/ci-tools/tree/main/cmd/clusterimageset-updater): updates
   cluster pool manifests to use the latest stable OCP releases
 
 ## Why it exists
@@ -44,7 +44,7 @@ Over time, we wrote a number of tools that automatically maintain parts of the C
 in [openshift/release](https://github.com/openshift/release/) so that we do not need to do so as humans. After some
 time, it was annoying to write a PR-creation capability for each tool separately and set up a periodic job for it, so we
 started to add new tools as "steps" to the most mature of them (`auto-config-brancher` was originally a tool that simply
-ran [config-brancher](https://github.com/openshift/ci-tools/tree/master/cmd/config-brancher), committed the changes and
+ran [config-brancher](https://github.com/openshift/ci-tools/tree/main/cmd/config-brancher), committed the changes and
 submitted a PR).
 
 ## How it works

cmd/autoconfigbrancher/main.go

@@ -29,6 +29,7 @@ const (
 	githubTeam   = "openshift/test-platform"
 	matchTitle   = "Automate config brancher"
 	remoteBranch = "auto-config-brancher"
+	localBranch  = "main"
 
 	prowConfigDir = "./core-services/prow/02_config/"
 )
@@ -280,7 +281,7 @@ func main() {
 		logrus.Infof("Self-approving PR by adding the %q and %q labels", labels.Approved, labels.LGTM)
 		labelsToAdd = append(labelsToAdd, labels.Approved, labels.LGTM)
 	}
-	if err := bumper.UpdatePullRequestWithLabels(gc, githubOrg, githubRepo, title, fmt.Sprintf("/cc @%s", o.assign), o.githubLogin+":"+remoteBranch, "master", remoteBranch, true, labelsToAdd, false); err != nil {
+	if err := bumper.UpdatePullRequestWithLabels(gc, githubOrg, githubRepo, title, fmt.Sprintf("/cc @%s", o.assign), o.githubLogin+":"+remoteBranch, localBranch, remoteBranch, true, labelsToAdd, false); err != nil {
 		logrus.WithError(err).Fatal("PR creation failed.")
 	}
 }

cmd/autoowners/README.md

@@ -50,7 +50,7 @@ Usage of autoowners:
   -plugin-config string
     	Path to plugin config file.
   -pr-base-branch string
-    	The base branch to use for the pull request. (default "master")
+    	The base branch to use for the pull request. (default "main")
   -repo string
     	The downstream GitHub repository name. (default "release")
   -self-approve approved
@@ -90,4 +90,4 @@ $ /usr/bin/autoowners --github-token-path=/etc/github/oauth --git-name=openshift
 ```
 
 [openshift/origin]: https://github.com/openshift/origin
-[openshift/origin-jobs]: https://github.com/openshift/release/tree/master/ci-operator/jobs/openshift/origin
+[openshift/origin-jobs]: https://github.com/openshift/release/tree/main/ci-operator/jobs/openshift/origin

cmd/autoowners/main.go

@@ -40,7 +40,7 @@ const (
 	configSubDirs      = "jobs,config,templates"
 	targetSubDirectory = "ci-operator"
 
-	defaultBaseBranch = "master"
+	defaultBaseBranch = "main"
 )
 
 type SimpleConfig = repoowners.SimpleConfig

cmd/autoperibolossync/main.go

@@ -144,10 +144,10 @@ func main() {
 	}
 
 	// TODO fix the bumper in upstream to retrieve a default branch
-	defaultBranch := "master"
+	defaultBranch := "main"
 	if err := bumper.UpdatePullRequestWithLabels(gc, githubOrg, githubRepo, title, description, o.githubLogin+":"+remoteBranch, defaultBranch, remoteBranch, true, labelsToAdd, o.dryRun); err != nil {
-		logrus.WithError(err).Fatal("Failed to use 'master' branch")
-		defaultBranch = "main"
+		logrus.WithError(err).Fatal("Failed to use 'main' branch")
+		defaultBranch = "master"
 		if err := bumper.UpdatePullRequestWithLabels(gc, githubOrg, githubRepo, title, description, o.githubLogin+":"+remoteBranch, defaultBranch, remoteBranch, true, labelsToAdd, o.dryRun); err != nil {
 			logrus.WithError(err).Fatal("PR creation failed.")
 		}

cmd/autopublicizeconfig/main.go

@@ -26,6 +26,7 @@ const (
 	githubOrg    = "openshift"
 	githubRepo   = "release"
 	githubLogin  = "openshift-bot"
+	localBranch  = "main"
 	remoteBranch = "auto-publicize-sync"
 	privateOrg   = "openshift-priv"
 	matchTitle   = "Automate publicize configuration sync"
@@ -168,7 +169,7 @@ func main() {
 	}
 
 	source := fmt.Sprintf("%s:%s", o.githubLogin, remoteBranch)
-	if err := bumper.UpdatePullRequestWithLabels(gc, githubOrg, githubRepo, title, description, source, "master", remoteBranch, true, labelsToAdd, o.dryRun); err != nil {
+	if err := bumper.UpdatePullRequestWithLabels(gc, githubOrg, githubRepo, title, description, source, localBranch, remoteBranch, true, labelsToAdd, o.dryRun); err != nil {
 		logrus.WithError(err).Fatal("PR creation failed.")
 	}
 }

cmd/branchingconfigmanagers/README.md

@@ -14,7 +14,7 @@ update the CI configuration to match the state expected by the product policy at
 ### Product Lifecycle Data
 
 The product lifecycle data will be supplied as a YAML file with the following structure (
-see https://github.com/openshift/ci-tools/blob/master/pkg/api/ocplifecycle for more details):
+see https://github.com/openshift/ci-tools/blob/main/pkg/api/ocplifecycle for more details):
 
 ```yaml
 ocp:

cmd/ci-images-mirror/README.md

@@ -15,8 +15,8 @@ For example, `registry.ci.openshift.org/namespace/name:tag` is mirrored to
   SHA256 hash of the docker image without the prefix `sha256:`.
 
 This tool is extended with the following features (and thus is no longer temporary):
-- mirror images from external registries to QCI: See `.supplementalCIImages` of [the configuration file](https://github.com/openshift/release/blob/master/core-services/image-mirroring/_config.yaml).
-- mirror ART images from app.ci to QCI: See `.artImages` of [the configuration file](https://github.com/openshift/release/blob/master/core-services/image-mirroring/_config.yaml).
+- mirror images from external registries to QCI: See `.supplementalCIImages` of [the configuration file](https://github.com/openshift/release/blob/main/core-services/image-mirroring/_config.yaml).
+- mirror ART images from app.ci to QCI: See `.artImages` of [the configuration file](https://github.com/openshift/release/blob/main/core-services/image-mirroring/_config.yaml).
 
 ## Run the tool locally
 
@@ -73,4 +73,4 @@ $ curl -s http://localhost:28090/api/v1/mirrors\?action\=show\&limit\=1  | jq
 }
 
 $ oc logs -n ci -l app=ci-images-mirror -c ci-images-mirror -f | grep -i keep-manifest-list
-```
+```

cmd/ci-operator-checkconfig/README.md

@@ -33,5 +33,5 @@ ci-operator-checkconfig \
 ```
 
 [openshift_release]: https://github.com/openshift/release.git
-[pkg_validation]: https://github.com/openshift/ci-tools/tree/master/pkg/validation
+[pkg_validation]: https://github.com/openshift/ci-tools/tree/main/pkg/validation
 [presubmit_job]: https://prow.ci.openshift.org/job-history/gs/test-platform-results/pr-logs/directory/pull-ci-openshift-release-master-ci-operator-config

cmd/ci-operator-yaml-creator/main.go

@@ -84,7 +84,7 @@ func main() {
 	}
 	prCreationOps = append(prCreationOps, prcreation.PrBody(`
 This is an autogenerated PR that updates the `+"`.ci-operator.yaml`"+`
-to reference the `+"`build_root_image`"+` found in the [ci-operator-config](https://github.com/openshift/release/tree/master/ci-operator/config)
+to reference the `+"`build_root_image`"+` found in the [ci-operator-config](https://github.com/openshift/release/tree/main/ci-operator/config)
 in the [openshift/release](https://github.com/openshift/release) repository.
 
 This is done in preparation for enabling reading the `+"`build_root`"+` from

cmd/cvp-trigger/README.md

@@ -9,12 +9,12 @@ To test the optional operator images built internally in Red Hat, CVP triggers
 testing jobs via the `cvp-trigger` tool. Currently, the only implemented test
 workflow is the one executing the common operator tests (component-agnostic).
 For common operator tests, `cvp-trigger` creates a parameterized instance of the
-`cpaas-cvp-optional-operator-common-tests` job, living in [openshift/release](https://github.com/openshift/release/blob/master/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml).
+`cpaas-cvp-optional-operator-common-tests` job, living in [openshift/release](https://github.com/openshift/release/blob/main/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml).
 See the [Triggered Job Interface](#triggered-job-interface) section for details
  about the parametrization.
 
 The `cpaas-cvp-optional-operator-common-tests` job runs ci-operator using
-a config stored in [redhat-openshift-ecosystem](https://github.com/redhat-openshift-ecosystem/release/tree/master/ci-operator/config/redhat-openshift-ecosystem/playground).
+a config stored in [redhat-openshift-ecosystem](https://github.com/redhat-openshift-ecosystem/release/tree/main/ci-operator/config/redhat-openshift-ecosystem/playground).
 The exact configuration to use is inferred from the desired OCP version. For
 example, for OCP version 4.5, ci-operator uses the config for the
 artificial `cvp-ocp-4.5` branch of the `redhat-openshift-ecosystem/playground`

cmd/github-ldap-user-group-creator/README.md

@@ -9,7 +9,7 @@
 
 The groups are used
 - by `ci-operator` which promotes the group to the admins of the namespace created for the test.
-- in [the manifests](https://github.com/openshift/release/tree/master/clusters) of CI clusters
+- in [the manifests](https://github.com/openshift/release/tree/main/clusters) of CI clusters
   in the release repo.
 
 ## How it works
@@ -31,6 +31,6 @@ This tool is also responsible for deleting the users and their identities on all
 ## How is it deployed
 
 The periodic
-job [periodic-github-ldap-user-group-creator](https://deck-internal-ci.apps.ci.l2s4.p1.openshiftapps.com/?job=periodic-github-ldap-user-group-creator) ([definition](https://github.com/openshift/release/blob/master/ci-operator/jobs/infra-periodics.yaml))
+job [periodic-github-ldap-user-group-creator](https://deck-internal-ci.apps.ci.l2s4.p1.openshiftapps.com/?job=periodic-github-ldap-user-group-creator) ([definition](https://github.com/openshift/release/blob/main/ci-operator/jobs/infra-periodics.yaml))
 uses `github-ldap-user-group-creator` to create the groups.
-The service account RBACs are defined in [admin_github-ldap-user-group-creator_rbac.yaml](https://github.com/openshift/release/blob/master/clusters/build-clusters/common/assets/admin_github-ldap-user-group-creator_rbac.yaml)
+The service account RBACs are defined in [admin_github-ldap-user-group-creator_rbac.yaml](https://github.com/openshift/release/blob/main/clusters/build-clusters/common/assets/admin_github-ldap-user-group-creator_rbac.yaml)

cmd/ocp-build-data-enforcer/main.go

@@ -130,7 +130,7 @@ func processDockerfile(config ocpbuilddata.OCPImageConfig, processor diffProcess
 	if !hasDiff {
 		return nil
 	}
-	branch := "master"
+	branch := "main"
 	if config.Content != nil && config.Content.Source.Git != nil && strings.HasPrefix(config.Content.Source.Git.Branch.Taget, "openshift-") {
 		branch = config.Content.Source.Git.Branch.Taget
 	}
@@ -308,7 +308,7 @@ func (dp *diffProcessor) process() error {
 					"If you believe the content of this PR is incorrect, please contact the dptp team in",
 					"#aos-art.",
 					"",
-					"[1]: https://github.com/openshift/ci-tools/tree/master/cmd/ocp-build-data-enforcer",
+					"[1]: https://github.com/openshift/ci-tools/tree/main/cmd/ocp-build-data-enforcer",
 					"[2]: https://github.com/openshift/ocp-build-data/tree/openshift-4.6/images",
 				}, "\n")),
 			); err != nil {

cmd/pj-rehearse/server.go

@@ -545,7 +545,7 @@ func (s *server) prepareCandidate(repoClient git.RepoClient, pullRequest *github
 	}
 	candidate := rehearse.RehearsalCandidateFromPullRequest(pullRequest, baseSHA)
 
-	// In order to determine *only* the affected jobs from the changes in the PR, we need to rebase onto master
+	// In order to determine *only* the affected jobs from the changes in the PR, we need to rebase onto main
 	baseRef := pullRequest.Base.Ref
 
 	// In practice, this command sometimes fails due to seemingly transient issues, we should retry it up to 4 times
@@ -561,7 +561,7 @@ func (s *server) prepareCandidate(repoClient git.RepoClient, pullRequest *github
 		}
 	}
 	if !rebased || rebaseErr != nil {
-		return rehearse.RehearsalCandidate{}, fmt.Errorf("couldn't rebase candidate onto master: %w", err)
+		return rehearse.RehearsalCandidate{}, fmt.Errorf("couldn't rebase candidate onto main: %w", err)
 	}
 
 	return candidate, nil

cmd/prcreator/main.go

@@ -31,7 +31,7 @@ func gatherOptions() (*options, error) {
 	flag.StringVar(&opts.prAssignee, "pr-assignee", "", "Comma separated list of assignees for the PR to create")
 	flag.StringVar(&opts.organization, "organization", "openshift", "The GitHub organization in which the PR should be created")
 	flag.StringVar(&opts.repo, "repo", "release", "The name of the repo in which the PR should be created")
-	flag.StringVar(&opts.branch, "branch", "master", "The branch for which the PR should be created")
+	flag.StringVar(&opts.branch, "branch", "main", "The branch for which the PR should be created")
 	flag.Parse()
 
 	var errs []error