Skaffold master -> main (GoogleContainerTools#6263)

- Rewrite the few existing uses of `skaffold/(blob|tree)/HEAD` to use `main`
  as GitHub's file viewer uses a commit rather than a branch.
- Rewrite the buildpacks references to use `main` since they already switched.
- Explicitly specify `main` for remote repositories due to GoogleContainerTools#6264

Author: briandealwis

.github/workflows/draft-release.yml

@@ -3,7 +3,7 @@ name: create draft release
 on:
   push:
     branches:
-    - master
+    - main
 
 permissions: read-all
 

CHANGELOG.md

@@ -423,7 +423,7 @@ Note: This release comes with a new config version, `v2beta14`. To upgrade your
 
 Highlights:
 * More granular control of `port-forward` options. Checkout the updated [documentation](https://skaffold.dev/docs/pipeline-stages/port-forwarding/) for details. 
-* `InputDigest` image tagging strategy from the [Improve taggers proposal](https://github.com/GoogleContainerTools/skaffold/blob/master/docs/design_proposals/digest-tagger.md) has landed.
+* `InputDigest` image tagging strategy from the [Improve taggers proposal](https://github.com/GoogleContainerTools/skaffold/blob/main/docs/design_proposals/digest-tagger.md) has landed.
 
 New Features:
 * Revise port-forward behaviour [#5554](https://github.com/GoogleContainerTools/skaffold/pull/5554)
@@ -506,7 +506,7 @@ Highlights:
 * New command `skaffold apply` for when you want Skaffold to simply deploy your pre-rendered Kubernetes manifests.
 * Debugging Python application using `skaffold debug` now uses `debugpy` by default.
 * New tutorials for [`artifact dependencies`](https://skaffold.dev/docs/tutorials/artifact-dependencies/) and [`configuration dependencies`](https://skaffold.dev/docs/tutorials/config-dependencies/) features.
-* New example project [`examples/custom-buildx`](https://github.com/GoogleContainerTools/skaffold/tree/master/examples/custom-buildx) showing how to build multi-arch images using Skaffold.
+* New example project [`examples/custom-buildx`](https://github.com/GoogleContainerTools/skaffold/tree/main/examples/custom-buildx) showing how to build multi-arch images using Skaffold.
 
 New Features:
 * Add 'skaffold apply' command [#5543](https://github.com/GoogleContainerTools/skaffold/pull/5543)
@@ -948,7 +948,7 @@ Note: This release comes with a new config version, `v2beta9`. To upgrade your s
 Highlights:
 * Artifact Modules Support: Skaffold allow users to specify artifact dependencies for dockerfile artifacts. 
 
-  To use, look at [microservice example](https://github.com/GoogleContainerTools/skaffold/tree/master/examples/microservices). *Docs coming soon*
+  To use, look at [microservice example](https://github.com/GoogleContainerTools/skaffold/tree/main/examples/microservices). *Docs coming soon*
 * Skaffold init support for polyglot-maven projects [#4871](https://github.com/GoogleContainerTools/skaffold/pull/4871)
 * Skaffold `debug` helper images now moved to gcr.io/k8s-skaffold/skaffold-debug-support [#4961](https://github.com/GoogleContainerTools/skaffold/pull/4961)
 

DEVELOPMENT.md

@@ -69,7 +69,7 @@ Visual Studio Code with [Go plugin](https://github.com/Microsoft/vscode-go):
 
 Some changes to the skaffold code require a change to the skaffold config. These changes require a few extra steps:
 
-* Open the latest Config at [pkg/skaffold/schema/latest/v1/config.go](https://github.com/GoogleContainerTools/skaffold/blob/master/pkg/skaffold/schema/latest/v1/config.go) and inspect the comment at [L28](https://github.com/GoogleContainerTools/skaffold/blob/master/pkg/skaffold/schema/latest/v1/config.go#L28)
+* Open the latest Config at [pkg/skaffold/schema/latest/v1/config.go](https://github.com/GoogleContainerTools/skaffold/blob/main/pkg/skaffold/schema/latest/v1/config.go) and inspect the comment at [L28](https://github.com/GoogleContainerTools/skaffold/blob/main/pkg/skaffold/schema/latest/v1/config.go#L28)
 * If the line mentions the config version is not released, proceed making your changes.
   ```
   // This config version is not yet released, it is SAFE TO MODIFY the structs in this file.
@@ -101,14 +101,14 @@ For more details behind the logic of config changes see [the Skaffold config man
 
 ## Making changes to the Skaffold API
 
-We build the API directly through gRPC, which gets translated into REST API through a reverse proxy gateway library. When adding new message types, make changes to [proto/v1/skaffold.proto](https://github.com/GoogleContainerTools/skaffold/blob/master/proto/v1/skaffold.proto), and when adding new enum types, make changes to [proto/enums/enums.proto](https://github.com/GoogleContainerTools/skaffold/blob/master/proto/enums/enums.proto). When changing either of these files, you can run `./hack/generate-proto.sh` to generate the equivalent Go code.
+We build the API directly through gRPC, which gets translated into REST API through a reverse proxy gateway library. When adding new message types, make changes to [proto/v1/skaffold.proto](https://github.com/GoogleContainerTools/skaffold/blob/main/proto/v1/skaffold.proto), and when adding new enum types, make changes to [proto/enums/enums.proto](https://github.com/GoogleContainerTools/skaffold/blob/main/proto/enums/enums.proto). When changing either of these files, you can run `./hack/generate-proto.sh` to generate the equivalent Go code.
 
 ## Adding actionable error messages to code.
 Skaffold has a built-in framework to provide actionable error messages for user to help bootstrap skaffold errors.
 
 Also, [v1.19.0](https://github.com/GoogleContainerTools/skaffold/releases/tag/v1.19.0) onwards, skaffold is collecting failure error codes to help the team get more insights into common failure scenarios.
 
-To take advantage of this framework, contributors can simply use the [`ErrDef`](https://github.com/GoogleContainerTools/skaffold/blob/master/pkg/skaffold/errors/err_def.go#L32) struct to throw meaningful actionable error messages and 
+To take advantage of this framework, contributors can simply use the [`ErrDef`](https://github.com/GoogleContainerTools/skaffold/blob/main/pkg/skaffold/errors/err_def.go#L32) struct to throw meaningful actionable error messages and
 improve user experience.
 
 e.g In this example [PR](https://github.com/GoogleContainerTools/skaffold/pull/5953), 
@@ -280,7 +280,7 @@ Skaffold release process works with Google Cloud Build within our own project `k
 
 In order to be able to iterate/fix the release process you can pass in your own project and bucket as parameters to the build.
 
-We continuously release **builds** under `gs://skaffold/builds`. This is done by triggering `cloudbuild.yaml` on every push to master.
+We continuously release **builds** under `gs://skaffold/builds`. This is done by triggering `cloudbuild.yaml` on every push to `main`.
 
 To run a build on your own project:
 

README.md

@@ -3,9 +3,9 @@
 
 ---------------------
 
-[![Build Status](https://travis-ci.com/GoogleContainerTools/skaffold.svg?branch=master)](https://travis-ci.com/GoogleContainerTools/skaffold)
-[![Code Coverage](https://codecov.io/gh/GoogleContainerTools/skaffold/branch/master/graph/badge.svg)](https://codecov.io/gh/GoogleContainerTools/skaffold)
-[![LICENSE](https://img.shields.io/github/license/GoogleContainerTools/skaffold.svg)](https://github.com/GoogleContainerTools/skaffold/blob/master/LICENSE)
+[![Build Status](https://travis-ci.com/GoogleContainerTools/skaffold.svg?branch=main)](https://travis-ci.com/GoogleContainerTools/skaffold)
+[![Code Coverage](https://codecov.io/gh/GoogleContainerTools/skaffold/branch/main/graph/badge.svg)](https://codecov.io/gh/GoogleContainerTools/skaffold)
+[![LICENSE](https://img.shields.io/github/license/GoogleContainerTools/skaffold.svg)](https://github.com/GoogleContainerTools/skaffold/blob/main/LICENSE)
 [![Releases](https://img.shields.io/github/release-pre/GoogleContainerTools/skaffold.svg)](https://github.com/GoogleContainerTools/skaffold/releases)
 
 Skaffold is a command line tool that facilitates continuous development for

codelab/02_kpt-deploy/tutorial.md

@@ -15,7 +15,7 @@ Kpt is [an OSS tool](https://github.com/GoogleContainerTools/kpt) for Kubernetes
 *   How to enable kpt to deploy your configurations in their live state.
 *   How to use kpt with kustomize.
 
-This codelab is the second session. Check out the [01_kpt-validate](https://github.com/GoogleContainerTools/skaffold/tree/master/codelab/01_kpt-validate) about how to use kpt to validate your configuration before deploying to the cluster.
+This codelab is the second session. Check out the [01_kpt-validate](https://github.com/GoogleContainerTools/skaffold/tree/main/codelab/01_kpt-validate) about how to use kpt to validate your configuration before deploying to the cluster.
 
 ## Prerequisites
 
@@ -87,7 +87,7 @@ Time to complete: **About 3 minutes**
 
 <walkthrough-pin-section-icon></walkthrough-pin-section-icon>
 **Tips**
->  If you haven't used `skaffold dev`, you can go through this [codelab](https://github.com/GoogleContainerTools/skaffold/tree/master/codelab/01_kpt-validate).
+>  If you haven't used `skaffold dev`, you can go through this [codelab](https://github.com/GoogleContainerTools/skaffold/tree/main/codelab/01_kpt-validate).
 
 ## Deploy
 Time to complete: **About 2 minutes**
@@ -226,4 +226,4 @@ from the skaffold.yaml[ reference doc](https://skaffold.dev/docs/references/yaml
 
 You can also try out other kpt features like `kpt pkg` and `kpt cfg` from 
 [the user guide](https://googlecontainertools.github.io/kpt/reference/). They will be supported 
-in the skaffold soon. Stay tuned!  
+in the skaffold soon. Stay tuned!

docs/README.md

@@ -1,4 +1,4 @@
 # Skaffold site
 
 The site for the last stable release is on: http://skaffold.dev
-The site for the last build from master is on: http://skaffold-latest.firebaseapp.com
+The site for the last build from HEAD is on: http://skaffold-latest.firebaseapp.com

docs/content/en/docs/design/api.md

@@ -112,7 +112,7 @@ kick off a suite of Selenium tests against the newly deployed service.
 
 {{% tabs %}}
 {{% tab "HTTP API" %}}
-Using `curl` and `HTTP_RPC_PORT=50052`, an example output of a `skaffold dev` execution on our [getting-started example](https://github.com/GoogleContainerTools/skaffold/tree/master/examples/getting-started)
+Using `curl` and `HTTP_RPC_PORT=50052`, an example output of a `skaffold dev` execution on our [getting-started example](https://github.com/GoogleContainerTools/skaffold/tree/main/examples/getting-started)
 ```bash
  curl localhost:50052/v1/events
 {"result":{"timestamp":"2019-10-16T18:26:11.385251549Z","event":{"metaEvent":{"entry":"Starting Skaffold: {Version:v0.39.0-16-g5bb7c9e0 ConfigVersion:skaffold/v1 GitVersion: GitCommit:5bb7c9e078e4d522a5ffc42a2f1274fd17d75902 GitTreeState:dirty BuildDate:2019-10-03T15:01:29Z GoVersion:go1.13rc1 Compiler:gc Platform:linux/amd64}"}}}}
@@ -176,7 +176,7 @@ The State API provides a snapshot of the current state of the following componen
 **Examples** 
 {{% tabs %}}
 {{% tab "HTTP API" %}}
-Using `curl` and `HTTP_RPC_PORT=50052`, an example output of a `skaffold dev` execution on our [microservices example](https://github.com/GoogleContainerTools/skaffold/tree/master/examples/microservices)
+Using `curl` and `HTTP_RPC_PORT=50052`, an example output of a `skaffold dev` execution on our [microservices example](https://github.com/GoogleContainerTools/skaffold/tree/main/examples/microservices)
 ```bash
  curl localhost:50052/v1/state | jq
  {

docs/content/en/docs/design/config.md

@@ -146,12 +146,12 @@ requires:
     git:
       repo: http://github.com/GoogleContainerTools/skaffold.git
       path: getting-started/skaffold.yaml
-      ref: master
+      ref: main
 ```
 
 The environment variable `SKAFFOLD_REMOTE_CACHE_DIR` or flag `--remote-cache-dir` specifies the download location for all remote repos. If undefined then it defaults to `~/.skaffold/repos`. 
 The repo root directory name is a hash of the repo `uri` and the `branch/ref`.
-Every execution of a remote module resets the cached repo to the referenced ref. The default ref is master. If master is not defined then it defaults to main.
+Every execution of a remote module resets the cached repo to the referenced ref. The default ref is `master`. If `master` is not defined then it defaults to `main`.
 The remote config gets treated like a local config after substituting the path with the actual path in the cache directory.
 
 ### Profile Activation in required configs
@@ -179,4 +179,4 @@ Here, `profile1` is a profile that needs to exist in both configs `cfg1` and `cf
 
 {{< alert title="Follow up" >}}
 Take a look at the [tutorial]({{< relref "/docs/tutorials/config-dependencies" >}}) section to see this in action.
-{{< /alert >}}
+{{< /alert >}}

docs/content/en/docs/pipeline-stages/builders/jib.md

@@ -53,7 +53,7 @@ You can define dependency on other artifacts using the `requires` keyword. This
 
 **Example**
 
-See the [Skaffold-Jib demo project](https://github.com/GoogleContainerTools/skaffold/blob/master/examples/jib/)
+See the [Skaffold-Jib demo project](https://github.com/GoogleContainerTools/skaffold/blob/main/examples/jib/)
 for an example.
 
 ### Multi-Module Projects

docs/content/en/docs/pipeline-stages/filesync.md

@@ -114,7 +114,7 @@ artifacts:
 Skaffold requires special collaboration from buildpacks for the `auto` sync to work.
 
 Cloud Native Buildpacks set a `io.buildpacks.build.metadata` label on the images they create.
-This labels points to json description of the [Bill-of-Materials, aka BOM](https://github.com/buildpacks/spec/blob/master/buildpack.md#bill-of-materials-toml) of the build.
+This labels points to json description of the [Bill-of-Materials, aka BOM](https://github.com/buildpacks/spec/blob/main/buildpack.md#bill-of-materials-toml) of the build.
 In the BOM, under the `metadata.devmode.sync` key, Buildpacks that want to collaborate with Skaffold
 have to output the sync rules based on their exploration of the source and the build process they had to apply to it.
 Those sync rules will then be used by Skaffold without the user having to configure them manually.
@@ -127,7 +127,7 @@ signal to change the way the application is built so that it reloads the changes
 
 Jib integration with Skaffold allows for zero-config `auto` sync. In this mode, Jib will sync your class files, resource files, and Jib's "extra directories" files to a remote container as changes are made. It can only be used with Jib in the default build mode (exploded) for non-WAR applications. It was primarily designed around [Spring Boot Developer Tools](https://docs.spring.io/spring-boot/docs/current/reference/html/using-spring-boot.html#using-boot-devtools), but can work with any embedded server that can reload/restart.
 
-Check out the [Jib Sync example](https://github.com/GoogleContainerTools/skaffold/tree/master/examples/jib-sync) for more details.
+Check out the [Jib Sync example](https://github.com/GoogleContainerTools/skaffold/tree/main/examples/jib-sync) for more details.
 
 ## Limitations
 

docs/content/en/docs/pipeline-stages/init.md

@@ -24,7 +24,7 @@ than 500MB.
 If there are multiple build configuration files, Skaffold will prompt you to pair your build configuration files
 with any images detected in your deploy configuration.
 
-E.g. For an application with [two microservices](https://github.com/GoogleContainerTools/skaffold/tree/master/examples/microservices):
+E.g. For an application with [two microservices](https://github.com/GoogleContainerTools/skaffold/tree/main/examples/microservices):
 
 ```bash
 skaffold init
@@ -41,7 +41,7 @@ If this image is one you want Skaffold to build, you'll need to manually set up
 `skaffold` init also recognizes Maven and Gradle projects, and will auto-suggest the [`jib`]({{<relref "/docs/pipeline-stages/builders#/local#jib-maven-and-gradle">}}) builder.
 Currently `jib` artifact detection is disabled by default, but can be enabled using the flag `--XXenableJibInit`.
 
-You can try this out on our example [jib project](https://github.com/GoogleContainerTools/skaffold/tree/master/examples/jib-multimodule)
+You can try this out on our example [jib project](https://github.com/GoogleContainerTools/skaffold/tree/main/examples/jib-multimodule)
 
 ```bash
 skaffold init --XXenableJibInit

docs/content/en/docs/pipeline-stages/log-tailing.md

@@ -15,7 +15,7 @@ Log Tailing is **disabled by default** for `run` mode; it can be enabled with th
 
 
 ## Log Structure
-To view log structure, run `skaffold run --tail` in [`examples/microservices`](https://github.com/GoogleContainerTools/skaffold/tree/master/examples/microservices)
+To view log structure, run `skaffold run --tail` in [`examples/microservices`](https://github.com/GoogleContainerTools/skaffold/tree/main/examples/microservices)
 
 ```bash
 skaffold run --tail

docs/content/en/docs/references/api/grpc.md

@@ -23,7 +23,7 @@ We also generate the [reference doc for the HTTP layer]({{<relref "/docs/referen
 
 ## v1/skaffold.proto
 
-You can find the source for v1/skaffold.proto [on Github](https://github.com/GoogleContainerTools/skaffold/blob/master/proto/v1/v1/skaffold.proto).
+You can find the source for v1/skaffold.proto [on Github](https://github.com/GoogleContainerTools/skaffold/blob/main/proto/v1/v1/skaffold.proto).
 
 
 

docs/content/en/docs/references/deprecation.md

@@ -28,7 +28,7 @@ A "deprecation event" would coincide with a release.
 1. We document the deprecation in the following places if applicable
     1. deprecation policy - this document 
     1. [Document on this site]({{< relref "/docs" >}}) changes in relevant sections
-    1. [Release notes](https://github.com/GoogleContainerTools/skaffold/blob/master/CHANGELOG.md)
+    1. [Release notes](https://github.com/GoogleContainerTools/skaffold/blob/main/CHANGELOG.md)
     1. [Command help]({{< relref "/docs/references/cli" >}})
     1. Log messages
     1. [skaffold yaml reference]({{< relref "/docs/references/yaml" >}})

docs/content/en/docs/resources/_index.md

@@ -23,15 +23,15 @@ a calendar invite will be sent to your Google Calendar.
 
 ## Contributing
 
-See [Contributing Guide](https://github.com/GoogleContainerTools/skaffold/blob/master/CONTRIBUTING.md),
-[Developing Guide](https://github.com/GoogleContainerTools/skaffold/blob/master/DEVELOPMENT.md),
-and our [Code of Conduct](https://github.com/GoogleContainerTools/skaffold/blob/master/code-of-conduct.md)
+See [Contributing Guide](https://github.com/GoogleContainerTools/skaffold/blob/main/CONTRIBUTING.md),
+[Developing Guide](https://github.com/GoogleContainerTools/skaffold/blob/main/DEVELOPMENT.md),
+and our [Code of Conduct](https://github.com/GoogleContainerTools/skaffold/blob/main/code-of-conduct.md)
 on GitHub.
 
 ## Release Notes
 
-See [Release Notes](https://github.com/GoogleContainerTools/skaffold/blob/master/CHANGELOG.md) on Github.
+See [Release Notes](https://github.com/GoogleContainerTools/skaffold/blob/main/CHANGELOG.md) on Github.
 
 ## Roadmap
 
-See our roadmap [in GitHub](https://github.com/GoogleContainerTools/skaffold/blob/master/ROADMAP.md).
+See our roadmap [in GitHub](https://github.com/GoogleContainerTools/skaffold/blob/main/ROADMAP.md).

docs/content/en/docs/resources/telemetry/_index.md

@@ -24,7 +24,7 @@ The breakdown of data we collect is as follows:
 ```bash
 skaffold dev -v trace --port-forward --cache-artifacts=false --filename=./skaffold.yaml
 ```
-Running the above in the [microservices example](https://github.com/GoogleContainerTools/skaffold/tree/master/examples/microservices)
+Running the above in the [microservices example](https://github.com/GoogleContainerTools/skaffold/tree/main/examples/microservices)
 after a couple of builds/deploys results in the following metrics being collected:
 ```json
 [{

docs/content/en/docs/tutorials/_index.md

@@ -4,7 +4,7 @@ linkTitle: "Tutorials"
 weight: 90
 ---
 
-See the [Github Examples page](https://github.com/GoogleContainerTools/skaffold/tree/master/examples) for examples.
+See the [Github Examples page](https://github.com/GoogleContainerTools/skaffold/tree/main/examples) for examples.
 
 ### Deploying examples to a remote cluster
 

docs/content/en/docs/tutorials/artifact-dependencies.md

@@ -13,7 +13,7 @@ To learn more about how to set up Skaffold and a Kubernetes cluster, see the [qu
 
 ## Tutorial - Simple artifact dependency
 
-This tutorial will be based on the [simple-artifact-dependency](https://github.com/GoogleContainerTools/skaffold/tree/master/examples/simple-artifact-dependency) example in our repository.
+This tutorial will be based on the [simple-artifact-dependency](https://github.com/GoogleContainerTools/skaffold/tree/main/examples/simple-artifact-dependency) example in our repository.
 
 
 ## Adding an artifact dependency
@@ -30,7 +30,7 @@ The image alias `BASE` is now available as a build-arg in the Dockerfile for `ap
 
 ## Build and Deploy
 
-In the [simple-artifact-dependency](https://github.com/GoogleContainerTools/skaffold/tree/master/examples/simple-artifact-dependency) directory, run:
+In the [simple-artifact-dependency](https://github.com/GoogleContainerTools/skaffold/tree/main/examples/simple-artifact-dependency) directory, run:
 
 ```text
 skaffold dev