[pull] master from Azure:master

README.md

@@ -2,6 +2,9 @@
 
 _Delivering modern cloud native applications with ​open source technologies on Azure​_
 
+
+**NOTE: We have moved this content over to a new and updated repository https://github.com/Azure/kubernetes-hackfest**
+
 ## Overview
 
 This workshop will guide you through migrating an application from "on-premise" to containers running in Azure Kubernetes Service.
@@ -15,6 +18,7 @@ The labs are based upon a node.js application that allows for voting on the Just
 ## Lab Guides - Day 1
   0. [Setup Lab environment](labs/day1-labs/00-lab-environment.md)
   1. [Run app locally to test components](labs/day1-labs/01-setup-app-local.md)
+  2. [Create Docker images for apps and push to Azure Container Registry(ACR Build)](labs/day1-labs/02-dockerize-apps(alt-acr-build).md)
   2. [Create Docker images for apps and push to Azure Container Registry](labs/day1-labs/02-dockerize-apps.md)
   3. [Create an Azure Kubernetes Service (AKS) cluster](labs/day1-labs/03-create-aks-cluster.md)
   4. [Deploy application to Azure Kubernetes Service](labs/day1-labs/04-deploy-app-aks.md)
@@ -32,7 +36,7 @@ These labs can be completed in no particular order.
   2. [Kubernetes Ingress Controllers](labs/day2-labs/ingress-controller.md)
   3. [Kubernetes InitContainers](labs/day2-labs/init-containers.md)
   4. [Azure Service Broker](labs/day2-labs/open-service-broker.md)
-  5. Persistent Storage (coming soon)
+  5. [Persistent Storage](labs/day2-labs/persistent-volumes.md)
   6. [Azure Container Instances and ACI Connector](labs/day2-labs/virtual-kubelet-aci.md)
   7. Kubernetes Stateful Sets (coming soon)
   8. Secrets and ConfigMaps (coming soon)
@@ -57,7 +61,7 @@ contact [[email protected]](mailto:[email protected]) with any additio
 
 ## License
 
-This software is covered under the MIT license. You can read the license [here][license].
+This software is covered under the MIT license. You can read the license [here](LICENSE).
 
 This software contains code from Heroku Buildpacks, which are also covered by the MIT license.
 

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.7 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

labs/day1-labs/01-setup-app-local.md

@@ -59,7 +59,7 @@ The API for the app is written in javascript, running on [Node.js](https://nodej
 
 ### Web Application layer - Vue.js, Node.js
 
-The web frontend for the app is written in [Vue.js](https://vuejs.org/Vue "Vue.js Homepage"), running on [Node.js](https://nodejs.org/en/ "Node.js Homepage") with [Webpack](https://webpack.js.org/ "Webpack Homepage")
+The web frontend for the app is written in [Vue.js](https://vuejs.org/ "Vue.js Homepage"), running on [Node.js](https://nodejs.org/en/ "Node.js Homepage") with [Webpack](https://webpack.js.org/ "Webpack Homepage")
 
 1. Open a new terminal session on the jumpbox
 2. Update dependencies and run app via node

labs/day1-labs/02-dockerize-apps(alt-acr-build).md

@@ -0,0 +1,143 @@
+# Dockerizing Applications with Azure Container Registry
+
+## Azure Container Registry (ACR)
+
+We will use Azure COntainer Registry to build our containers from Dockerfiles and also host our images to run in AKS
+
+### Create Azure Container Registry instance
+
+1. In the browser, sign in to the Azure portal at https://portal.azure.com. Your Azure login ID will look something like `[email protected]`
+2. Click "Create a resource" and select "Container Registry"
+3. Provide a name for your registry (this must be unique)
+4. Use the existing Resource Group
+5. Enable the Admin user
+6. Use the 'Standard' SKU (default)
+
+    > The Standard registry offers the same capabilities as Basic, but with increased storage limits and image throughput. Standard registries should satisfy the needs of most production scenarios.
+
+1. Open the Azure Cloud Shell
+
+    ![Azure Cloud Shell](img/cloudshell.png "Azure Cloud Shell")
+
+2. The first time Cloud Shell is started will require you to create a storage account. In our lab, you must click `Advanced` and enter an account name and share.
+
+3. Once your cloud shell is started, clone the workshop repo into the cloud shell environment
+    ```
+    git clone https://github.com/Azure/blackbelt-aks-hackfest.git
+    ```
+
+4. In the cloud shell, you are automatically logged into your Azure subscription. ```az login``` is not required.
+
+5. Verify your subscription is correctly selected as the default
+    ```
+    az account list
+    ```
+
+6. Find your RG name
+
+    ```
+    az group list 
+    ```
+
+    ```
+
+    [
+    {
+        "id": "/subscriptions/b23accae-e655-44e6-a08d-85fb5f1bb854/resourceGroups/ODL-aks-v2-gbb-8386",
+        "location": "centralus",
+        "managedBy": null,
+        "name": "ODL-aks-v2-gbb-8386",
+        "properties": {
+        "provisioningState": "Succeeded"
+        },
+        "tags": {
+        "AttendeeId": "8391",
+        "LaunchId": "486",
+        "LaunchType": "ODL",
+        "TemplateId": "1153"
+        }
+    }
+    ]
+    ```
+
+For the first container, we will be creating a Dockerfile from scratch. For the other containers, the Dockerfiles are provided.
+
+### Web Container
+
+1. Create a Dockerfile
+
+    * Access the cloud shell
+    * In the `~/blackbelt-aks-hackfest/app/web` directory, add a file called "Dockerfile"
+        * you can add an empty file by running `touch Dockerfile` in the cloud shell.
+        * you can launch in in-browser code editor in cloud shell by typing `code .` at the bash prompt (click the refresh button to see the new Dockerfile)
+
+    * Add the following lines and save:
+
+        ```
+        FROM node:9.4.0-alpine
+
+        ARG VCS_REF
+        ARG BUILD_DATE
+        ARG IMAGE_TAG_REF
+
+        ENV GIT_SHA $VCS_REF
+        ENV IMAGE_BUILD_DATE $BUILD_DATE
+        ENV IMAGE_TAG $IMAGE_TAG_REF
+
+        WORKDIR /usr/src/app
+        COPY package*.json ./
+        RUN npm install
+
+        COPY . .
+        RUN apk --no-cache add curl
+        EXPOSE 8080
+
+        CMD [ "npm", "run", "container" ]
+        ```
+
+2. Create a container image for the node.js Web app
+
+    From the terminal session: 
+
+    ```
+    cd ~/blackbelt-aks-hackfest/app/web
+
+    # Set environment variable for ACR Name
+    ACR_NAME=<registry-name>
+    az acr build --registry $ACR_NAME --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg IMAGE_TAG_REF=v1 --image azureworkshop/rating-web:v1 .
+
+    ```
+    1. Return to the Azure Portal in your browser and validate that the image appears in your Container Registry under the "Repositories" area.
+    2. Under tags, you will see "v1" listed.
+
+### API Container
+
+In this step, the Dockerfile has been created for you. 
+
+1. Create a container image for the node.js API app
+
+    ```
+    cd ~/blackbelt-aks-hackfest/app/api
+
+   az acr build --registry $ACR_NAME --image azureworkshop/rating-api:v1 .
+
+    ```
+    1. Return to the Azure Portal in your browser and validate that the image appears in your Container Registry under the "Repositories" area.
+    2. Under tags, you will see "v1" listed.
+
+
+### MongoDB Container
+
+1. Create a MongoDB image with data files
+
+    ```
+    cd ~/blackbelt-aks-hackfest/app/db
+
+    az acr build --registry $ACR_NAME --image azureworkshop/rating-db:v1 .
+
+    ```
+    1. Return to the Azure Portal in your browser and validate that the image appears in your Container Registry under the "Repositories" area.
+    2. Under tags, you will see "v1" listed.
+
+
+

labs/day1-labs/02-dockerize-apps.md

@@ -10,8 +10,8 @@ For the first container, we will be creating a Dockerfile from scratch. For the
 
     * Access the jumpbox
     * In the `~/blackbelt-aks-hackfest/app/web` directory, add a file called "Dockerfile"
-        * If you are in an SSH session, use vi as the editor
-        * In RDP, you can use Visual Studio Code
+        * If you are in an SSH session, use `vi` as the editor
+        * In RDP or in Azure Cloud Shell, you can use `code .` (use Visual Studio Code)
 
     * Add the following lines and save:
 
@@ -83,15 +83,15 @@ In this step, the Dockerfile has been created for you.
 Create a docker bridge network to allow the containers to communicate internally. 
 
 ```
-docker network create --subnet=172.18.0.0/16 my-network
+docker network create my-network
 ```
 
 ### MongoDB Container
 
 1. Run mongo container
 
     ```
-    docker run -d --name db --net my-network --ip 172.18.0.10 -p 27017:27017 rating-db
+    docker run -d --name db --net my-network -p 27017:27017 rating-db
     ```
 
 2. Validate by running `docker ps -a`
@@ -121,7 +121,7 @@ docker network create --subnet=172.18.0.0/16 my-network
 1. Run api app container
 
     ```
-    docker run -d --name api -e "MONGODB_URI=mongodb://172.18.0.10:27017/webratings" --net my-network --ip 172.18.0.11 -p 3000:3000 rating-api
+    docker run -d --name api -e "MONGODB_URI=mongodb://db:27017/webratings" --net my-network -p 3000:3000 rating-api
     ```
 
     > Note that environment variables are used here to direct the api app to mongo.
@@ -138,7 +138,7 @@ docker network create --subnet=172.18.0.0/16 my-network
 1. Run web app container
 
     ```
-    docker run -d --name web -e "API=http://172.18.0.11:3000/" --net my-network --ip 172.18.0.12 -p 8080:8080 rating-web
+    docker run -d --name web -e "API=http://api:3000/" --net my-network -p 8080:8080 rating-web
     ```
 
 2. Validate by running `docker ps -a`
@@ -159,7 +159,7 @@ Now that we have container images for our application components, we need to sto
 ### Create Azure Container Registry instance
 
 1. In the browser, sign in to the Azure portal at https://portal.azure.com. Your Azure login ID will look something like `[email protected]`
-2. Click "Create a resource" and select "Azure Container Registry"
+2. Click "Create a resource" and select "Container Registry"
 3. Provide a name for your registry (this must be unique)
 4. Use the existing Resource Group
 5. Enable the Admin user
@@ -188,17 +188,17 @@ Now that we have container images for our application components, we need to sto
 ```
 # Be sure to replace the login server value
 
-docker tag rating-db $ACR_SERVER/azureworkshop/rating-db:v1
-docker tag rating-api $ACR_SERVER/azureworkshop/rating-api:v1
-docker tag rating-web $ACR_SERVER/azureworkshop/rating-web:v1
+docker tag rating-db $ACR_SERVER/azureworkshop/rating-db:v1; 
+docker tag rating-api $ACR_SERVER/azureworkshop/rating-api:v1;
+docker tag rating-web $ACR_SERVER/azureworkshop/rating-web:v1;
 ```
 
 ### Push images to registry
 
 ```
-docker push $ACR_SERVER/azureworkshop/rating-db:v1
-docker push $ACR_SERVER/azureworkshop/rating-api:v1
-docker push $ACR_SERVER/azureworkshop/rating-web:v1
+docker push $ACR_SERVER/azureworkshop/rating-db:v1;
+docker push $ACR_SERVER/azureworkshop/rating-api:v1;
+docker push $ACR_SERVER/azureworkshop/rating-web:v1;
 ```
 
 Output from a successful `docker push` command is similar to:

labs/day1-labs/03-create-aks-cluster.md

@@ -28,7 +28,6 @@
     ```
 
     ```
-
     [
     {
         "id": "/subscriptions/b23accae-e655-44e6-a08d-85fb5f1bb854/resourceGroups/ODL-aks-v2-gbb-8386",
@@ -57,14 +56,14 @@
 
     ```
 
-8. Create your AKS cluster in the resource group created above with 2 nodes, targeting Kubernetes version 1.7.7
+8. Create your AKS cluster in the resource group created above with 2 nodes, targeting Kubernetes version 1.11.2
     ```
     # This command can take 5-25 minutes to run as it is creating the AKS cluster. Please be PATIENT...
 
     # set the location to one of the provided AKS locations (eg - centralus, eastus)
     LOCATION=
 
-    az aks create -n $CLUSTER_NAME -g $NAME -c 2 -k 1.7.7 --generate-ssh-keys -l $LOCATION
+    az aks create -n $CLUSTER_NAME -g $NAME -c 2 -k 1.11.2 --generate-ssh-keys -l $LOCATION
     ```
 
 9. Verify your cluster status. The `ProvisioningState` should be `Succeeded`
@@ -73,7 +72,7 @@
 
     Name                 Location    ResourceGroup         KubernetesVersion    ProvisioningState    Fqdn
     -------------------  ----------  --------------------  -------------------  -------------------  -------------------------------------------------------------------
-    ODLaks-v2-gbb-16502  centralus   ODL_aks-v2-gbb-16502  1.7.7                Succeeded             odlaks-v2--odlaks-v2-gbb-16-b23acc-17863579.hcp.centralus.azmk8s.io
+    ODLaks-v2-gbb-16502  centralus   ODL_aks-v2-gbb-16502  1.11.2                Succeeded             odlaks-v2--odlaks-v2-gbb-16-b23acc-17863579.hcp.centralus.azmk8s.io
     ```
 
 
@@ -90,8 +89,8 @@
     kubectl get nodes
 
     NAME                       STATUS    ROLES     AGE       VERSION
-    aks-nodepool1-20004257-0   Ready     agent     4m        v1.7.7
-    aks-nodepool1-20004257-1   Ready     agent     4m        v1.7.7
+    aks-nodepool1-20004257-0   Ready     agent     4m        v1.11.2
+    aks-nodepool1-20004257-1   Ready     agent     4m        v1.11.2
     ```
 
     To see more details about your cluster: 

labs/day1-labs/04-deploy-app-aks.md

@@ -2,11 +2,11 @@
 
 ## Review/Edit the YAML Config Files
 
-1. In Azure Cloud Shell edit `heroes-db.yaml` using `vi`
+1. In Azure Cloud Shell edit `heroes-db.yaml` using Visual Studio Code:
     ```
     cd ~/blackbelt-aks-hackfest/labs/helper-files
 
-    vi heroes-db.yaml
+    code heroes-db.yaml
     ```
     * Review the yaml file and learn about some of the settings
     * Update the yaml file for the proper container image name
@@ -20,11 +20,11 @@
             name:  heroes-db-cntnr
         ```
 
-2. In Azure Cloud Shell edit `heroes-web-api.yaml` using `vi`
+2. In Azure Cloud Shell edit `heroes-web-api.yaml` using Visual Studio Code:
     ```
     cd ~/blackbelt-aks-hackfest/labs/helper-files
 
-    vi heroes-web-api.yaml
+    code heroes-web-api.yaml
     ```
     * Review the yaml file and learn about some of the settings. Note the environment variables that allow the services to connect
     * Update the yaml file for the proper container image names.
@@ -128,4 +128,4 @@ kubectl create secret docker-registry acr-secret --docker-server=$ACR_SERVER --d
 
 * Browse to the External IP for your web application (on port 8080) and try the app
 
-> The public IP can take a few minutes to create with a new cluster. Sit back and relax. Maybe check Facebook. 
+> The public IP can take a few minutes to create with a new cluster. Sit back and relax. Maybe check Facebook.