diff --git a/.github/workflows/cgroup2.yaml b/.github/workflows/cgroup2.yaml index 0c5aab3b1f..75942f8b49 100644 --- a/.github/workflows/cgroup2.yaml +++ b/.github/workflows/cgroup2.yaml @@ -4,7 +4,7 @@ on: workflow_dispatch: pull_request: branches: - - master + - main jobs: docker: diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 4365fde863..6f0ad007d4 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -4,7 +4,7 @@ on: workflow_dispatch: pull_request: branches: - - master + - main jobs: docker: diff --git a/.github/workflows/podman.yml b/.github/workflows/podman.yml index f938504096..f7daf4c9dd 100644 --- a/.github/workflows/podman.yml +++ b/.github/workflows/podman.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: pull_request: branches: - - master + - main jobs: podman: diff --git a/hack/ci/cache-wrapper.sh b/hack/ci/cache-wrapper.sh index c7609e8611..583c48b37e 100755 --- a/hack/ci/cache-wrapper.sh +++ b/hack/ci/cache-wrapper.sh @@ -20,7 +20,7 @@ set -o errexit -o nounset -o pipefail # options for where the cache is stored BUCKET="${BUCKET:-bentheelder-kind-ci-builds}" -BRANCH="${BRANCH:-master}" +BRANCH="${BRANCH:-main}" CACHE_SUFFIX="${CACHE_SUFFIX:-"ci-cache/${BRANCH}/gocache.tar"}" CACHE_URL="https://storage.googleapis.com/${BUCKET}/${CACHE_SUFFIX}" CACHE_GS="gs://${BUCKET}/${CACHE_SUFFIX}" diff --git a/site/content/_index.md b/site/content/_index.md index ae6b438a51..ca5c588b8d 100644 --- a/site/content/_index.md +++ b/site/content/_index.md @@ -99,11 +99,11 @@ Participation in the Kubernetes community is governed by the [Kubernetes Code of [Go Report Card Badge]: https://goreportcard.com/badge/sigs.k8s.io/kind [Go Report Card]: https://goreportcard.com/report/sigs.k8s.io/kind [conformance tests]: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/conformance-tests.md -[packages]: https://github.com/kubernetes-sigs/kind/tree/master/pkg -[cluster package]: https://github.com/kubernetes-sigs/kind/tree/master/pkg/cluster -[build package]: https://github.com/kubernetes-sigs/kind/tree/master/pkg/build -[kind cli]: https://github.com/kubernetes-sigs/kind/tree/master/main.go -[images]: https://github.com/kubernetes-sigs/kind/tree/master/images +[packages]: https://github.com/kubernetes-sigs/kind/tree/main/pkg +[cluster package]: https://github.com/kubernetes-sigs/kind/tree/main/pkg/cluster +[build package]: https://github.com/kubernetes-sigs/kind/tree/main/pkg/build +[kind cli]: https://github.com/kubernetes-sigs/kind/tree/main/main.go +[images]: https://github.com/kubernetes-sigs/kind/tree/main/images [kubetest]: https://github.com/kubernetes/test-infra/tree/master/kubetest [kubeadm]: https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm/ [design doc]: ./docs/design/initial diff --git a/site/content/docs/design/initial.md b/site/content/docs/design/initial.md index 161e7cdbe9..a899bb8519 100644 --- a/site/content/docs/design/initial.md +++ b/site/content/docs/design/initial.md @@ -107,10 +107,10 @@ we can simply list and delete containers with this label. [q-lee]: https://github.com/q-lee [sig-testing-post]: https://groups.google.com/d/msg/kubernetes-sig-testing/uVkosorBnVc/8DDC3qvMAwAJ [kubernetes-sig-testing]: https://groups.google.com/forum/#!forum/kubernetes-sig-testing -[pkg/cluster]: https://github.com/kubernetes-sigs/kind/tree/master/pkg/cluster +[pkg/cluster]: https://github.com/kubernetes-sigs/kind/tree/main/pkg/cluster [base-image.md]: /docs/design/base-image [node-image.md]: /docs/design/node-image -[entrypoint]: https://github.com/kubernetes-sigs/kind/blob/master/images/base/files/usr/local/bin/entrypoint +[entrypoint]: https://github.com/kubernetes-sigs/kind/blob/main/images/base/files/usr/local/bin/entrypoint [kubeconfig]: https://kubernetes.io/docs/tasks/access-application-cluster/configure-access-multiple-clusters/ [overlay network]: https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/#pod-network [design principles]: /docs/design/principles diff --git a/site/content/docs/design/principles.md b/site/content/docs/design/principles.md index 543679cc6f..4791d785b9 100644 --- a/site/content/docs/design/principles.md +++ b/site/content/docs/design/principles.md @@ -115,6 +115,6 @@ Automated usage should be considered for all features. [k8s.io/apimachinery]: https://github.com/kubernetes/apimachinery [Kubernetes Deprecation Policy]: https://kubernetes.io/docs/reference/using-api/deprecation-policy/ [API Conventions]: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md -[pkg/cluster]: https://github.com/kubernetes-sigs/kind/tree/master/pkg/cluster +[pkg/cluster]: https://github.com/kubernetes-sigs/kind/tree/main/pkg/cluster [k8s.io/utils]: https://github.com/kubernetes/utils [k8s.io/code-generator]: https://github.com/kubernetes/code-generator diff --git a/site/content/docs/user/quick-start.md b/site/content/docs/user/quick-start.md index bbd879938e..016c179ed6 100644 --- a/site/content/docs/user/quick-start.md +++ b/site/content/docs/user/quick-start.md @@ -422,7 +422,7 @@ kind, the Kubernetes cluster itself, etc. [releases]: https://github.com/kubernetes-sigs/kind/releases [node image]: /docs/design/node-image [base image]: /docs/design/base-image -[kind-example-config]: https://raw.githubusercontent.com/kubernetes-sigs/kind/master/site/content/docs/user/kind-example-config.yaml +[kind-example-config]: https://raw.githubusercontent.com/kubernetes-sigs/kind/main/site/content/docs/user/kind-example-config.yaml [kubernetes]: https://github.com/kubernetes/kubernetes [kindest/node]: https://hub.docker.com/r/kindest/node/ [kubectl]: https://kubernetes.io/docs/reference/kubectl/overview/ diff --git a/site/content/docs/user/working-offline.md b/site/content/docs/user/working-offline.md index 4fb2c51108..b29e7d4318 100644 --- a/site/content/docs/user/working-offline.md +++ b/site/content/docs/user/working-offline.md @@ -109,7 +109,7 @@ You can clone Kubernetes source code. ### Building image ```sh -➜ ~ kind build node-image --image kindest/node:master --kube-root $GOPATH/src/k8s.io/kubernetes +➜ ~ kind build node-image --image kindest/node:main --kube-root $GOPATH/src/k8s.io/kubernetes Starting to build Kubernetes ... Image build completed. @@ -118,9 +118,9 @@ Image build completed. When the image build is complete, you can create a cluster by passing the `--image` flag. ```sh -➜ ~ kind create cluster --image kindest/node:master +➜ ~ kind create cluster --image kindest/node:main Creating cluster "kind" ... - ✓ Ensuring node image (kindest/node:master) 🖼 + ✓ Ensuring node image (kindest/node:main) 🖼 ✓ Preparing nodes 📦 ✓ Writing configuration 📜 ✓ Starting control-plane 🕹️ @@ -172,4 +172,4 @@ You can find the specific tag currently in use at [loadbalancer source code][loa [docker tag]: https://docs.docker.com/engine/reference/commandline/tag/ [base image]: https://kind.sigs.k8s.io/docs/design/base-image/ [building the node image]: https://kind.sigs.k8s.io/docs/user/quick-start/#building-images -[loadbalancer source code]: https://github.com/kubernetes-sigs/kind/blob/master/pkg/cluster/internal/loadbalancer/const.go#L20 +[loadbalancer source code]: https://github.com/kubernetes-sigs/kind/blob/main/pkg/cluster/internal/loadbalancer/const.go#L20 diff --git a/site/layouts/partials/footer.html b/site/layouts/partials/footer.html index 95db8a8bfe..26e2960fa1 100644 --- a/site/layouts/partials/footer.html +++ b/site/layouts/partials/footer.html @@ -1,6 +1,6 @@ \ No newline at end of file