refactor: master -> main

FabianKramm · FabianKramm · commit 1cbb87638023 · 2022-08-10T11:09:20.000-07:00
diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -5,7 +5,7 @@ on:
     types: [created]
   pull_request:
     branches:
-      - master
+      - main
       - v6
     paths:
       - "Dockerfile"
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -5,7 +5,7 @@ on:
     types: [created]
   pull_request:
     branches:
-      - master
+      - main
       - v6
     paths:
       - "**.go"
diff --git a/.github/workflows/npm.yaml b/.github/workflows/npm.yaml
@@ -3,7 +3,7 @@ name: Test NPM Installer
 on:
   pull_request:
     branches:
-      - master
+      - main
     paths:
       - "dist/npm/**"
       - ".github/workflows/npm.yaml"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -5,15 +5,15 @@ on:
     types: [created]
   push:
     branches:
-      - master
+      - main
     paths:
       - "Dockerfile"
       - "**.go"
       - "hack/coverage.bash"
       - ".github/workflows/release.yaml"
   pull_request:
     branches:
-      - master
+      - main
     paths:
       - "Dockerfile"
       - "**.go"
@@ -115,7 +115,7 @@ jobs:
           RELEASE_VERSION: ${{ steps.get_version.outputs.release_version }}
           NODE_AUTH_TOKEN: ${{ secrets.NPMJS_TOKEN }}
   publish-next-image:
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
diff --git a/.github/workflows/ui.yaml b/.github/workflows/ui.yaml
@@ -3,7 +3,7 @@ name: Test UI
 on:
   pull_request:
     branches:
-      - master
+      - main
     paths:
       - "ui/**"
       - "hack/build-ui.bash"
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -5,7 +5,7 @@ on:
     types: [created]
   pull_request:
     branches:
-      - master
+      - main
       - v6
     paths:
       - "**.go"
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ### **[Website](https://devspace.sh)** • **[Quickstart](#quickstart)** • **[Documentation](https://devspace.sh/cli/docs/introduction)** • **[Blog](https://loft.sh/blog)** • **[Twitter](https://twitter.com/devspace)**
 
-![Build Status Passing](https://img.shields.io/github/workflow/status/loft-sh/devspace/Test%20&%20Release%20CLI%20Version/master?style=for-the-badge)
+![Build Status Passing](https://img.shields.io/github/workflow/status/loft-sh/devspace/Test%20&%20Release%20CLI%20Version/main?style=for-the-badge)
 ![Latest Release](https://img.shields.io/github/v/release/loft-sh/devspace?style=for-the-badge&label=Latest%20Release&color=%23007ec6)
 ![License: Apache-2.0](https://img.shields.io/github/license/loft-sh/devspace?style=for-the-badge&color=%23007ec6)
 ![Total Downloads (GitHub Releases)](https://img.shields.io/github/downloads/loft-sh/devspace/total?style=for-the-badge&label=Total%20Downloads&color=%23007ec6)
diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
@@ -76,7 +76,7 @@ module.exports = {
           routeBasePath: '/',
           sidebarPath: require.resolve('./sidebars.js'),
           showLastUpdateTime: true,
-          editUrl: 'https://github.com/loft-sh/devspace/edit/master/docs/',
+          editUrl: 'https://github.com/loft-sh/devspace/edit/main/docs/',
           lastVersion: "current",
           versions: {
               current: {
diff --git a/docs/pages/_partials/config-dependencies.mdx b/docs/pages/_partials/config-dependencies.mdx
@@ -3,7 +3,7 @@ dependencies:                       # struct[]  | Array of dependencies (other p
 - source:                           # struct    | Defines where to find the dependency (exactly one source is allowed)
     git: https://github.com/my-repo # string    | HTTP(S) URL of the git repository (recommended method for referencing dependencies, must have the format of the git remote repo as usually checked out via git clone)
     subPath: repo/sub/path          # string    | Path within the git repo where devspace.yaml can be found
-    branch: master                  # string    | Git branch to checkout
+    branch: main                  # string    | Git branch to checkout
     tag: v1.2.3                     # string    | Git tag to checkout
     revision: ac66e49               # string    | Git revision (commit has) to checkout
     disableShallow: false           # bool      | Allows to disable shallow git clones using "--depth 1"
diff --git a/docs/pages/_partials/config-profiles.mdx b/docs/pages/_partials/config-profiles.mdx
@@ -6,7 +6,7 @@ profiles:                             # struct[]  | Array of config profiles
     source:                           #           | Optional source where to find the profile
       git: https://github.com/my-repo # string    | HTTP(S) URL of the git repository to retrieve the profile from
       subPath: repo/sub/path          # string    | Path within the git repo where devspace.yaml can be found
-      branch: master                  # string    | Git branch to checkout
+      branch: main                  # string    | Git branch to checkout
       tag: v1.2.3                     # string    | Git tag to checkout
       revision: ac66e49               # string    | Git revision (commit has) to checkout
       disableShallow: false           # bool      | Allows to disable shallow git clones using "--depth 1"
diff --git a/docs/versioned_docs/version-4.x/configuration/development/auto-reloading.mdx b/docs/versioned_docs/version-4.x/configuration/development/auto-reloading.mdx
@@ -35,7 +35,7 @@ dev:
     - custom-manifests
 ```
 
-Take a look at the [redeploy-instead-of-hot-reload exmaple](https://github.com/loft-sh/devspace/tree/master/examples/redeploy-instead-of-hot-reload) to see how to disable hot reloading at all and enable redeployment on every file change instead.
+Take a look at the [redeploy-instead-of-hot-reload exmaple](https://github.com/loft-sh/devspace/tree/main/examples/redeploy-instead-of-hot-reload) to see how to disable hot reloading at all and enable redeployment on every file change instead.
 
 
 ## Configuration
diff --git a/docs/versioned_docs/version-4.x/configuration/hooks/basics.mdx b/docs/versioned_docs/version-4.x/configuration/hooks/basics.mdx
@@ -17,7 +17,7 @@ hooks:
 ```
 
 :::note Example Project
-For a complete example take a look at [this example project on GitHub](https://github.com/loft-sh/devspace/tree/master/examples/hooks).
+For a complete example take a look at [this example project on GitHub](https://github.com/loft-sh/devspace/tree/main/examples/hooks).
 :::
 
 This tells DevSpace to execute the command `echo before image building` before any image will be built. You are able to define hooks for the following life cycle events:
diff --git a/docs/versioned_docs/version-4.x/guides/ci-cd-integration.mdx b/docs/versioned_docs/version-4.x/guides/ci-cd-integration.mdx
@@ -6,7 +6,7 @@ sidebar_label: CI/CD Integration
 DevSpace is designed to work in non-interactive environments the same way it does in interactive environments. To use DevSpace inside a CI/CD pipeline, simply install it as part of your pipeline or start the pipeline with a VM or container image that already contains DevSpace and run any of the DevSpace commands.
 
 ## Docker Image
-DevSpace provides an official Docker image that [can be found on Docker Hub](https://hub.docker.com/r/devspacesh/devspace). The Dockerfile for this image is [available on GitHub](https://github.com/loft-sh/devspace/blob/master/Dockerfile).
+DevSpace provides an official Docker image that [can be found on Docker Hub](https://hub.docker.com/r/devspacesh/devspace). The Dockerfile for this image is [available on GitHub](https://github.com/loft-sh/devspace/blob/main/Dockerfile).
 
 Use this image as shown here:
 ```bash
diff --git a/docs/versioned_docs/version-4.x/guides/community-projects.mdx b/docs/versioned_docs/version-4.x/guides/community-projects.mdx
@@ -8,7 +8,7 @@ To submit a project:
 
 1. Make sure the project has a `LICENSE` file containing an **MIT** or **Apache 2.0** license.
 2. Make sure to add a `README.md` file to your project describing what the project does and how to use it.
-3. Click on the "**Edit this page**" button or follow **[this link](https://github.com/loft-sh/devspace/edit/master/docs/pages/guides/community-projects.mdx)**.
+3. Click on the "**Edit this page**" button or follow **[this link](https://github.com/loft-sh/devspace/edit/main/docs/pages/guides/community-projects.mdx)**.
 4. Add your project to the list **in alphabetical order**.
 5. **Submit a pull request** containing your changes.
 
diff --git a/docs/versioned_docs/version-5.x/configuration/development/auto-reloading.mdx b/docs/versioned_docs/version-5.x/configuration/development/auto-reloading.mdx
@@ -35,7 +35,7 @@ dev:
     - custom-manifests
 ```
 
-Take a look at the [redeploy-instead-of-hot-reload example](https://github.com/loft-sh/devspace/tree/master/examples/redeploy-instead-of-hot-reload) to see how to disable hot reloading at all and enable redeployment on every file change instead.
+Take a look at the [redeploy-instead-of-hot-reload example](https://github.com/loft-sh/devspace/tree/main/examples/redeploy-instead-of-hot-reload) to see how to disable hot reloading at all and enable redeployment on every file change instead.
 
 
 ## Configuration
diff --git a/docs/versioned_docs/version-5.x/guides/ci-cd-integration.mdx b/docs/versioned_docs/version-5.x/guides/ci-cd-integration.mdx
@@ -6,7 +6,7 @@ sidebar_label: CI/CD Integration
 DevSpace is designed to work in non-interactive environments the same way it does in interactive environments. To use DevSpace inside a CI/CD pipeline, simply install it as part of your pipeline or start the pipeline with a VM or container image that already contains DevSpace and run any of the DevSpace commands.
 
 ## Docker Image
-DevSpace provides an official Docker image that [can be found on Docker Hub](https://hub.docker.com/r/devspacesh/devspace). The Dockerfile for this image is [available on GitHub](https://github.com/loft-sh/devspace/blob/master/Dockerfile).
+DevSpace provides an official Docker image that [can be found on Docker Hub](https://hub.docker.com/r/devspacesh/devspace). The Dockerfile for this image is [available on GitHub](https://github.com/loft-sh/devspace/blob/main/Dockerfile).
 
 Use this image as shown here:
 ```bash
diff --git a/examples/README.md b/examples/README.md
@@ -4,17 +4,17 @@ This folder contains several examples how to use the DevSpace CLI for various us
 
 | Name | Builder | Deployment | Description |
 |:------|:----------:|:----------:|:-------------|
-| [`quickstart`](https://github.com/devspace-cloud/devspace/tree/master/examples/quickstart) | docker | component | Simple nodejs example how to use devspace with helm |
-| [`quickstart-kubectl`](https://github.com/devspace-cloud/devspace/tree/master/examples/quickstart-kubectl) | docker | kubectl | Simple nodejs example how to use devspace with kubectl apply |
-| [`kustomize`](https://github.com/devspace-cloud/devspace/tree/master/examples/kustomize) | docker | kustomize | Simple nodejs example how to use devspace with kustomize |
-| [`custom-builder`](https://github.com/devspace-cloud/devspace/tree/master/examples/custom-builder) | script | kubectl | Simple custom builder script example |
-| [`dependencies`](https://github.com/devspace-cloud/devspace/tree/master/examples/dependencies) | docker | component | Example to show how to use devspace in multiple projects |
-| [`dynamic-config`](https://github.com/devspace-cloud/devspace/tree/master/examples/dynamic-config) | none | component | Example that shows the use of config variables |
-| [`hooks`](https://github.com/devspace-cloud/devspace/tree/master/examples/hooks) | docker | component | Example that shows how to use hooks |
-| [`multiple-configs`](https://github.com/devspace-cloud/devspace/tree/master/examples/multiple-configs) | docker | component | Example that shows how to use multiple DevSpace configs in a single project |
-| [`minikube`](https://github.com/devspace-cloud/devspace/tree/master/examples/minikube) | minikube-docker | helm | Minikube example with local registry |
-| [`php-mysql-example`](https://github.com/devspace-cloud/devspace/tree/master/examples/php-mysql-example) | docker | component | Example how to easily deploy php and mysql |
-| [`profiles`](https://github.com/devspace-cloud/devspace/tree/master/examples/profiles) | docker | component | Example how to use two profiles in one project |
-| [`microservices`](https://github.com/devspace-cloud/devspace/tree/master/examples/microservices) | docker | helm & kubectl | Example with simple nodejs and php application that interact |
-| [`kaniko`](https://github.com/devspace-cloud/devspace/tree/master/examples/kaniko) | kaniko | helm | Example how to use kaniko instead of docker |
-| [`redeploy-instead-of-hot-reload`](https://github.com/devspace-cloud/devspace/tree/master/examples/redeploy-instead-of-hot-reload) | docker | kubectl | Example how to use devspace to redeploy on changes instead of hot reloading |
+| [`quickstart`](https://github.com/devspace-cloud/devspace/tree/main/examples/quickstart) | docker | component | Simple nodejs example how to use devspace with helm |
+| [`quickstart-kubectl`](https://github.com/devspace-cloud/devspace/tree/main/examples/quickstart-kubectl) | docker | kubectl | Simple nodejs example how to use devspace with kubectl apply |
+| [`kustomize`](https://github.com/devspace-cloud/devspace/tree/main/examples/kustomize) | docker | kustomize | Simple nodejs example how to use devspace with kustomize |
+| [`custom-builder`](https://github.com/devspace-cloud/devspace/tree/main/examples/custom-builder) | script | kubectl | Simple custom builder script example |
+| [`dependencies`](https://github.com/devspace-cloud/devspace/tree/main/examples/dependencies) | docker | component | Example to show how to use devspace in multiple projects |
+| [`dynamic-config`](https://github.com/devspace-cloud/devspace/tree/main/examples/dynamic-config) | none | component | Example that shows the use of config variables |
+| [`hooks`](https://github.com/devspace-cloud/devspace/tree/main/examples/hooks) | docker | component | Example that shows how to use hooks |
+| [`multiple-configs`](https://github.com/devspace-cloud/devspace/tree/main/examples/multiple-configs) | docker | component | Example that shows how to use multiple DevSpace configs in a single project |
+| [`minikube`](https://github.com/devspace-cloud/devspace/tree/main/examples/minikube) | minikube-docker | helm | Minikube example with local registry |
+| [`php-mysql-example`](https://github.com/devspace-cloud/devspace/tree/main/examples/php-mysql-example) | docker | component | Example how to easily deploy php and mysql |
+| [`profiles`](https://github.com/devspace-cloud/devspace/tree/main/examples/profiles) | docker | component | Example how to use two profiles in one project |
+| [`microservices`](https://github.com/devspace-cloud/devspace/tree/main/examples/microservices) | docker | helm & kubectl | Example with simple nodejs and php application that interact |
+| [`kaniko`](https://github.com/devspace-cloud/devspace/tree/main/examples/kaniko) | kaniko | helm | Example how to use kaniko instead of docker |
+| [`redeploy-instead-of-hot-reload`](https://github.com/devspace-cloud/devspace/tree/main/examples/redeploy-instead-of-hot-reload) | docker | kubectl | Example how to use devspace to redeploy on changes instead of hot reloading |
diff --git a/pkg/util/git/go_git.go b/pkg/util/git/go_git.go
@@ -59,7 +59,7 @@ func (gr *GoGitRepository) Update(merge bool) error {
 			return err
 		}
 
-		// Make sure master is checked out
+		// Make sure main is checked out
 		err = repoWorktree.Checkout(&git.CheckoutOptions{
 			Branch: plumbing.ReferenceName("refs/heads/main"),
 			Create: false,
