Browse Source

Replace 'master' with 'main' in various files (#974)

pull/976/head
William Godbe 5 years ago
committed by GitHub
parent
commit
98f8d342ff
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      .github/workflows/format.yml
  2. 2
      README.md
  3. 2
      docs/developer_guide.md
  4. 2
      docs/recipes/azure_functions.md
  5. 4
      docs/recipes/dapr.md
  6. 8
      docs/recipes/distributed_tracing.md
  7. 6
      docs/recipes/logging_elastic.md
  8. 2
      docs/recipes/logging_seq.md
  9. 2
      docs/tutorials/hello-tye/02_add_redis.md
  10. 2
      eng/common/generate-graph-files.ps1
  11. 6
      samples/voting/README.md
  12. 4
      src/schema/README.md

1
.github/workflows/format.yml

@ -4,6 +4,7 @@ on:
pull_request:
branches:
- master
- main
- release/*
jobs:

2
README.md

@ -25,7 +25,7 @@ For the duration of the experiment, consider every part of the tye experience to
---
[![Build Status](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/tye/dotnet-tye-ci-public?branchName=master)](https://dnceng.visualstudio.com/public/_build/latest?definitionId=796&branchName=master)
[![Build Status](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/tye/dotnet-tye-ci-public?branchName=main)](https://dnceng.visualstudio.com/public/_build/latest?definitionId=796&branchName=main)
## Getting Started

2
docs/developer_guide.md

@ -36,7 +36,7 @@ Before opening our .sln files in Visual Studio or VS Code, we recommend performi
This will download the required tools and build the entire repository once. At that point, you should be able to open .sln files to work on the projects you care about.
> :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. On the master branch, we regularly update the versions of .NET Core SDK required to build the repo.
> :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. On the main branch, we regularly update the versions of .NET Core SDK required to build the repo.
> You will need to restart your editor every time we update the .NET Core SDK.
2. Use the `startvs.cmd` script to open Visual Studio .sln files. This script first sets the required environment variables.

2
docs/recipes/azure_functions.md

@ -4,7 +4,7 @@
## Getting Started: Create an Azure Function
Starting from the [sample here](https://github.com/dotnet/tye/tree/master/samples/frontend-backend), we are going to transform the backend from a web application to an azure function app.
Starting from the [sample here](https://github.com/dotnet/tye/tree/main/samples/frontend-backend), we are going to transform the backend from a web application to an azure function app.
To start, create an Azure Function project in a folder called `backend-function`. You can do this via:
- [Visual Studio Code](https://docs.microsoft.com/en-us/azure/azure-functions/functions-create-first-function-vs-code?pivots=programming-language-csharp)

4
docs/recipes/dapr.md

@ -12,7 +12,7 @@ Getting started documentation for Dapr can be found [here](https://docs.dapr.io/
## Sample Code
There are two sample projects for the Dapr recipe [here](https://github.com/dotnet/tye/tree/master/samples/dapr).
There are two sample projects for the Dapr recipe [here](https://github.com/dotnet/tye/tree/main/samples/dapr).
They demonstrate
@ -31,7 +31,7 @@ These services use a variety of Dapr's features:
- Invoke (`store`, `products`)
- Pub/Sub (`store`, `orders`)
You can find the Dapr component files for the sample project [here](https://github.com/dotnet/tye/tree/master/samples/dapr/pub-sub/components).
You can find the Dapr component files for the sample project [here](https://github.com/dotnet/tye/tree/main/samples/dapr/pub-sub/components).
## Running the sample locally

8
docs/recipes/distributed_tracing.md

@ -14,7 +14,7 @@ Tye can get distributed tracing working easily without adding any SDKs or librar
The first step is to enable the W3C trace format in your .NET applications. **This is mandatory, you won't get traces without doing this!**
> :bulb: If you want an existing sample to run, the [sample here](https://github.com/dotnet/tye/tree/master/samples/frontend-backend) will do. This sample code already initializes the trace format.
> :bulb: If you want an existing sample to run, the [sample here](https://github.com/dotnet/tye/tree/main/samples/frontend-backend) will do. This sample code already initializes the trace format.
You need to place the following statement somewhere early in your program:
@ -97,7 +97,7 @@ To use zipkin for distributed tracing in a deployed application, we first need t
Run the following to deploy a minimal zipkin configuration:
```sh
kubectl apply -f https://raw.githubusercontent.com/dotnet/tye/master/docs/recipes/zipkin.yaml
kubectl apply -f https://raw.githubusercontent.com/dotnet/tye/main/docs/recipes/zipkin.yaml
```
> :warning: This is the most basic possible deployment of zipkin. There's no data persistence here!
@ -125,7 +125,7 @@ Tye will prompt for the zipkin URI. If you've followed these basic instructions,
Now to test it out!
Use kubectl to port forward to one of your services. This is what it looks like using the [sample here](https://github.com/dotnet/tye/tree/master/samples/frontend-backend).
Use kubectl to port forward to one of your services. This is what it looks like using the [sample here](https://github.com/dotnet/tye/tree/main/samples/frontend-backend).
```sh
> kubectl port-forward svc/frontend 5000:80
@ -152,7 +152,7 @@ To remove the deployed application run the following commands:
```sh
tye undeploy
kubectl delete -f https://github.com/dotnet/tye/blob/master/docs/recipes/zipkin.yaml
kubectl delete -f https://github.com/dotnet/tye/blob/main/docs/recipes/zipkin.yaml
```
## How this works

6
docs/recipes/logging_elastic.md

@ -6,7 +6,7 @@ Tye can push logs to Elastic stack easily without the need for any SDKs or code
## Getting started: running locally with Elastic stack
> :bulb: If you want an existing sample to run, the [sample here](https://github.com/dotnet/tye/tree/master/samples/frontend-backend) will do. This recipe will show examples of UI and data based on that sample. You own application will work fine, but the data and examples will look different.
> :bulb: If you want an existing sample to run, the [sample here](https://github.com/dotnet/tye/tree/main/samples/frontend-backend) will do. This recipe will show examples of UI and data based on that sample. You own application will work fine, but the data and examples will look different.
The first step is to add the `elastic` extension to your `tye.yaml`. Add the `extensions` node and its children from the example below.
@ -76,7 +76,7 @@ The basic idea is that because log aggregation pulls all of the logs together ac
We'll use the discover tab to build a basic query.
First, perform some operation that will trigger a cross-service call so we have some data to use. If you're using the [sample here](https://github.com/dotnet/tye/tree/master/samples/frontend-backend) then visiting the frontend application in the browser will do.
First, perform some operation that will trigger a cross-service call so we have some data to use. If you're using the [sample here](https://github.com/dotnet/tye/tree/main/samples/frontend-backend) then visiting the frontend application in the browser will do.
Next, let's add some fields to the query. The left pane in Kibana has all of the known fields. Select the following by clicking on the `Add` button near each of them:
@ -96,4 +96,4 @@ Hover over on of the values of `fields.TraceId` for a request to `backend` and c
<img width="1457" alt="image" src="https://user-images.githubusercontent.com/1430011/80927502-2a516200-8d53-11ea-8c2f-caa056bb5423.png">
Now you can see all of the log messages for just that operation, across both the `frontend` and `backend` services. This kind of query can be useful when you want to investigate a problem that occured in the past, and see exactly what was logged by each service that participated in the operation.
Now you can see all of the log messages for just that operation, across both the `frontend` and `backend` services. This kind of query can be useful when you want to investigate a problem that occured in the past, and see exactly what was logged by each service that participated in the operation.

2
docs/recipes/logging_seq.md

@ -6,7 +6,7 @@ Tye can push logs to Seq easily without the need for any SDKs or code changes in
## Getting started: running locally with Seq
> :bulb: If you want an existing sample to run, the [sample here](https://github.com/dotnet/tye/tree/master/samples/frontend-backend) will do. This recipe will show examples of UI and data based on that sample. You own application will work fine, but the data and examples will look different.
> :bulb: If you want an existing sample to run, the [sample here](https://github.com/dotnet/tye/tree/main/samples/frontend-backend) will do. This recipe will show examples of UI and data based on that sample. You own application will work fine, but the data and examples will look different.
The first step is to add the `seq` extension to your `tye.yaml`. Add the `extensions` node and its children from the example below.

2
docs/tutorials/hello-tye/02_add_redis.md

@ -116,7 +116,7 @@ We just showed how `tye` makes it easier to communicate between 2 applications r
`tye deploy` will not deploy the redis configuration, so you need to deploy it first. Run:
```text
kubectl apply -f https://raw.githubusercontent.com/dotnet/tye/master/docs/tutorials/hello-tye/redis.yaml
kubectl apply -f https://raw.githubusercontent.com/dotnet/tye/main/docs/tutorials/hello-tye/redis.yaml
```
This will create a deployment and service for redis. You can see that by running:

2
eng/common/generate-graph-files.ps1

@ -83,4 +83,4 @@ catch {
ExitWithExitCode 1
} finally {
Pop-Location
}
}

6
samples/voting/README.md

@ -22,12 +22,12 @@ A few things need to be configured before deploying to Kubernetes.
- `Redis` can be deployed using the below command :
```
kubectl apply -f https://raw.githubusercontent.com/dotnet/tye/master/docs/tutorials/hello-tye/redis.yaml
kubectl apply -f https://raw.githubusercontent.com/dotnet/tye/main/docs/tutorials/hello-tye/redis.yaml
```
- `Postgresql` can be installed by the following command :
```
kubectl apply -f https://raw.githubusercontent.com/dotnet/tye/master/docs/tutorials/hello-tye/postgres.yaml
kubectl apply -f https://raw.githubusercontent.com/dotnet/tye/main/docs/tutorials/hello-tye/postgres.yaml
```
- Once the deployment is done, you need to keep a note of the below connection strings :
@ -55,4 +55,4 @@ A few things need to be configured before deploying to Kubernetes.
- vote : http://\<EXTERNAL-IP\>/vote
- result: http://\<EXTERNAL-IP\>/results
>! NOTE: Ingress controller may take a while to update the listed public IP address.
>! NOTE: Ingress controller may take a while to update the listed public IP address.

4
src/schema/README.md

@ -9,9 +9,9 @@ Configuring a schema for tye.yaml
```js
{
"yaml.schemas": {
"https://raw.githubusercontent.com/dotnet/tye/master/src/schema/tye-schema.json": [
"https://raw.githubusercontent.com/dotnet/tye/main/src/schema/tye-schema.json": [
"tye.yaml"
]
}
}
```
```

Loading…
Cancel
Save