Small fixes

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
dapr · Jan 4, 2024 · 5304c2b · 5304c2b
1 parent 8027d5c
commit 5304c2b
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 47 deletions.
diff --git a/charts/dapr/charts/dapr_rbac/templates/placement.yaml b/charts/dapr/charts/dapr_rbac/templates/placement.yaml
@@ -1,3 +1,4 @@
+{{- if and (eq .Values.global.actors.enabled true) (eq .Values.global.actors.serviceName "placement") }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -7,7 +8,9 @@ metadata:
     {{- range $key, $value := .Values.global.k8sLabels }}
     {{ $key }}: {{ tpl $value $ }}
     {{- end }}
+{{- end }}
 ---
+{{- if and (eq .Values.global.actors.enabled true) (eq .Values.global.actors.serviceName "placement") }}
 {{- if eq .Values.global.rbac.namespaced true }}
 kind: Role
 {{- else }}
@@ -21,7 +24,9 @@ metadata:
     {{ $key }}: {{ tpl $value $ }}
     {{- end }}
 rules: []
+{{- end }}
 ---
+{{- if and (eq .Values.global.actors.enabled true) (eq .Values.global.actors.serviceName "placement") }}
 {{- if eq .Values.global.rbac.namespaced true }}
 kind: RoleBinding
 {{- else }}
@@ -46,3 +51,4 @@ roleRef:
   kind: ClusterRole
 {{- end }}
   name: dapr-placement
+{{- end }}
diff --git a/pkg/actors/providers_test.go b/pkg/actors/providers_test.go
@@ -93,6 +93,9 @@ func TestConfig_GetRemindersProvider(t *testing.T) {
 		remindersProviders["custom"] = func(config Config, placement internal.PlacementService) (remindersProviderFactory, error) {
 			return nilProvider, nil
 		}
+		t.Cleanup(func() {
+			delete(remindersProviders, "custom")
+		})
 
 		c := Config{
 			Config: internal.Config{

diff --git a/pkg/runtime/processor/processor.go b/pkg/runtime/processor/processor.go
@@ -73,9 +73,8 @@ type Options struct {
 	// PodName is the name of the pod.
 	PodName string
 
-	// PlacementEnabled indicates whether placement service is enabled in this
-	// Dapr cluster.
-	PlacementEnabled bool
+	// ActorsEnabled indicates whether placement service is enabled in this Dapr cluster.
+	ActorsEnabled bool
 
 	// IsHTTP indicates whether the connection to the application is using the
 	// HTTP protocol.
@@ -144,11 +143,11 @@ func New(opts Options) *Processor {
 	})
 
 	state := state.New(state.Options{
-		PlacementEnabled: opts.PlacementEnabled,
-		Registry:         opts.Registry.StateStores(),
-		ComponentStore:   opts.ComponentStore,
-		Meta:             opts.Meta,
-		Outbox:           ps.Outbox(),
+		ActorsEnabled:  opts.ActorsEnabled,
+		Registry:       opts.Registry.StateStores(),
+		ComponentStore: opts.ComponentStore,
+		Meta:           opts.Meta,
+		Outbox:         ps.Outbox(),
 	})
 
 	secret := secret.New(secret.Options{

diff --git a/pkg/runtime/processor/state/state.go b/pkg/runtime/processor/state/state.go
@@ -40,11 +40,11 @@ const (
 var log = logger.NewLogger("dapr.runtime.processor.state")
 
 type Options struct {
-	Registry         *compstate.Registry
-	ComponentStore   *compstore.ComponentStore
-	Meta             *meta.Meta
-	PlacementEnabled bool
-	Outbox           outbox.Outbox
+	Registry       *compstate.Registry
+	ComponentStore *compstore.ComponentStore
+	Meta           *meta.Meta
+	ActorsEnabled  bool
+	Outbox         outbox.Outbox
 }
 
 type state struct {
@@ -54,17 +54,17 @@ type state struct {
 	lock      sync.RWMutex
 
 	actorStateStoreName *string
-	placementEnabled    bool
+	actorsEnabled       bool
 	outbox              outbox.Outbox
 }
 
 func New(opts Options) *state {
 	return &state{
-		registry:         opts.Registry,
-		compStore:        opts.ComponentStore,
-		meta:             opts.Meta,
-		placementEnabled: opts.PlacementEnabled,
-		outbox:           opts.Outbox,
+		registry:      opts.Registry,
+		compStore:     opts.ComponentStore,
+		meta:          opts.Meta,
+		actorsEnabled: opts.ActorsEnabled,
+		outbox:        opts.Outbox,
 	}
 }
 
@@ -120,7 +120,7 @@ func (s *state) Init(ctx context.Context, comp compapi.Component) error {
 		s.outbox.AddOrUpdateOutbox(comp)
 
 		// when placement address list is not empty, set specified actor store.
-		if s.placementEnabled {
+		if s.actorsEnabled {
 			// set specified actor store if "actorStateStore" is true in the spec.
 			actorStoreSpecified := false
 			for k, v := range props {

diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go
@@ -176,21 +176,21 @@ func newDaprRuntime(ctx context.Context,
 	})
 
 	processor := processor.New(processor.Options{
-		ID:               runtimeConfig.id,
-		Namespace:        namespace,
-		IsHTTP:           runtimeConfig.appConnectionConfig.Protocol.IsHTTP(),
-		PlacementEnabled: len(runtimeConfig.actorsService) > 0,
-		Registry:         runtimeConfig.registry,
-		ComponentStore:   compStore,
-		Meta:             meta,
-		GlobalConfig:     globalConfig,
-		Resiliency:       resiliencyProvider,
-		Mode:             runtimeConfig.mode,
-		PodName:          podName,
-		Standalone:       runtimeConfig.standalone,
-		OperatorClient:   operatorClient,
-		GRPC:             grpc,
-		Channels:         channels,
+		ID:             runtimeConfig.id,
+		Namespace:      namespace,
+		IsHTTP:         runtimeConfig.appConnectionConfig.Protocol.IsHTTP(),
+		ActorsEnabled:  len(runtimeConfig.actorsService) > 0,
+		Registry:       runtimeConfig.registry,
+		ComponentStore: compStore,
+		Meta:           meta,
+		GlobalConfig:   globalConfig,
+		Resiliency:     resiliencyProvider,
+		Mode:           runtimeConfig.mode,
+		PodName:        podName,
+		Standalone:     runtimeConfig.standalone,
+		OperatorClient: operatorClient,
+		GRPC:           grpc,
+		Channels:       channels,
 	})
 
 	var reloader *hotreload.Reloader

diff --git a/pkg/runtime/runtime_test.go b/pkg/runtime/runtime_test.go
@@ -1961,18 +1961,18 @@ func TestGracefulShutdownPubSub(t *testing.T) {
 	mockAppChannel.On("InvokeMethod", mock.MatchedBy(daprt.MatchContextInterface), matchDaprRequestMethod("dapr/subscribe")).Return(fakeResp, nil)
 	// Create new processor with mocked app channel.
 	rt.processor = processor.New(processor.Options{
-		ID:               rt.runtimeConfig.id,
-		IsHTTP:           rt.runtimeConfig.appConnectionConfig.Protocol.IsHTTP(),
-		PlacementEnabled: len(rt.runtimeConfig.actorsService) > 0,
-		Registry:         rt.runtimeConfig.registry,
-		ComponentStore:   rt.compStore,
-		Meta:             rt.meta,
-		GlobalConfig:     rt.globalConfig,
-		Resiliency:       rt.resiliency,
-		Mode:             rt.runtimeConfig.mode,
-		Standalone:       rt.runtimeConfig.standalone,
-		Channels:         rt.channels,
-		GRPC:             rt.grpc,
+		ID:             rt.runtimeConfig.id,
+		IsHTTP:         rt.runtimeConfig.appConnectionConfig.Protocol.IsHTTP(),
+		ActorsEnabled:  len(rt.runtimeConfig.actorsService) > 0,
+		Registry:       rt.runtimeConfig.registry,
+		ComponentStore: rt.compStore,
+		Meta:           rt.meta,
+		GlobalConfig:   rt.globalConfig,
+		Resiliency:     rt.resiliency,
+		Mode:           rt.runtimeConfig.mode,
+		Standalone:     rt.runtimeConfig.standalone,
+		Channels:       rt.channels,
+		GRPC:           rt.grpc,
 	})
 
 	require.NoError(t, rt.processor.Init(context.Background(), cPubSub))