Merge branch 'v0.26' into dapr-sample

radius-project · Nov 13, 2023 · 01e25d1 · 01e25d1
2 parents 99f0645 + 10158de
commit 01e25d1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 45 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -228,6 +228,7 @@ jobs:
         run: rad deploy ${{ matrix.path }} ${{ matrix.args }}
       - name: Wait for all pods to be ready
         if: steps.gen-id.outputs.RUN_TEST == 'true'
+        id: wait-for-pods
         run: |
           namespace="default-${{ matrix.app }}"
           label="radapp.io/application=${{ matrix.app }}"
@@ -258,7 +259,7 @@ jobs:
       # Handle failures
       - name: Get Pod logs for failed tests
         id: get-pod-logs
-        if: failure() && steps.run-playwright-test.outcome == 'failure'
+        if: failure() && (steps.run-playwright-test.outcome == 'failure' || steps.wait-for-pods.outcome == 'failure')
         run: |
           # Create pod-logs directory
           mkdir -p playwright/pod-logs/${{ matrix.name }}

diff --git a/samples/dapr/dapr-azure.bicep b/samples/dapr/dapr-azure.bicep
@@ -45,11 +45,11 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
       image: 'ghcr.io/radius-project/samples/dapr-frontend:latest'
       env: {
         CONNECTION_BACKEND_APPID: backend.name
+        ASPNETCORE_URLS: 'http://*:8080'
       }
       ports: {
         ui: {
-          containerPort: 80
-          provides: frontendRoute.id
+          containerPort: 8080
         }
       }
     }
@@ -62,26 +62,6 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
   }
 }
 
-resource frontendRoute 'Applications.Core/httpRoutes@2023-10-01-preview' = {
-  name: 'frontend-route'
-  properties: {
-    application: app.id
-  }
-}
-
-resource gateway 'Applications.Core/gateways@2023-10-01-preview' = {
-  name: 'gateway'
-  properties: {
-    application: app.id
-    routes: [
-      {
-        path: '/'
-        destination: frontendRoute.id
-      }
-    ]
-  }
-}
-
 resource account 'Microsoft.Storage/storageAccounts@2019-06-01' = {
   name: 'dapr${uniqueString(resourceGroup().id)}'
   location: location

diff --git a/samples/dapr/dapr.bicep b/samples/dapr/dapr.bicep
@@ -48,11 +48,11 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
       image: 'ghcr.io/radius-project/samples/dapr-frontend:latest'
       env: {
         CONNECTION_BACKEND_APPID: backend.name
+        ASPNETCORE_URLS: 'http://*:8080'
       }
       ports: {
         ui: {
-          containerPort: 80
-          provides: frontendRoute.id
+          containerPort: 8080
         }
       }
     }
@@ -65,26 +65,6 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
   }
 }
 
-resource frontendRoute 'Applications.Core/httpRoutes@2023-10-01-preview' = {
-  name: 'frontend-route'
-  properties: {
-    application: app.id
-  }
-}
-
-resource gateway 'Applications.Core/gateways@2023-10-01-preview' = {
-  name: 'gateway'
-  properties: {
-    application: app.id
-    routes: [
-      {
-        path: '/'
-        destination: frontendRoute.id
-      }
-    ]
-  }
-}
-
 resource stateStore 'Applications.Dapr/stateStores@2023-10-01-preview' = {
   name: 'statestore'
   properties: {