Merge pull request dapr#1069 from mikeee/validate-tutorials

fix: validate_tutorials
paulyuk · Jul 25, 2024 · 68dc3d3 · 68dc3d3
2 parents fbd8716 + 4d9be49
commit 68dc3d3
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/validate.yaml → .github/workflows/validate_tutorials.yaml b/.github/workflows/validate.yaml → .github/workflows/validate_tutorials.yaml
@@ -33,10 +33,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 40
     env:
-      GOVER: 1.17
-      KUBERNETES_VERSION: v1.21.1
-      KIND_VERSION: v0.12.0
-      KIND_IMAGE_SHA: sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
+      GOVER: 1.22
+      KUBERNETES_VERSION: v1.29.4
+      KIND_VERSION: v0.23.0
+      KIND_IMAGE_SHA: sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8
     strategy:
       matrix:
         os: [ubuntu-latest]

diff --git a/tutorials/hello-kubernetes/README.md b/tutorials/hello-kubernetes/README.md
@@ -272,7 +272,7 @@ To call the service that you set up port forwarding to, from a command prompt ru
 <!-- STEP
 name: Curl Test
 expected_stdout_lines:
-  - '{"DAPR_HTTP_PORT":"3500","DAPR_GRPC_PORT":"50001"}'
+  - '{"DAPR_HTTP_ENDPOINT":"http://localhost:3500","DAPR_GRPC_ENDPOINT":"http://localhost:50001"}'
 tags:
   - normal-run
 -->

diff --git a/tutorials/hello-kubernetes/dapr.yaml b/tutorials/hello-kubernetes/dapr.yaml
@@ -1,4 +1,6 @@
 version: 1
+common:
+  resourcesPath: ./resources
 apps:
   - appDirPath: ./node
     appID: nodeapp
@@ -7,4 +9,4 @@ apps:
     createService: true
   - appDirPath: ./python
     appID: pythonapp
-    containerImage: ghcr.io/dapr/samples/hello-k8s-python:latest
+    containerImage: ghcr.io/dapr/samples/hello-k8s-python:latest
diff --git a/tutorials/hello-kubernetes/resources/resiliency.yaml b/tutorials/hello-kubernetes/resources/resiliency.yaml
@@ -0,0 +1,8 @@
+spec:
+  policies:
+    retries:
+      # Global Retry Policy
+      DefaultRetryPolicy:
+        policy: constant
+        duration: 1s
+        maxRetries: -1
diff --git a/tutorials/observability/README.md b/tutorials/observability/README.md
@@ -389,6 +389,8 @@ expected_stdout_lines:
   - '"total":"54"'
 output_match_mode: substring
 name: "Curl test"
+background: false
+sleep: 5
 -->
 
 ```bash
@@ -476,6 +478,7 @@ output_match_mode: substring
 expected_stderr_lines:
 
 name: Curl validate
+background: false
 -->
 
 ```bash