JoshVanL
diff --git a/‎Makefile‎
Lines changed: 7 additions & 3 deletions b/‎Makefile‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎charts/dapr/Chart.yaml‎
Lines changed: 3 additions & 0 deletions b/‎charts/dapr/Chart.yaml‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎charts/dapr/README.md‎
Lines changed: 67 additions & 44 deletions b/‎charts/dapr/README.md‎
Lines changed: 67 additions & 44 deletions
diff --git a/‎charts/dapr/charts/dapr_rbac/templates/scheduler.yaml‎
Lines changed: 54 additions & 0 deletions b/‎charts/dapr/charts/dapr_rbac/templates/scheduler.yaml‎
Lines changed: 54 additions & 0 deletions
diff --git a/‎charts/dapr/charts/dapr_scheduler/.helmignore‎
Lines changed: 23 additions & 0 deletions b/‎charts/dapr/charts/dapr_scheduler/.helmignore‎
Lines changed: 23 additions & 0 deletions
diff --git a/‎charts/dapr/charts/dapr_scheduler/Chart.yaml‎
Lines changed: 5 additions & 0 deletions b/‎charts/dapr/charts/dapr_scheduler/Chart.yaml‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎charts/dapr/charts/dapr_scheduler/templates/_helpers.tpl‎
Lines changed: 85 additions & 0 deletions b/‎charts/dapr/charts/dapr_scheduler/templates/_helpers.tpl‎
Lines changed: 85 additions & 0 deletions
diff --git a/‎charts/dapr/charts/dapr_scheduler/templates/dapr_scheduler_poddisruptionbudget.yaml‎
Lines changed: 32 additions & 0 deletions b/‎charts/dapr/charts/dapr_scheduler/templates/dapr_scheduler_poddisruptionbudget.yaml‎
Lines changed: 32 additions & 0 deletions
diff --git a/‎charts/dapr/charts/dapr_scheduler/templates/dapr_scheduler_service.yaml‎
Lines changed: 31 additions & 0 deletions b/‎charts/dapr/charts/dapr_scheduler/templates/dapr_scheduler_service.yaml‎
Lines changed: 31 additions & 0 deletions
@@ -23,7 +23,7 @@ GIT_COMMIT  = $(shell git rev-list -1 HEAD)
 GIT_VERSION ?= $(shell git describe --always --abbrev=7 --dirty)
 # By default, disable CGO_ENABLED. See the details on https://golang.org/cmd/cgo
 CGO         ?= 0
-BINARIES    ?= daprd placement operator injector sentry
+BINARIES    ?= daprd placement operator injector sentry scheduler
 HA_MODE     ?= false
 # Force in-memory log for placement
 FORCE_INMEM ?= true
@@ -106,7 +106,7 @@ else
 	RUN_BUILD_TOOLS ?= cd .build-tools; GOOS=$(TARGET_OS_LOCAL) GOARCH=$(TARGET_ARCH_LOCAL) go run .
 endif
 
-# Default docker container and e2e test targst.
+# Default docker container and e2e test target.
 TARGET_OS ?= linux
 TARGET_ARCH ?= amd64
 TEST_OUTPUT_FILE_PREFIX ?= ./test_report
@@ -131,6 +131,7 @@ HELM:=helm
 RELEASE_NAME?=dapr
 DAPR_NAMESPACE?=dapr-system
 DAPR_MTLS_ENABLED?=true
+DAPR_SCHEDULER_REPLICAS?=1
 HELM_CHART_ROOT:=./charts
 HELM_CHART_DIR:=$(HELM_CHART_ROOT)/dapr
 HELM_OUT_DIR:=$(OUT_DIR)/install
@@ -276,7 +277,8 @@ ifeq ($(ONLY_DAPR_IMAGE),true)
 		--set dapr_placement.image.name=$(RELEASE_NAME) \
 		--set dapr_sentry.image.name=$(RELEASE_NAME) \
 		--set dapr_sidecar_injector.image.name=$(RELEASE_NAME) \
-		--set dapr_sidecar_injector.injectorImage.name=$(RELEASE_NAME)
+		--set dapr_sidecar_injector.injectorImage.name=$(RELEASE_NAME) \
+		--set dapr_scheduler.image.name=$(RELEASE_NAME)
 endif
 docker-deploy-k8s: check-docker-env check-arch
 	$(info Deploying ${DAPR_REGISTRY}/${RELEASE_NAME}:${DAPR_TAG} to the current K8S context...)
@@ -290,6 +292,7 @@ docker-deploy-k8s: check-docker-env check-arch
 		--set global.imagePullPolicy=$(PULL_POLICY) --set global.imagePullSecrets=${DAPR_TEST_REGISTRY_SECRET} \
 		--set global.mtls.enabled=${DAPR_MTLS_ENABLED} \
 		--set dapr_placement.cluster.forceInMemoryLog=$(FORCE_INMEM) \
+		--set dapr_scheduler.replicaCount=$(DAPR_SCHEDULER_REPLICAS) \
 		$(ADDITIONAL_HELM_SET) $(HELM_CHART_DIR)
 
 ################################################################################
@@ -350,6 +353,7 @@ TEST_WITH_RACE=./pkg/acl/... \
 ./pkg/retry/... \
 ./pkg/resiliency/... \
 ./pkg/runtime/... \
+./pkg/scheduler/... \
 ./pkg/scopes/... \
 ./pkg/security/... \
 ./pkg/sentry/... \
 
@@ -19,3 +19,6 @@ dependencies:
   - name: dapr_sentry
     version: '0.0.0'
     repository: "file://dapr_sentry"
+  - name: dapr_scheduler
+    version: '0.0.0'
+    repository: "file://dapr_scheduler"
@@ -0,0 +1,54 @@
+{{- if or (eq .Values.global.scheduler.enabled true) (eq .Values.global.reminders.serviceName "scheduler") }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: dapr-scheduler
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- range $key, $value := .Values.global.k8sLabels }}
+    {{ $key }}: {{ tpl $value $ }}
+    {{- end }}
+{{- end }}
+---
+{{- if or (eq .Values.global.scheduler.enabled true) (eq .Values.global.reminders.serviceName "scheduler") }}
+{{- if eq .Values.global.rbac.namespaced true }}
+kind: Role
+{{- else }}
+kind: ClusterRole
+{{- end }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: dapr-scheduler
+  labels:
+    {{- range $key, $value := .Values.global.k8sLabels }}
+    {{ $key }}: {{ tpl $value $ }}
+    {{- end }}
+rules: []
+{{- end }}
+---
+{{- if or (eq .Values.global.scheduler.enabled true) (eq .Values.global.reminders.serviceName "scheduler") }}
+{{- if eq .Values.global.rbac.namespaced true }}
+kind: RoleBinding
+{{- else }}
+kind: ClusterRoleBinding
+{{- end }}
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: dapr-scheduler
+  labels:
+    {{- range $key, $value := .Values.global.k8sLabels }}
+    {{ $key }}: {{ tpl $value $ }}
+    {{- end }}
+subjects:
+  - kind: ServiceAccount
+    name: dapr-scheduler
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+{{- if eq .Values.global.rbac.namespaced true }}
+  kind: Role
+{{- else }}
+  kind: ClusterRole
+{{- end }}
+  name: dapr-scheduler
+{{- end }}
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Dapr Scheduler
+name: dapr_scheduler
+version: '0.0.0'
@@ -0,0 +1,85 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "dapr_scheduler.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "dapr_scheduler.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create initial cluster peer list dynamically based on replicaCount.
+*/}}
+{{- define "dapr_scheduler.initialcluster" -}}
+{{- $initialCluster := "" -}}
+{{- $namespace := .Release.Namespace -}}
+{{- $replicaCount := int .Values.replicaCount -}}
+{{- range $i, $e := until $replicaCount -}}
+{{- $instanceName := printf "dapr-scheduler-server-%d" $i -}}
+{{- $svcName := printf "%s.dapr-scheduler-server.%s.svc.cluster.local" $instanceName $namespace -}}
+{{- $peer := printf "%s=http://%s:%d" $instanceName $svcName (int $.Values.ports.etcdGRPCPeerPort) -}}
+{{- $initialCluster = printf "%s%s" $initialCluster $peer -}}
+{{- if ne (int $i) (sub $replicaCount 1) -}}
+{{- $initialCluster = printf "%s," $initialCluster -}}
+{{- end -}}
+{{- end -}}
+{{- $initialCluster -}}
+{{- end -}}
+
+{{/*
+Create etcd client ports list dynamically based on replicaCount.
+*/}}
+{{- define "dapr_scheduler.etcdclientports" -}}
+{{- $etcdClientPorts := "" -}}
+{{- $namespace := .Release.Namespace -}}
+{{- $replicaCount := int .Values.replicaCount -}}
+{{- range $i, $e := until $replicaCount -}}
+{{- $instanceName := printf "dapr-scheduler-server-%d" $i -}}
+{{- $clientPort := int $.Values.ports.etcdGRPCClientPort -}}
+{{- $instancePortPair := printf "%s=%d" $instanceName $clientPort -}}
+{{- if gt $i 0 -}}
+{{- $etcdClientPorts = printf "%s,%s" $etcdClientPorts $instancePortPair -}}
+{{- else -}}
+{{- $etcdClientPorts = $instancePortPair -}}
+{{- end -}}
+{{- end -}}
+{{- $etcdClientPorts -}}
+{{- end -}}
+
+{{/*
+Create etcd client http ports list dynamically based on replicaCount.
+*/}}
+{{- define "dapr_scheduler.etcdclienthttpports" -}}
+{{- $etcdClientHttpPorts := "" -}}
+{{- $namespace := .Release.Namespace -}}
+{{- $replicaCount := int .Values.replicaCount -}}
+{{- range $i, $e := until $replicaCount -}}
+{{- $instanceName := printf "dapr-scheduler-server-%d" $i -}}
+{{- $clientPort := int $.Values.ports.etcdHTTPClientPort -}}
+{{- $instancePortPair := printf "%s=%d" $instanceName $clientPort -}}
+{{- if gt $i 0 -}}
+{{- $etcdClientHttpPorts = printf "%s,%s" $etcdClientHttpPorts $instancePortPair -}}
+{{- else -}}
+{{- $etcdClientHttpPorts = $instancePortPair -}}
+{{- end -}}
+{{- end -}}
+{{- $etcdClientHttpPorts -}}
+{{- end -}}
+
+
@@ -0,0 +1,32 @@
+{{- if and (gt (int .Values.replicaCount) 1) (eq .Values.global.scheduler.enabled true) }}
+{{- if .Capabilities.APIVersions.Has "policy/v1" }}
+apiVersion: policy/v1
+{{- else }}
+apiVersion: policy/v1beta1
+{{- end }}
+kind: PodDisruptionBudget
+metadata:
+  name: dapr-scheduler-server-disruption-budget
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: dapr-scheduler-server
+    {{- range $key, $value := .Values.global.k8sLabels }}
+    {{ $key }}: {{ tpl $value $ }}
+    {{- end }}
+spec:
+{{- if .Values.global.ha.disruption.minimumAvailable }}
+  minAvailable: {{ .Values.global.ha.disruption.minimumAvailable }}
+{{- end }}
+{{- if .Values.global.ha.disruption.maximumUnavailable }}
+  maxUnavailable: {{ .Values.global.ha.disruption.maximumUnavailable }}
+{{- end }}
+  selector:
+    matchLabels:
+      app: dapr-scheduler-server
+      {{- range $key, $value := .Values.global.k8sLabels }}
+      {{ $key }}: {{ tpl $value $ }}
+      {{- end }}
+      {{- with .Values.global.labels }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+{{- end }}
@@ -0,0 +1,31 @@
+{{- if (eq .Values.global.scheduler.enabled true) }}
+kind: Service
+apiVersion: v1
+metadata:
+  name: dapr-scheduler-server
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: dapr-scheduler-server
+    {{- range $key, $value := .Values.global.k8sLabels }}
+    {{ $key }}: {{ tpl $value $ }}
+    {{- end }}
+{{- if .Values.service.annotations }}
+{{ toYaml .Values.service.annotations | indent 4}}
+{{- end }}
+spec:
+  selector:
+    app: dapr-scheduler-server
+  # scheduler must be able to resolve pod address to join initial cluster peers
+  # before POD is ready
+  publishNotReadyAddresses: true
+  ports:
+  - name: api
+    port: {{ .Values.ports.apiPort }}
+  - name: etcd-client
+    port: {{ .Values.ports.etcdGRPCClientPort }}
+  - name: etcd-httpclient
+    port: {{ .Values.ports.etcdHTTPClientPort }}
+  - name: etcd-peer
+    port: {{ .Values.ports.etcdGRPCPeerPort }}
+  clusterIP: None # make the service headless
+{{- end }}