Merge branch 'master' of https://github.com/Azure/dev-spaces into s-tuli/AddTemplate

Author: a-tuli

.github/workflows/bikes.yml

@@ -48,12 +48,11 @@ jobs:
 
     - name: Helm Install PR
       run: |
+        helm init --upgrade --wait
         helm upgrade --install --namespace $GITHUB_HEAD_REF bikesharing-$GITHUB_HEAD_REF samples/BikeSharingApp/Bikes/charts/bikes \
           --set image.repository=${{ secrets.CONTAINER_REGISTRY }}/bikes \
           --set image.tag=$GITHUB_SHA \
-          --set imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }} \
-          --set ingress.hosts[0]=$GITHUB_HEAD_REF.s.${{ secrets.MASTER_SPACE }}.bikesharing.${{ secrets.HOST_SUFFIX }} \
-          --set ingress.annotations.kubernetes\\.io/ingress\\.class=traefik-azds
+          --set imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }}
  
     - uses: azure/dev-spaces/actions/add-review-url@Releases/v1              
       with:

.github/workflows/bikesharing.yml

@@ -5,7 +5,7 @@ on:
     branches:
     - master
     paths:
-    - samples/BikeSharingApp/**/*
+    - samples/BikeSharingApp/**
     - "!**/*.md"
 
 jobs:
@@ -48,18 +48,43 @@ jobs:
         creds: '${{ secrets.AZURE_CREDENTIALS }}'
         cluster-name: ${{ secrets.CLUSTER_NAME }}
         resource-group: ${{ secrets.RESOURCE_GROUP }}
-         
+    - uses: azure/k8s-actions/k8s-create-secret@master
+      with:
+        namespace: ${{ secrets.MASTER_SPACE }}
+        container-registry-url: ${{ secrets.CONTAINER_REGISTRY }}
+        container-registry-username: ${{ secrets.REGISTRY_USERNAME }}
+        container-registry-password: ${{ secrets.REGISTRY_PASSWORD }}
+        secret-name: ${{ secrets.IMAGE_PULL_SECRET }}
+        
     - name: Helm Install Master
       run: |
         cd samples/BikeSharingApp/charts
         helm init --client-only
         helm dependency update
+        helm init --upgrade --wait
         helm upgrade --install --namespace ${{ secrets.MASTER_SPACE }} bikesharing . \
           --set bikes.image.repository=${{ secrets.CONTAINER_REGISTRY }}/bikes \
-          --set bikesharingweb.image.repository=${{ secrets.CONTAINER_REGISTRY }}/bikesharingweb\
+          --set bikes.imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }} \
+          --set bikes.image.tag=$GITHUB_SHA \
+          --set bikesharingweb.image.repository=${{ secrets.CONTAINER_REGISTRY }}/bikesharingweb \
+          --set bikesharingweb.imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }} \
+          --set bikesharingweb.image.tag=$GITHUB_SHA \
+          --set bikesharingweb.ingress.hosts[0]=${{ secrets.HOST }} \
+          --set bikesharingweb.ingress.annotations.kubernetes\\.io/ingress\\.class=traefik-azds \
           --set billing.image.repository=${{ secrets.CONTAINER_REGISTRY }}/billing \
+          --set billing.imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }} \
+          --set billing.image.tag=$GITHUB_SHA \
           --set gateway.image.repository=${{ secrets.CONTAINER_REGISTRY }}/gateway \
+          --set gateway.imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }} \
+          --set gateway.image.tag=$GITHUB_SHA \
+          --set gateway.ingress.hosts[0]=${{ secrets.MASTER_SPACE }}.gateway.${{ secrets.HOST_SUFFIX }} \
+          --set gateway.ingress.annotations.kubernetes\\.io/ingress\\.class=traefik-azds \
           --set reservation.image.repository=${{ secrets.CONTAINER_REGISTRY }}/reservation \
+          --set reservation.imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }} \
+          --set reservation.image.tag=$GITHUB_SHA \
           --set reservationengine.image.repository=${{ secrets.CONTAINER_REGISTRY }}/reservationengine \
+          --set reservationengine.imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }} \
+          --set reservationengine.image.tag=$GITHUB_SHA \
           --set users.image.repository=${{ secrets.CONTAINER_REGISTRY }}/users \
-          --set image.tag=$GITHUB_SHA
+          --set users.imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }} \
+          --set users.image.tag=$GITHUB_SHA

samples/BikeSharingApp/Bikes/server.js

@@ -349,7 +349,7 @@ app.get('/hello', function(req, res) {
 });
 
 // start server ------------------------------------------------------------
-var port = 80;
+var port = process.env.PORT || 3000;
 var server = null;
 
 process.on("SIGINT", () => {
@@ -403,4 +403,4 @@ async.retry({times: 10, interval: 1000}, tryMongoConnect, function(err, result)
     server = app.listen(port, function () {
         console.log('Listening on port ' + port);
     });
-});
+});

samples/BikeSharingApp/README.md

@@ -21,7 +21,7 @@ Follow the steps below to deploy this sample app to Azure Kubernete Service (AKS
 
 1. **Enable Azure Dev Spaces on the AKS cluster.**
     ```bash
-    az aks use-dev-spaces -g MyResourceGroup -n MyAKS --space master --yes
+    az aks use-dev-spaces -g MyResourceGroup -n MyAKS --space dev --yes
     ```
 
 ## Deploy the BikeSharing sample app
@@ -34,33 +34,33 @@ Follow the steps below to deploy this sample app to Azure Kubernete Service (AKS
     cd dev-spaces/samples/BikeSharingApp/
     ```
 
-1. **Retrieve the HostSuffix for the `master` dev space.**
+1. **Retrieve the HostSuffix for the `dev` dev space.**
     ```bash
     azds show-context
 
     Name                ResourceGroup     DevSpace  HostSuffix
     ------------------  ----------------  --------  -----------------------
-    MyAKS               MyResourceGroup   master    fedcab0987.eus.azds.io
+    MyAKS               MyResourceGroup   dev       fedcab0987.eus.azds.io
     ```
 
 1. **Update the Helm chart with your HostSuffix.** Open [`charts/values.yaml`](https://github.com/Azure/dev-spaces/blob/master/samples/BikeSharingApp/charts/values.yaml) and replace all instances of `<REPLACE_ME_WITH_HOST_SUFFIX>` with the HostSuffix value you retrieved earlier. Save your changes and close the file.
 
-1. **Deploy the sample application to Kubernetes.** We'll use Helm to run this sample application, but other tooling could be used to run your entire application in a namespace within a cluster. The Helm commands are targeting the namespace named `master` you created earlier, and can take several minutes to complete.
+1. **Deploy the sample application to Kubernetes.** We'll use Helm to run this sample application, but other tooling could be used to run your entire application in a namespace within a cluster. The Helm commands are targeting the namespace named `dev` you created earlier, and can take several minutes to complete.
     ```bash
     cd charts/
     helm init --wait
-    helm install -n bikesharing . --dep-up --namespace master --atomic
+    helm install -n bikesharing . --dep-up --namespace dev --atomic
     ```
     Note: **If you are using an RBAC-enabled cluster**, be sure to configure [a service account for Tiller](https://helm.sh/docs/using_helm/#role-based-access-control). Otherwise, `helm` commands will fail.
 
-1. **Open your browser to the app's website.** Run the `azds list-uris` command to see the public endpoints in the running app. Navigate to the `bikesharingweb` service - in the below example, the public URL for the `bikesharingweb` service is http://master.bikesharingweb.fedcab0987.eus.azds.io/. Select **Aurelia Briggs (customer)** as the user, then select a bike to rent.
+1. **Open your browser to the app's website.** Run the `azds list-uris` command to see the public endpoints in the running app. Navigate to the `bikesharingweb` service - in the below example, the public URL for the `bikesharingweb` service is http://dev.bikesharingweb.fedcab0987.eus.azds.io/. Select **Aurelia Briggs (customer)** as the user, then select a bike to rent.
     ```bash
     azds list-uris
 
-    Uri                                                   Status
-    --------------------------------------------------    ---------
-    http://master.bikesharingweb.fedcab0987.eus.azds.io/  Available
-    http://master.gateway.fedcab0987.eus.azds.io/         Available
+    Uri                                                Status
+    -----------------------------------------------    ---------
+    http://dev.bikesharingweb.fedcab0987.eus.azds.io/  Available
+    http://dev.gateway.fedcab0987.eus.azds.io/         Available
     ```
 
 1. **Commit and push to your forked repo.** This will ensure that feature branches you create going forward will also have the configuration changes you made earlier.
@@ -77,3 +77,9 @@ Now that you have the BikeSharing app deployed in AKS, try these walkthroughs to
 1. **[Debug and iterate code directly in AKS.](https://docs.microsoft.com/azure/dev-spaces/quickstart-netcore)** This is similar to the first scenario, except this mode enables a *higher fidelity development and testing experience* by running your code as a container directly in AKS. Dev Spaces can help you generate Docker and Kubernetes assets.
 
 1. **[Combine GitHub Actions with Dev Spaces in a pull request review.](https://aka.ms/devspaces/pr-flow)** You can use GitHub Actions to automatically deploy to a new sandbox whenever a pull request is opened so that your team can review a live version of the app that includes your pull request changes – all before that code is merged into your main branch! As a bonus, team members such as product managers and designers can become part of the review process during early stages of development.
+
+## Clean up
+This command deletes all Azure resources created for this sample:
+```bash
+az group delete --name MyResourceGroup --yes --no-wait
+```