From 323853b3b245c521e38886d58bad1f33ea19325c Mon Sep 17 00:00:00 2001 From: mikeee Date: Thu, 25 Jul 2024 11:18:24 +0100 Subject: [PATCH 1/5] chore: rename workflow, bump kubernetes versions and print redis logs Signed-off-by: mikeee --- .../workflows/{validate.yaml => validate_tutorials.yaml} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) rename .github/workflows/{validate.yaml => validate_tutorials.yaml} (96%) diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate_tutorials.yaml similarity index 96% rename from .github/workflows/validate.yaml rename to .github/workflows/validate_tutorials.yaml index c3a570850..e969d4af6 100644 --- a/.github/workflows/validate.yaml +++ b/.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] @@ -136,6 +136,7 @@ jobs: helm repo update helm install redis bitnami/redis --version 17.14.5 dapr init -k --dev --runtime-version=${{ env.DAPR_RUNTIME_VERSION }} --wait || kubectl get pods --all-namespaces + kubectl logs dapr-dev-redis-master-0 -n default kubectl get nodes -o wide for pod in `dapr status -k | awk '/dapr/ {print $1}'`; do kubectl describe pod -l app=$pod -n dapr-system ; kubectl logs -l app=$pod -n dapr-system; done - name: Install utilities dependencies From ff7603adddd8f056f1f0ebb6dcb0ab2fceda4c68 Mon Sep 17 00:00:00 2001 From: mikeee Date: Thu, 25 Jul 2024 11:55:11 +0100 Subject: [PATCH 2/5] ci: remove debug/log step Signed-off-by: mikeee --- .github/workflows/validate_tutorials.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/validate_tutorials.yaml b/.github/workflows/validate_tutorials.yaml index e969d4af6..395068ed4 100644 --- a/.github/workflows/validate_tutorials.yaml +++ b/.github/workflows/validate_tutorials.yaml @@ -136,7 +136,6 @@ jobs: helm repo update helm install redis bitnami/redis --version 17.14.5 dapr init -k --dev --runtime-version=${{ env.DAPR_RUNTIME_VERSION }} --wait || kubectl get pods --all-namespaces - kubectl logs dapr-dev-redis-master-0 -n default kubectl get nodes -o wide for pod in `dapr status -k | awk '/dapr/ {print $1}'`; do kubectl describe pod -l app=$pod -n dapr-system ; kubectl logs -l app=$pod -n dapr-system; done - name: Install utilities dependencies From 231fb83580c0f9f565bf5b80f6600cbf590d1a91 Mon Sep 17 00:00:00 2001 From: mikeee Date: Thu, 25 Jul 2024 12:06:25 +0100 Subject: [PATCH 3/5] fix: define resiliency policy Signed-off-by: mikeee --- tutorials/hello-kubernetes/dapr.yaml | 4 +++- tutorials/hello-kubernetes/resources/resiliency.yaml | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 tutorials/hello-kubernetes/resources/resiliency.yaml diff --git a/tutorials/hello-kubernetes/dapr.yaml b/tutorials/hello-kubernetes/dapr.yaml index dcf9ee929..cd596e0f5 100644 --- 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 \ No newline at end of file + 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 new file mode 100644 index 000000000..b5248469b --- /dev/null +++ b/tutorials/hello-kubernetes/resources/resiliency.yaml @@ -0,0 +1,8 @@ +spec: + policies: + retries: + # Global Retry Policy + DefaultRetryPolicy: + policy: constant + duration: 1s + maxRetries: -1 From afdd5eac8c18e591947d5d9da8b28790e7e7c700 Mon Sep 17 00:00:00 2001 From: mikeee Date: Thu, 25 Jul 2024 13:56:00 +0100 Subject: [PATCH 4/5] fix: update expected validation output Signed-off-by: mikeee --- tutorials/hello-kubernetes/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/hello-kubernetes/README.md b/tutorials/hello-kubernetes/README.md index 7241d0ae2..e819339c7 100644 --- 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 From 4d9be4980789e9733fefce7d6d125907f4e58b57 Mon Sep 17 00:00:00 2001 From: mikeee Date: Thu, 25 Jul 2024 21:04:05 +0100 Subject: [PATCH 5/5] fix: add sleep/background arguments to the observability tutorial Signed-off-by: mikeee --- tutorials/observability/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tutorials/observability/README.md b/tutorials/observability/README.md index 70d942289..1e418acb8 100644 --- 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