fix go.mod conflicts

Signed-off-by: Cassandra Coyle <[email protected]>

Author: cicoyle

charts/dapr/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: '0.0.0'
 description: A Helm chart for Dapr on Kubernetes
 name: dapr
@@ -22,3 +22,7 @@ dependencies:
   - name: dapr_scheduler
     version: '0.0.0'
     repository: "file://dapr_scheduler"
+  - name: dapr_config
+    version: '0.0.0'
+    repository: "file://dapr_config"
+icon: https://dapr.io/images/dapr.svg

charts/dapr/charts/dapr_config/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Dapr configuration
 name: dapr_config

charts/dapr/charts/dapr_operator/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Dapr Kubernetes Operator
 name: dapr_operator

charts/dapr/charts/dapr_placement/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Dapr Kubernetes placement
 name: dapr_placement

charts/dapr/charts/dapr_rbac/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Dapr Kubernetes RBAC components
 name: dapr_rbac

charts/dapr/charts/dapr_scheduler/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Dapr Scheduler
 name: dapr_scheduler

charts/dapr/charts/dapr_scheduler/templates/dapr_scheduler_statefulset.yaml

@@ -27,7 +27,9 @@ spec:
       name: dapr-scheduler-data-dir
     spec:
       accessModes: [ "ReadWriteOnce" ]
+      {{- if .Values.cluster.storageClassName }}
       storageClassName: {{ .Values.cluster.storageClassName }}
+      {{- end }}
       resources:
         requests:
           storage: {{ .Values.cluster.storageSize }}

charts/dapr/charts/dapr_sentry/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Dapr Sentry
 name: dapr_sentry

charts/dapr/charts/dapr_sidecar_injector/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for the Dapr sidecar injector
 name: dapr_sidecar_injector

docs/development/dapr-metrics.md

@@ -128,6 +128,8 @@ Dapr uses prometheus process and go collectors by default.
 * dapr_runtime_workflow_operation_count: The number of successful/failed workflow operation requests.
 * dapr_runtime_workflow_operation_latency: The latencies of responses for workflow operation requests.
 * dapr_runtime_workflow_execution_count: The number of successful/failed/recoverable workflow executions.
+* dapr_runtime_workflow_activity_operation_count: The number of successful/failed/recoverable activity requests.
+* dapr_runtime_workflow_activity_operation_latency: The total time taken to run an activity request.
 * dapr_runtime_workflow_activity_execution_count: The number of successful/failed/recoverable activity executions.
 * dapr_runtime_workflow_activity_execution_latency: The total time taken to run an activity to completion.