Resolving conflicts. Merge branch 'release-1.12' of github.com:dapr/q…

…uickstarts into multiapp-wf Signed-off-by: Paul Yuknewicz <[email protected]>
dapr · Sep 27, 2023 · 8f90cc6 · 8f90cc6
2 parents 60584be + ab41de2
commit 8f90cc6
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 16 deletions.
diff --git a/.github/env/global.env b/.github/env/global.env
@@ -1,5 +1,5 @@
-      DAPR_CLI_VERSION: 1.11.0
-      DAPR_RUNTIME_VERSION: 1.11.0
+      DAPR_CLI_VERSION: 1.12.0-rc.1
+      DAPR_RUNTIME_VERSION: 1.12.0-rc.3
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/
       DAPR_DEFAULT_IMAGE_REGISTRY: ghcr
       MACOS_PYTHON_VERSION: 3.10
diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -134,7 +134,7 @@ jobs:
         run: |
           helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo update
-          helm install redis bitnami/redis
+          helm install redis bitnami/redis --version 17.14.5
           dapr init -k --runtime-version=${{ env.DAPR_RUNTIME_VERSION }} --wait || kubectl get pods --all-namespaces
           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

diff --git a/configuration/go/sdk/README.md b/configuration/go/sdk/README.md
@@ -37,7 +37,6 @@ name: Run order-processor service
 expected_stdout_lines:
   - '== APP == Configuration for orderId2: {"Value":"102","Version":"","Metadata":null}'
   - '== APP == App subscribed to config changes with subscription id:'
-  - '== APP == App unsubscribed to config changes'
   - "Exited App successfully"
 expected_stderr_lines:
 output_match_mode: substring

diff --git a/configuration/go/sdk/order-processor/app.go b/configuration/go/sdk/order-processor/app.go
@@ -46,13 +46,7 @@ func main() {
 	}
 	fmt.Println("App subscribed to config changes with subscription id: " + subscriptionID)
 
-	time.Sleep(10 * time.Second)
+<-ctx.Done()
 
-	err = client.UnsubscribeConfigurationItems(context.Background(), DAPR_CONFIGURATION_STORE, subscriptionID)
-	if err != nil {
-		fmt.Println("Error unsubscribing to config updates, err:" + err.Error())
-	} else {
-		fmt.Println("App unsubscribed to config changes")
-	}
 	os.Exit(0)
 }
diff --git a/pub_sub/java/sdk/README.md b/pub_sub/java/sdk/README.md
@@ -49,8 +49,8 @@ name: Run multi app run template
 expected_stdout_lines:
   - 'Started Dapr with app id "order-processor-sdk"'
   - 'Started Dapr with app id "checkout-sdk"'
-  - 'Published data: 10'
-  - 'Subscriber received: 10'
+  - 'Published data: 2'
+  - 'Subscriber received: 2'
 expected_stderr_lines:
 output_match_mode: substring
 match_order: none

diff --git a/service_invocation/csharp/http/README.md b/service_invocation/csharp/http/README.md
@@ -27,8 +27,8 @@ expected_stdout_lines:
   - 'Validating config and starting app "checkout"'
   - 'Started Dapr with app id "checkout"'
   - 'Writing log files to directory'
-  - '== APP - order-processor == Order received : Order { orderId = 10 }'
-  - '== APP - checkout == Order passed: Order { OrderId = 10 }'
+  - '== APP - order-processor == Order received : Order { orderId = 2 }'
+  - '== APP - checkout == Order passed: Order { OrderId = 2 }'
 expected_stderr_lines:
 output_match_mode: substring
 match_order: none

diff --git a/tutorials/bindings/README.md b/tutorials/bindings/README.md
@@ -248,7 +248,7 @@ kubectl create ns kafka
 ```
 
 ```bash
-helm install dapr-kafka bitnami/kafka --wait --namespace kafka -f ./kafka-non-persistence.yaml
+helm install dapr-kafka bitnami/kafka --version 23.0.7 --wait --namespace kafka --timeout 10m0s -f ./kafka-non-persistence.yaml
 ```
 
 <!-- END_STEP -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -248,7 +248,7 @@ kubectl create ns kafka @@
     ```
     ```bash
-    helm install dapr-kafka bitnami/kafka --wait --namespace kafka -f ./kafka-non-persistence.yaml
+    helm install dapr-kafka bitnami/kafka --version 23.0.7 --wait --namespace kafka --timeout 10m0s -f ./kafka-non-persistence.yaml
     ```
     <!-- END_STEP -->
@@ Expand Down @@