diff --git a/.drone.yml b/.drone.yml index 4514bca7..6b967777 100644 --- a/.drone.yml +++ b/.drone.yml @@ -51,7 +51,7 @@ steps: - test when: branch: - - master + - main event: - push - tag @@ -136,7 +136,7 @@ steps: - mkdocs build --verbose --clean --strict when: branch: - - master + - main event: - push @@ -150,7 +150,7 @@ steps: target_branch: gh-pages when: branch: - - master + - main event: - push @@ -158,7 +158,7 @@ trigger: event: - push branch: - - master + - main --- ##################### diff --git a/Makefile b/Makefile index a3c581dd..cbec0220 100644 --- a/Makefile +++ b/Makefile @@ -161,8 +161,8 @@ ci-tests: fmt check e2e ########################## drone: - @echo "Running drone pipeline locally with branch=master and event=push" - drone exec --trusted --branch master --event push + @echo "Running drone pipeline locally with branch=main and event=push" + drone exec --trusted --branch main --event push ######################################### ########## Setup & Preparation ########## diff --git a/README.md b/README.md index 1f0aaaa6..ca3f8fa5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # [![k3d](docs/static/img/k3d_logo_black_blue.svg)](https://k3d.io/) -[![Build Status](https://img.shields.io/drone/build/rancher/k3d/master?logo=drone&server=https%3A%2F%2Fdrone-publish.rancher.io&style=flat-square)](https://drone-publish.rancher.io/rancher/k3d) +[![Build Status](https://img.shields.io/drone/build/rancher/k3d/main?logo=drone&server=https%3A%2F%2Fdrone-publish.rancher.io&style=flat-square)](https://drone-publish.rancher.io/rancher/k3d) [![License](https://img.shields.io/github/license/rancher/k3d?style=flat-square)](./LICENSE.md) ![Downloads](https://img.shields.io/github/downloads/rancher/k3d/total.svg?style=flat-square) @@ -8,7 +8,7 @@ [![Go version](https://img.shields.io/github/go-mod/go-version/rancher/k3d?logo=go&logoColor=white&style=flat-square)](./go.mod) [![Go Report Card](https://goreportcard.com/badge/github.com/rancher/k3d?style=flat-square)](https://goreportcard.com/report/github.com/rancher/k3d) -**Please Note:** `master` is now v3.0.0 and the code for v1.x can be found in the `master-v1` branch! +**Please Note:** `main` is now v3.0.0 and the code for v1.x can be found in the `main-v1` branch! ## [k3s in docker](https://k3d.io) @@ -43,11 +43,11 @@ k3d creates containerized k3s clusters. This means, that you can spin up a multi You have several options there: - use the install script to grab the latest release: - - wget: `wget -q -O - https://raw.githubusercontent.com/rancher/k3d/master/install.sh | bash` - - curl: `curl -s https://raw.githubusercontent.com/rancher/k3d/master/install.sh | bash` + - wget: `wget -q -O - https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash` + - curl: `curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash` - use the install script to grab a specific release (via `TAG` environment variable): - - wget: `wget -q -O - https://raw.githubusercontent.com/rancher/k3d/master/install.sh | TAG=v3.0.0-beta.0 bash` - - curl: `curl -s https://raw.githubusercontent.com/rancher/k3d/master/install.sh | TAG=v3.0.0-beta.0 bash` + - wget: `wget -q -O - https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v3.0.0-beta.0 bash` + - curl: `curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v3.0.0-beta.0 bash` - use [Homebrew](https://brew.sh): `brew install k3d` (Homebrew is available for MacOS and Linux) - Formula can be found in [homebrew/homebrew-core](https://github.com/Homebrew/homebrew-core/blob/master/Formula/k3d.rb) and is mirrored to [homebrew/linuxbrew-core](https://github.com/Homebrew/linuxbrew-core/blob/master/Formula/k3d.rb) @@ -59,7 +59,7 @@ or... ## Build -1. Clone this repo, e.g. via `git clone git@github.com:rancher/k3d.git` or `go get github.com/rancher/k3d/v3@master` +1. Clone this repo, e.g. via `git clone git@github.com:rancher/k3d.git` or `go get github.com/rancher/k3d/v3@main` 2. Inside the repo run - 'make install-tools' to make sure required go packages are installed 3. Inside the repo run one of the following commands diff --git a/docs/index.md b/docs/index.md index 57b9b742..df8c8556 100644 --- a/docs/index.md +++ b/docs/index.md @@ -33,11 +33,11 @@ k3d makes it very easy to create single- and multi-node [k3s](https://github.com You have several options there: - use the install script to grab the latest release: - - wget: `#!bash wget -q -O - https://raw.githubusercontent.com/rancher/k3d/master/install.sh | bash` - - curl: `#!bash curl -s https://raw.githubusercontent.com/rancher/k3d/master/install.sh | bash` + - wget: `#!bash wget -q -O - https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash` + - curl: `#!bash curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash` - use the install script to grab a specific release (via `TAG` environment variable): - - wget: `#!bash wget -q -O - https://raw.githubusercontent.com/rancher/k3d/master/install.sh | TAG=v3.0.0-beta.0 bash` - - curl: `#!bash curl -s https://raw.githubusercontent.com/rancher/k3d/master/install.sh | TAG=v3.0.0-beta.0 bash` + - wget: `#!bash wget -q -O - https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v3.0.0-beta.0 bash` + - curl: `#!bash curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v3.0.0-beta.0 bash` - use [Homebrew](https://brew.sh): `#!bash brew install k3d` (Homebrew is available for MacOS and Linux) - Formula can be found in [homebrew/homebrew-core](https://github.com/Homebrew/homebrew-core/blob/master/Formula/k3d.rb) and is mirrored to [homebrew/linuxbrew-core](https://github.com/Homebrew/linuxbrew-core/blob/master/Formula/k3d.rb)