Skip to content

Commit 03865d0

Browse files
committed
Merge branch 'master' of github.com:johnsta/visualstudio-docs-pr into johnsta
2 parents c64bbed + 2326bde commit 03865d0

10 files changed

+23
-12
lines changed

connected-environment/common/vsce-init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ vsce init --public
1111

1212
The Connected Environment CLI's ```init``` command generates Docker and Kubernetes assets with default settings:
1313
* `./Dockerfile` describes the app's container image, and how the source code is built and runs within the container.
14-
* A **Helm chart** under `./charts/webfrontend` describes how to deploy the container to Kubernetes.
14+
* A [Helm chart](https://docs.helm.sh) under `./charts/webfrontend` describes how to deploy the container to Kubernetes.
1515

1616
For now it isn't necessary to understand the full content of these files. It's worth pointing out, however, that **the same Kubernetes and Docker configuration-as-code assets can be used from development through to production, thus providing better consistency across different environments.**
1717

connected-environment/get-started-netcore-03.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you have [.NET Core](https://www.microsoft.com/net) installed, you can quickl
1919
dotnet new mvc --name webfrontend
2020
```
2121

22-
Alternatively, **download sample code from GitHub** by navigating to https://github.com/johnsta/vsce-samples and select **Clone or Download** to download the GitHub repository to your local environment. The code for this guide is in `vsce-samples/dotnetcore/getting-started/webfrontend`.
22+
Alternatively, **download sample code from GitHub** by navigating to https://github.com/Azure/vsce and select **Clone or Download** to download the GitHub repository to your local environment. The code for this guide is in `vsce/samples/dotnetcore/getting-started/webfrontend`.
2323

2424
[!INCLUDE[](common/vsce-init.md)]
2525

connected-environment/get-started-netcore-05.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ In this section we're going to create a second service, `mywebapi`, and have `we
1818
![](media/multi-container.png)
1919

2020
## Download sample code for *mywebapi*
21-
For the sake of time, let's download sample code from a GitHub repository. Go to https://github.com/johnsta/vsce-samples and select **Clone or Download** to download the GitHub repository. The code for this section is in `vsce-samples/dotnetcore/getting-started/mywebapi`.
21+
For the sake of time, let's download sample code from a GitHub repository. Go to https://github.com/Azure/vsce and select **Clone or Download** to download the GitHub repository. The code for this section is in `vsce/samples/dotnetcore/getting-started/mywebapi`.
2222

2323

2424
## Run *mywebapi*

connected-environment/get-started-netcore-visualstudio-03.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Until the development environment is successfully created you cannot debug your
4040
## Look at the files added to project
4141
While we wait for the development environment to be created, let’s look at the files that have been added to your project when you chose to use a development environment.
4242

43-
First, you can see a folder named `charts` has been added and within this a Helm chart for your application has been scaffolded. These files are used to deploy your application into the development environment.
43+
First, you can see a folder named `charts` has been added and within this a [Helm chart](https://docs.helm.sh) for your application has been scaffolded. These files are used to deploy your application into the development environment.
4444

4545
You will see a file named `Dockerfile` has been added. This file has information needed to package your application in the standard Docker format. A `HeaderPropagation.cs` file is also created, we will discuss this file later in the walkthrough.
4646

connected-environment/get-started-netcore-visualstudio-05.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ In this section we're going to create a second service, `mywebapi`, and have `we
1919
![](media/multi-container.png)
2020

2121
## Download sample code for *mywebapi*
22-
For the sake of time, let's download sample code from a GitHub repository. Go to https://github.com/johnsta/vsce-samples and select **Clone or Download** to download the GitHub repository. The code for this section is in `vsce-samples/dotnetcore/getting-started/mywebapi`.
22+
For the sake of time, let's download sample code from a GitHub repository. Go to https://github.com/Azure/vsce and select **Clone or Download** to download the GitHub repository. The code for this section is in `vsce/samples/dotnetcore/getting-started/mywebapi`.
2323

2424
## Run *mywebapi*
2525
1. Open the project `mywebapi` in a *separate Visual Studio window*.

connected-environment/get-started-nodejs-03.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ manager: "ghogen"
1414
Previous step: [Create a Kubernetes development environment in Azure](get-started-nodejs-02.md)
1515

1616
## Create a Node.js Web App
17-
Download code from GitHub by navigating to https://github.com/johnsta/vsce-samples and select **Clone or Download** to download the GitHub repository to your local environment. The code for this guide is in `vsce-samples/nodejs/getting-started/webfrontend`.
17+
Download code from GitHub by navigating to https://github.com/Azure/vsce and select **Clone or Download** to download the GitHub repository to your local environment. The code for this guide is in `vsce/samples/nodejs/getting-started/webfrontend`.
1818

1919
[!INCLUDE[](common/vsce-init.md)]
2020

@@ -41,13 +41,13 @@ If you open the web app on a mobile device, you will notice that the UI does not
4141

4242
To fix this, we'll add a `viewport` meta tag:
4343
1. Open the file `./public/index.html`
44-
1. Add a `viewport` meta tag in the existing `header` tag:
44+
1. Add a `viewport` meta tag in the existing `head` element:
4545

4646
```html
47-
<header>
47+
<head>
4848
<!-- Add this line -->
4949
<meta name="viewport" content="width=device-width, initial-scale=1">
50-
</header>
50+
</head>
5151
```
5252

5353
1. Save the file.

connected-environment/get-started-nodejs-05.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ In this section we're going to create a second service, `mywebapi`, and have `we
1818
![](media/multi-container.png)
1919

2020
## Open sample code for *mywebapi*
21-
You should already have the sample code for `mywebapi` for this guide under a folder named `vsce-samples` (if not, go to https://github.com/johnsta/vsce-samples and select **Clone or Download** to download the GitHub repository.) The code for this section is in `vsce-samples/nodejs/getting-started/mywebapi`.
21+
You should already have the sample code for `mywebapi` for this guide under a folder named `vsce/samples` (if not, go to https://github.com/Azure/vsce and select **Clone or Download** to download the GitHub repository.) The code for this section is in `vsce/samples/nodejs/getting-started/mywebapi`.
2222

2323
## Run *mywebapi*
2424
1. Open the folder `mywebapi` in a *separate VS Code window*.

connected-environment/how-to/share-dev-environment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
With Connected Environment, you can share your development environment with others on your team. Each developer can work in their own space without fear of breaking others. Also, working together in one environment can enable you to test code end-to-end without having to create mocks or simulate dependencies. See the [Learn about team development](../get-started-nodejs-06.md) guide for more information.
44

55
To set up an environment for multiple developers:
6-
1. [Create a Connected Environment in Azure](../get-started.md). You'll need to have Owner or Contributor access to an Azure subscription.
6+
1. [Create a Connected Environment in Azure](../get-started.md). You'll need to have Owner or Contributor access to the selected Azure subscription.
77
1. Configure the environment's **resource group** to [grant Contributor access](https://docs.microsoft.com/en-us/azure/active-directory/role-based-access-control-configure) for each team member. You can check an environment's resource group by running this command: `vsce env list`
88
1. Ask team members to **select the environment** in order to develop in it.
99
* **Command line or VS Code**: To see existing Connected Environments you have access to: `vsce env list`. To select an environment: `vsce env select`.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Use `kubectl` with a Connected Environment
2+
3+
You can access the Kubernetes cluster within a Connected Environment, and use existing Kubernetes tools like `kubectl`.
4+
5+
Running `vsce env create` or `vsce env select` will automatically add a `kubectl` configuration context for you, so kubectl should already be connected to your VSCE Kubernetes cluster. Examples:
6+
- Confirm the current context: `kubectl config current-context`
7+
- List all available contexts: `kubectl config get-contexts`. A kubernetes cluster created by VSCE will be named something like "vsce-<guid>".
8+
- Change context: `kubectl config use-context <context-name>`
9+
- View the Kubernetes dashboard: run `kubectl proxy`, then open your browser to the address that this command emits (append `/ui` to the URL to navigate to the Kubernetes dashboard).
10+
- List the running services in the default VSCE space named *mainline*: `kubectl get services --namespace=mainline`
11+

connected-environment/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You may see this error when trying to access your service. For example, when you
2222
1. If the container is in the process of being built/deployed, you can wait 2-3 seconds and try accessing the service again.
2323
1. Check your port configuration. The specified port numbers should be **identical** in all the assets below:
2424
* **Dockerfile:** Specified by the `EXPOSE` instruction.
25-
* **Helm Chart:** Specified by the `externalPort` and `internalPort` values for a service (often located in a `values.yml` file),
25+
* **[Helm chart](https://docs.helm.sh):** Specified by the `externalPort` and `internalPort` values for a service (often located in a `values.yml` file),
2626
* Any ports being opened up in application code, for example in Node.js: `var server = app.listen(80, function () {...}`
2727

2828

0 commit comments

Comments
 (0)