Merge pull request #96 from microsoft/implement-app-healthcheck-in-dapr

Add service monitoring and updating dapr version
microsoft · Jul 30, 2024 · ca0e10e · ca0e10e
2 parents 8d3660d + 182a34b
commit ca0e10e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -10,6 +10,6 @@ dependencies:
     repository: https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts
     condition: subcharts.smb.enabled
   - name: dapr
-    version: 1.9.6
+    version: 1.13.5
     repository: https://dapr.github.io/helm-charts
     condition: subcharts.dapr.enabled
diff --git a/chart/templates/_dapr.tpl b/chart/templates/_dapr.tpl
@@ -7,6 +7,10 @@ dapr.io/app-protocol:   "grpc"
 dapr.io/app-port: "50051"
 dapr.io/log-level: {{ $globalValues.dapr.logLevel | quote }}
 dapr.io/enable-api-logging: "true"
+dapr.io/enable-app-health-check: "true"
+dapr.io/app-health-probe-interval: "5"
+dapr.io/app-health-probe-timeout: "10000"
+dapr.io/app-health-threshold: "50"
 {{- if $serviceValues.debugShim }}
 dapr.io/sidecar-liveness-probe-delay-seconds: "2"
 dapr.io/sidecar-liveness-probe-period-seconds: "2"

diff --git a/chart/templates/coresvc_switchboard.yaml b/chart/templates/coresvc_switchboard.yaml
@@ -71,10 +71,6 @@ spec:
     value: 16
   - name: enableDeadLetter # Optional enable dead Letter or not
     value: false
-  - name: maxLen # Optional max message count in a queue
-    value: 3000
-  - name: maxLenBytes # Optional maximum length in bytes of a queue.
-    value: 10485760
 {{- if eq $globalValues.security.topicRestrictionEnabled true }}
 {{- $protectedTopics := list -}}
 {{- $publishingScopes := list -}}

diff --git a/config/0_spacesdk-base.yaml b/config/0_spacesdk-base.yaml
@@ -16,15 +16,21 @@ config:
   charts:
     - group: dapr
       enabled: true
-      version: 1.9.6
+      version: 1.13.5
       namespace: dapr-system
       containers:
-        - registry: ghcr.io
-          repository: dapr/dapr
-          tag: 1.9.6
         - registry: ghcr.io
           repository: dapr/daprd
-          tag: 1.9.6
+          tag: 1.13.5
+        - registry: ghcr.io
+          repository: dapr/sentry
+          tag: 1.13.5
+        - registry: ghcr.io
+          repository: dapr/injector
+          tag: 1.13.5
+        - registry: ghcr.io
+          repository: dapr/operator
+          tag: 1.13.5
     - group: smb
       enabled: false
       version: 1.15.0

diff --git a/env/spacefx.env b/env/spacefx.env
@@ -1,4 +1,4 @@
-SPACEFX_CHANNEL=stable
+SPACEFX_CHANNEL=nightly
 SPACEFX_DIR=/var/spacedev
 SPACEFX_VERSION=0.11.0
 LOG_LEVEL=TRACE

diff --git a/scripts/deploy/deploy_chart_dependencies.sh b/scripts/deploy/deploy_chart_dependencies.sh
@@ -194,9 +194,11 @@ function deploy_dapr_plugin(){
             --set global.registry=${_registry_url}/dapr \
             --set global.logAsJson=true \
             --set dapr_placement.logLevel=debug \
+            --set global.prometheus.enabled=false \
             --set dapr_sidecar_injector.sidecarImagePullPolicy=IfNotPresent \
             --set global.imagePullPolicy=IfNotPresent \
             --set global.mtls.enabled=true \
+            --set global.actors.enabled=false \
             --set dapr_placement.cluster.forceInMemoryLog=true \
             --set dapr_dashboard.enabled=false"
 

diff --git a/scripts/deploy/deploy_k3s.sh b/scripts/deploy/deploy_k3s.sh
@@ -118,8 +118,9 @@ function load_images_to_k3s(){
         return
     fi
 
-    run_a_script "cat /etc/systemd/system/k3s.service" k3s_service_file
-    if [[ "$k3s_service_file" == *"--docker"* ]]; then
+    run_a_script "grep -q -- \"--docker\" \"/etc/systemd/system/k3s.service\"" --ignore_error
+
+    if [[ $RETURN_CODE -eq 0 ]]; then
         info_log "...docker detected.  Validating images via docker..."
         load_images_to_k3s_docker
     else