From 9136a99ebe16d7a2e9b0704a7ff79534ff195645 Mon Sep 17 00:00:00 2001 From: Maksym Sadovnychyy Date: Fri, 20 Dec 2024 11:28:41 +0100 Subject: [PATCH] (bugfix): documentation mistakes --- README.md | 24 ++++++++++--------- src/Core/DaprPubSubComponents.cs | 2 +- src/Core/DaprStateStoreComponents.cs | 6 ++--- src/deployment.yaml | 22 +++++++++-------- .../dapr/components/pubsub.yaml | 2 +- .../dapr/components/statestore.yaml | 6 ++--- 6 files changed, 33 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 60ffeeb..615d03c 100644 --- a/README.md +++ b/README.md @@ -149,19 +149,20 @@ spec: app: publisher annotations: dapr.io/enabled: "true" - dapr.io/app-id: "publisher" + dapr.io/app-id: "dapr-test-publisher" dapr.io/app-port: "5000" # Adjust to your service port spec: containers: - name: publisher - image: cr.maks-it.com/dapr-test/subscriber:latest + image: cr.maks-it.com/dapr-test/publisher:latest + imagePullPolicy: Always ports: - containerPort: 5000 # Match your internal app port env: + - name: ASPNETCORE_HTTP_PORTS + value: "5000" - name: ASPNETCORE_ENVIRONMENT value: Development - - name: ASPNETCORE_HTTP_PORTS - value: 5000 --- @@ -198,19 +199,20 @@ spec: app: subscriber annotations: dapr.io/enabled: "true" - dapr.io/app-id: "subscriber" + dapr.io/app-id: "dapr-test-subscriber" dapr.io/app-port: "5000" # Adjust to match the subscriber service port spec: containers: - name: subscriber image: cr.maks-it.com/dapr-test/subscriber:latest + imagePullPolicy: Always ports: - containerPort: 5000 # Match the internal port of the subscriber service env: + - name: ASPNETCORE_HTTP_PORTS + value: "5000" - name: ASPNETCORE_ENVIRONMENT value: Development - - name: ASPNETCORE_HTTP_PORTS - value: 5000 --- @@ -219,7 +221,7 @@ spec: apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: pubsub + name: dapr-test-pubsub namespace: dapr-test spec: type: pubsub.rabbitmq @@ -245,7 +247,7 @@ spec: apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: statestore + name: dapr-test-statestore namespace: dapr-test spec: type: state.redis @@ -261,7 +263,7 @@ spec: apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: privatestatestore + name: dapr-test-privatestatestore namespace: dapr-test spec: type: state.redis @@ -275,7 +277,7 @@ spec: apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: actorsstatestore + name: dapr-test-actorsstatestore namespace: dapr-test spec: type: state.redis diff --git a/src/Core/DaprPubSubComponents.cs b/src/Core/DaprPubSubComponents.cs index 96cf9be..f186ef5 100644 --- a/src/Core/DaprPubSubComponents.cs +++ b/src/Core/DaprPubSubComponents.cs @@ -1,5 +1,5 @@ namespace Core; public static class DaprPubSubComponents { - public const string PubSub = "pubsub"; + public const string PubSub = "dapr-test-pubsub"; } diff --git a/src/Core/DaprStateStoreComponents.cs b/src/Core/DaprStateStoreComponents.cs index fbd3ada..28e31ec 100644 --- a/src/Core/DaprStateStoreComponents.cs +++ b/src/Core/DaprStateStoreComponents.cs @@ -1,7 +1,7 @@ namespace Core; public static class DaprStateStoreComponents { - public const string SharedStore = "statestore"; - public const string PrivateStore = "privatestore"; - public const string ActorsStore = "actorsstore"; + public const string SharedStore = "dapr-test-statestore"; + public const string PrivateStore = "dapr-test-privatestore"; + public const string ActorsStore = "dapr-test-actorsstore"; } diff --git a/src/deployment.yaml b/src/deployment.yaml index d713b51..6f27b06 100644 --- a/src/deployment.yaml +++ b/src/deployment.yaml @@ -109,19 +109,20 @@ spec: app: publisher annotations: dapr.io/enabled: "true" - dapr.io/app-id: "publisher" + dapr.io/app-id: "dapr-test-publisher" dapr.io/app-port: "5000" # Adjust to your service port spec: containers: - name: publisher image: cr.maks-it.com/dapr-test/subscriber:latest + imagePullPolicy: Always ports: - containerPort: 5000 # Match your internal app port env: + - name: ASPNETCORE_HTTP_PORTS + value: "5000" - name: ASPNETCORE_ENVIRONMENT value: Development - - name: ASPNETCORE_HTTP_PORTS - value: 5000 --- @@ -158,19 +159,20 @@ spec: app: subscriber annotations: dapr.io/enabled: "true" - dapr.io/app-id: "subscriber" + dapr.io/app-id: "dapr-test-subscriber" dapr.io/app-port: "5000" # Adjust to match the subscriber service port spec: containers: - name: subscriber image: cr.maks-it.com/dapr-test/subscriber:latest + imagePullPolicy: Always ports: - containerPort: 5000 # Match the internal port of the subscriber service env: + - name: ASPNETCORE_HTTP_PORTS + value: "5000" - name: ASPNETCORE_ENVIRONMENT value: Development - - name: ASPNETCORE_HTTP_PORTS - value: 5000 --- @@ -179,7 +181,7 @@ spec: apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: pubsub + name: dapr-test-pubsub namespace: dapr-test spec: type: pubsub.rabbitmq @@ -205,7 +207,7 @@ spec: apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: statestore + name: dapr-test-statestore namespace: dapr-test spec: type: state.redis @@ -221,7 +223,7 @@ spec: apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: privatestatestore + name: dapr-test-privatestatestore namespace: dapr-test spec: type: state.redis @@ -235,7 +237,7 @@ spec: apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: actorsstatestore + name: dapr-test-actorsstatestore namespace: dapr-test spec: type: state.redis diff --git a/src/docker-compose/dapr/components/pubsub.yaml b/src/docker-compose/dapr/components/pubsub.yaml index 1d10583..f1343ab 100644 --- a/src/docker-compose/dapr/components/pubsub.yaml +++ b/src/docker-compose/dapr/components/pubsub.yaml @@ -1,7 +1,7 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: pubsub + name: dapr-test-pubsub namespace: dapr-test spec: type: pubsub.rabbitmq diff --git a/src/docker-compose/dapr/components/statestore.yaml b/src/docker-compose/dapr/components/statestore.yaml index 2ca1cce..ade7c04 100644 --- a/src/docker-compose/dapr/components/statestore.yaml +++ b/src/docker-compose/dapr/components/statestore.yaml @@ -1,7 +1,7 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: statestore + name: dapr-test-statestore namespace: dapr-test spec: type: state.redis @@ -17,7 +17,7 @@ spec: apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: privatestatestore + name: dapr-test-privatestatestore namespace: dapr-test spec: type: state.redis @@ -31,7 +31,7 @@ spec: apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: actorsstatestore + name: dapr-test-actorsstatestore namespace: dapr-test spec: type: state.redis