Merge pull request crossplane#5930 from jeanduplessis/main

Code updates after renaming `master` → `main`
nokia · Sep 4, 2024 · 90e3812 · 90e3812
2 parents 1b4de65 + 72175d6
commit 90e3812
Show file tree

Hide file tree

Showing 27 changed files with 64 additions and 64 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -27,7 +27,7 @@ I have: <!--You MUST either [x] check or [ ] ~strike through~ every item.-->
 
 Need help with this checklist? See the [cheat sheet].
 
-[contribution process]: https://github.com/crossplane/crossplane/tree/master/contributing
+[contribution process]: https://github.com/crossplane/crossplane/tree/main/contributing
 [docs tracking issue]: https://github.com/crossplane/docs/issues/new
 [document this change]: https://docs.crossplane.io/contribute/contribute
-[cheat sheet]: https://github.com/crossplane/crossplane/tree/master/contributing#checklist-cheat-sheet
+[cheat sheet]: https://github.com/crossplane/crossplane/tree/main/contributing#checklist-cheat-sheet
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -13,7 +13,7 @@
   // The branches renovate should target
   // PLEASE UPDATE THIS WHEN RELEASING.
   "baseBranches": [
-    "master",
+    "main",
     "release-1.15",
     "release-1.16",
     "release-1.17"
@@ -166,12 +166,12 @@
   // be at the beginning, high priority at the end
   "packageRules": [
     {
-      "description": "Generate code after upgrading go dependencies (master)",
+      "description": "Generate code after upgrading go dependencies (main)",
       "matchDatasources": [
         "go"
       ],
-      // Currently we only have an Earthfile on master.
-      matchBaseBranches: ["master"],
+      // Currently we only have an Earthfile on main.
+      matchBaseBranches: ["main"],
       postUpgradeTasks: {
         // Post-upgrade tasks that are executed before a commit is made by Renovate.
         "commands": [
@@ -188,7 +188,7 @@
       "matchDatasources": [
         "go"
       ],
-      // Currently we only have an Earthfile on master.
+      // Currently we only have an Earthfile on main.
       matchBaseBranches: ["release-.+"],
       postUpgradeTasks: {
         // Post-upgrade tasks that are executed before a commit is made by Renovate.
@@ -202,12 +202,12 @@
       },
     },
     {
-      "description": "Lint code after upgrading golangci-lint (master)",
+      "description": "Lint code after upgrading golangci-lint (main)",
       "matchDepNames": [
         "golangci/golangci-lint"
       ],
-      // Currently we only have an Earthfile on master.
-      matchBaseBranches: ["master"],
+      // Currently we only have an Earthfile on main.
+      matchBaseBranches: ["main"],
       postUpgradeTasks: {
         // Post-upgrade tasks that are executed before a commit is made by Renovate.
         "commands": [
@@ -224,7 +224,7 @@
       "matchDepNames": [
         "golangci/golangci-lint"
       ],
-      // Currently we only have an Earthfile on master.
+      // Currently we only have an Earthfile on main.
       matchBaseBranches: ["release-.+"],
       postUpgradeTasks: {
         // Post-upgrade tasks that are executed before a commit is made by Renovate.

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
       - release-*
   pull_request: {}
   workflow_dispatch: {}
@@ -52,7 +52,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Configure Earthly to Push Cache to GitHub Container Registry 
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         run: |
           echo "EARTHLY_PUSH=true" >> $GITHUB_ENV
           echo "EARTHLY_MAX_REMOTE_CACHE=true" >> $GITHUB_ENV
@@ -98,7 +98,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Configure Earthly to Push Cache to GitHub Container Registry 
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         run: |
           echo "EARTHLY_PUSH=true" >> $GITHUB_ENV
           echo "EARTHLY_MAX_REMOTE_CACHE=true" >> $GITHUB_ENV
@@ -134,7 +134,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Configure Earthly to Push Cache to GitHub Container Registry 
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         run: |
           echo "EARTHLY_PUSH=true" >> $GITHUB_ENV
           echo "EARTHLY_MAX_REMOTE_CACHE=true" >> $GITHUB_ENV
@@ -198,7 +198,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Configure Earthly to Push Cache to GitHub Container Registry 
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         run: |
           echo "EARTHLY_PUSH=true" >> $GITHUB_ENV
           echo "EARTHLY_MAX_REMOTE_CACHE=true" >> $GITHUB_ENV
@@ -250,7 +250,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Configure Earthly to Push Cache to GitHub Container Registry 
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         run: |
           echo "EARTHLY_PUSH=true" >> $GITHUB_ENV
           echo "EARTHLY_MAX_REMOTE_CACHE=true" >> $GITHUB_ENV
@@ -322,11 +322,11 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Configure Earthly to Push Cache to GitHub Container Registry 
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         run: echo "EARTHLY_MAX_REMOTE_CACHE=true" >> $GITHUB_ENV
 
       - name: Configure Earthly to Push Artifacts
-        if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-')) && env.DOCKER_USR != '' && env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != '' && env.AWS_USR != ''
+        if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-')) && env.DOCKER_USR != '' && env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != '' && env.AWS_USR != ''
         run: echo "EARTHLY_PUSH=true" >> $GITHUB_ENV
 
       - name: Set CROSSPLANE_VERSION GitHub Environment Variable
@@ -344,7 +344,7 @@ jobs:
             +ci-push-build-artifacts --AWS_DEFAULT_REGION=us-east-1 --CROSSPLANE_VERSION=${CROSSPLANE_VERSION} --BUILD_DIR=${GITHUB_REF##*/}
 
       - name: Push Artifacts to https://releases.crossplane.io/master/ and https://charts.crossplane.io/master
-        if: env.AWS_USR != '' && github.ref == 'refs/heads/master'
+        if: env.AWS_USR != '' && github.ref == 'refs/heads/main'
         run: |
           earthly --strict \
             --secret=AWS_ACCESS_KEY_ID=${{ secrets.AWS_USR }} \
@@ -405,14 +405,14 @@ jobs:
       # https://github.com/bufbuild/buf-push-action/issues/34
       - name: Detect Breaking Changes in Protocol Buffers
         uses: bufbuild/buf-breaking-action@a074e988ee34efcd4927079e79c611f428354c01 # v1
-        # We want to run this for the master branch, and PRs against master.
-        if: ${{ github.ref == 'refs/heads/master' || github.base_ref == 'master' }}
+        # We want to run this for the main branch, and PRs against main.
+        if: ${{ github.ref == 'refs/heads/main' || github.base_ref == 'main' }}
         with:
           input: apis
-          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=master,subdir=apis"
+          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=apis"
 
       - name: Push Protocol Buffers to Buf Schema Registry
-        if: ${{ github.repository == 'crossplane/crossplane' && github.ref == 'refs/heads/master' }}
+        if: ${{ github.repository == 'crossplane/crossplane' && github.ref == 'refs/heads/main' }}
         uses: bufbuild/buf-push-action@v1
         with:
           input: apis

diff --git a/ADOPTERS.md b/ADOPTERS.md
@@ -15,7 +15,7 @@ maturity, and momentum.  Thank you to all adopters and contributors of the Cross
 To add your organization to this list, you can choose any of the following options:
 
 1. [Open a PR](https://github.com/crossplane/crossplane/pulls) to directly update this list, or
-   [edit this file](https://github.com/crossplane/crossplane/edit/master/ADOPTERS.md) directly in
+   [edit this file](https://github.com/crossplane/crossplane/edit/main/ADOPTERS.md) directly in
    Github
 1. Fill out the [adopters form](https://forms.gle/dBQhiyYkYSdzXovN6)
 1. Send an email to <[email protected]> with your information for the table below

diff --git a/CHARTER.md b/CHARTER.md
@@ -116,4 +116,4 @@ This is a living document. Changes to the scope, principles, or mission
 statement of the Crossplane project require a [majority vote][sc-voting] of the
 steering committee.
 
-[sc-voting]: https://github.com/crossplane/crossplane/blob/master/GOVERNANCE.md#updating-the-governance
+[sc-voting]: https://github.com/crossplane/crossplane/blob/main/GOVERNANCE.md#updating-the-governance
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,3 +1,3 @@
 ## Community Code of Conduct
 
-This project follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+This project follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
diff --git a/README.md b/README.md
@@ -135,7 +135,7 @@ Crossplane is under the Apache 2.0 license.
 [community calendar]: https://calendar.google.com/calendar/embed?src=c_2cdn0hs9e2m05rrv1233cjoj1k%40group.calendar.google.com
 [releases]: https://github.com/crossplane/crossplane/releases
 [ADOPTERS.md]: ADOPTERS.md
-[regular community meetings]: https://github.com/crossplane/crossplane/blob/master/README.md#get-involved
+[regular community meetings]: https://github.com/crossplane/crossplane/blob/main/README.md#get-involved
 [Crossplane Roadmap]: https://github.com/orgs/crossplane/projects/20/views/9?pane=info
 [sig-composition-environments-slack]: https://crossplane.slack.com/archives/C05BP6QFLUW
 [sig-composition-functions-slack]: https://crossplane.slack.com/archives/C031Y29CSAE

diff --git a/ROADMAP.md b/ROADMAP.md
@@ -22,4 +22,4 @@ delivery timeline.
 [Crossplane Roadmap]
 
 [Crossplane Roadmap]: https://github.com/orgs/crossplane/projects/20/views/9?pane=info
-[regular community meetings]: https://github.com/crossplane/crossplane/blob/master/README.md#get-involved
+[regular community meetings]: https://github.com/crossplane/crossplane/blob/main/README.md#get-involved
diff --git a/SECURITY.md b/SECURITY.md
@@ -38,7 +38,7 @@ To report a vulnerability, either:
 The reporter(s) can typically expect a response within 24 hours acknowledging
 the issue was received. If a response is not received within 24 hours, please
 reach out to any
-[maintainer](https://github.com/crossplane/crossplane/blob/master/OWNERS.md#maintainers)
+[maintainer](https://github.com/crossplane/crossplane/blob/main/OWNERS.md#maintainers)
 directly to confirm receipt of the issue.
 
 ### Report Content

diff --git a/contributing/README.md b/contributing/README.md
@@ -846,7 +846,7 @@ func TestExample(t *testing.T) {
 ```
 
 [Slack]: https://slack.crossplane.io/
-[code of conduct]: https://github.com/cncf/foundation/blob/master/code-of-conduct.md
+[code of conduct]: https://github.com/cncf/foundation/blob/main/code-of-conduct.md
 [Earthly]: https://docs.earthly.dev
 [get-docker]: https://docs.docker.com/get-docker
 [get-earthly]: https://earthly.dev/get-earthly

diff --git a/contributing/guide-adding-external-secret-stores.md b/contributing/guide-adding-external-secret-stores.md
@@ -124,7 +124,7 @@ requires some dirty work as we need to this for all types:
 You can check [this commit as an example for changes in Setup functions] as an
 example.
 
-[External Secret Stores]: https://github.com/crossplane/crossplane/blob/master/design/design-doc-external-secret-stores.md
+[External Secret Stores]: https://github.com/crossplane/crossplane/blob/main/design/design-doc-external-secret-stores.md
 [this PR as a complete example]: https://github.com/crossplane/provider-gcp/pull/421
 [this PR instead]: https://github.com/crossplane-contrib/provider-jet-template/pull/23/commits
 [this commit as an example on how to add the type]: https://github.com/crossplane-contrib/provider-aws/pull/1242/commits/d8a2df323fa2489d82bf1843d2fe338de033c61d

diff --git a/contributing/guide-adding-fuzz-test-cases.md b/contributing/guide-adding-fuzz-test-cases.md
@@ -102,12 +102,12 @@ put in place a few configurations across different repositories:
 
 
 [CIFuzz]: https://google.github.io/oss-fuzz/getting-started/continuous-integration/
-[fuzz-audit-report]: https://github.com/crossplane/crossplane/blob/master/security/ADA-fuzzing-audit-22.pdf
+[fuzz-audit-report]: https://github.com/crossplane/crossplane/blob/main/security/ADA-fuzzing-audit-22.pdf
 [go-fuzz]: https://go.dev/security/fuzz/
 [oss-fuzz-arch]: https://google.github.io/oss-fuzz/architecture/
 [oss-fuzz-folder]: https://github.com/google/oss-fuzz/tree/master/projects/crossplane
 [oss-fuzz]: https://github.com/google/oss-fuzz
-[xp-ci]: https://github.com/crossplane/crossplane/blob/master/.github/workflows/ci.yml
+[xp-ci]: https://github.com/crossplane/crossplane/blob/main/.github/workflows/ci.yml
 [xp-fuzz-tests]: https://github.com/search?q=repo%3Acrossplane%2Fcrossplane+%22func+Fuzz%22&type=code
-[xp-fuzz_oss_build]: https://github.com/crossplane/crossplane/blob/master/test/fuzz/oss_fuzz_build.sh
-[xp-r-fuzz_oss_build]: https://github.com/crossplane/crossplane-runtime/blob/master/test/fuzz/oss_fuzz_build.sh
+[xp-fuzz_oss_build]: https://github.com/crossplane/crossplane/blob/main/test/fuzz/oss_fuzz_build.sh
+[xp-r-fuzz_oss_build]: https://github.com/crossplane/crossplane-runtime/blob/main/test/fuzz/oss_fuzz_build.sh
diff --git a/contributing/guide-provider-development.md b/contributing/guide-provider-development.md
@@ -644,7 +644,7 @@ feedback you may have about the development process!
 [reach out]: https://github.com/crossplane/crossplane#get-involved
 [crossplane org]: https://github.com/crossplane
 [`angryjet`]: https://github.com/crossplane/crossplane-tools
-[Managed Resource API Patterns]: https://github.com/crossplane/crossplane/blob/master/design/one-pager-managed-resource-api-design.md
+[Managed Resource API Patterns]: https://github.com/crossplane/crossplane/blob/main/design/one-pager-managed-resource-api-design.md
 [Crossplane CLI]: https://github.com/crossplane/crossplane-cli#quick-start-stacks
 [`angryjet` documentation]: https://github.com/crossplane/crossplane-tools/blob/master/README.md
 [code generation guide]: https://github.com/crossplane-contrib/provider-aws/blob/master/CODE_GENERATION.md

diff --git a/contributing/specifications/functions.md b/contributing/specifications/functions.md
@@ -15,7 +15,7 @@ A Function MUST implement a gRPC `FunctionRunnerService` server. A Function
 SHOULD implement the latest available version of this service - e.g. `v1beta1`.
 The authoritative definition of this service can be found at the following URL.
 
-https://github.com/crossplane/crossplane/tree/master/apis/apiextensions/fn/proto
+https://github.com/crossplane/crossplane/tree/main/apis/apiextensions/fn/proto
 
 A Function MUST copy the tag field from a RunFunctionRequest's RequestMeta
 message to the ResponseMeta tag field of the corresponding RunFunctionResponse.

diff --git a/design/README.md b/design/README.md
@@ -39,7 +39,7 @@ welcome from any member of the Crossplane community, but feedback from the
 elected reviewers carries extra weight.
 
 The __document status__ reflects the lifecycle of the design. Designs may be
-committed to master at any stage in their lifecycle as long as the status is
+committed to `main` at any stage in their lifecycle as long as the status is
 indicated clearly. Use one of the following statuses:
 
 * _Speculative_ designs explore an idea without _yet_ explicitly proposing a

diff --git a/design/design-doc-composition-validating-webhook.md b/design/design-doc-composition-validating-webhook.md
@@ -403,7 +403,7 @@ them.
 Already covered in the Background section with pros and cons.
 
 [original-webhook-pr]: https://github.com/crossplane/crossplane/pull/2919
-[original-webhook-design-doc]: https://github.com/crossplane/crossplane/blob/master/design/design-doc-webhooks.md
+[original-webhook-design-doc]: https://github.com/crossplane/crossplane/blob/main/design/design-doc-webhooks.md
 [original-composition-validation-webhook-issue]: https://github.com/crossplane/crossplane/issues/1476
 [vscode-plugin]: https://github.com/upbound/vscode-up
 [upbound/up]: https://github.com/upbound/up/blob/main/internal/xpkg/snapshot/composition.go#L66

diff --git a/design/design-doc-external-secret-stores.md b/design/design-doc-external-secret-stores.md
@@ -635,6 +635,6 @@ related discussion or issue._
 [Vault agent inject template]: https://learn.hashicorp.com/tutorials/vault/kubernetes-sidecar#apply-a-template-to-the-injected-secrets
 [ArgoCD cluster]: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup/#clusters
 [AWS secret manager]: https://aws.amazon.com/secrets-manager/
-[provider-aws Secret resource]: https://github.com/crossplane/provider-aws/blob/master/examples/secretsmanager/secret.yaml
+[provider-aws Secret resource]: https://github.com/crossplane-contrib/provider-aws/blob/master/examples/secretsmanager/secret.yaml
 [GenericSecret]: https://registry.terraform.io/providers/hashicorp/vault/latest/docs/resources/generic_secret
 [kubernetes-sigs/secrets-store-csi-driver]: https://github.com/kubernetes-sigs/secrets-store-csi-driver
diff --git a/design/design-doc-observe-only-resources.md b/design/design-doc-observe-only-resources.md
@@ -716,5 +716,5 @@ it as a migration path to Crossplane.
 [most recent AMI]: https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami#most_recent
 [desired tags]: https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc#tags
 [passing sensitive configuration]: https://github.com/crossplane/crossplane/pull/2886#discussion_r862615416
-[`type: Webhook` composition function]: https://github.com/crossplane/crossplane/blob/master/design/design-doc-composition-functions.md#using-webhooks-to-run-functions
+[`type: Webhook` composition function]: https://github.com/crossplane/crossplane/blob/main/design/design-doc-composition-functions.md#using-webhooks-to-run-functions
 [ignore changes]: https://github.com/crossplane/crossplane/blob/ad0ff7d6d0e4850168883905ed8e1509089cea15/design/one-pager-ignore-changes.md