Skip to content

Commit

Permalink
Merge branch 'v1.14' into jobs-api-http-json
Browse files Browse the repository at this point in the history
  • Loading branch information
yaron2 authored Sep 14, 2024
2 parents 3555b5f + 9128eeb commit 2a21d35
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ The `tracing` section under the `Configuration` spec contains the following prop
tracing:
samplingRate: "1"
otel:
endpointAddress: "https://..."
endpointAddress: "otelcollector.observability.svc.cluster.local:4317"
zipkin:
endpointAddress: "http://zipkin.default.svc.cluster.local:9411/api/v2/spans"
```
Expand All @@ -97,10 +97,10 @@ The following table lists the properties for tracing:
|--------------|--------|-------------|
| `samplingRate` | string | Set sampling rate for tracing to be enabled or disabled.
| `stdout` | bool | True write more verbose information to the traces
| `otel.endpointAddress` | string | Set the Open Telemetry (OTEL) server address to send traces to
| `otel.endpointAddress` | string | Set the Open Telemetry (OTEL) server address to send traces to. This may or may not require the https:// or http:// depending on your OTEL provider.
| `otel.isSecure` | bool | Is the connection to the endpoint address encrypted
| `otel.protocol` | string | Set to `http` or `grpc` protocol
| `zipkin.endpointAddress` | string | Set the Zipkin server address to send traces to
| `zipkin.endpointAddress` | string | Set the Zipkin server address to send traces to. This should include the protocol (http:// or https://) on the endpoint.

##### `samplingRate`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,18 @@ services:
command: ["./placement", "--port", "50006"]
ports:
- "50006:50006"

scheduler:
image: "daprio/dapr"
command: ["./scheduler", "--port", "50007"]
ports:
- "50007:50007"
# WARNING - This is a tmpfs volume, your state will not be persisted across restarts
volumes:
- type: tmpfs
target: /data
tmpfs:
size: "10000"

networks:
hello-dapr: null
Expand All @@ -147,6 +159,8 @@ services:

To further learn how to run Dapr with Docker Compose, see the [Docker-Compose Sample](https://github.com/dapr/samples/tree/master/hello-docker-compose).

The above example also includes a scheduler definition that uses a non-persistent data store for testing and development purposes.

## Run on Kubernetes

If your deployment target is Kubernetes please use Dapr's first-class integration. Refer to the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ The table below shows the versions of Dapr releases that have been tested togeth

| Release date | Runtime | CLI | SDKs | Dashboard | Status | Release notes |
|--------------------|:--------:|:--------|---------|---------|---------|------------|
| September 6th 2024 | 1.14.2</br> | 1.14.1 | Java 1.12.0 </br>Go 1.11.0 </br>PHP 1.2.0 </br>Python 1.14.0 </br>.NET 1.14.0 </br>JS 3.3.1 | 0.15.0 | Supported (current) | [v1.14.2 release notes](https://github.com/dapr/dapr/releases/tag/v1.14.2) |
| August 14th 2024 | 1.14.1</br> | 1.14.1 | Java 1.12.0 </br>Go 1.11.0 </br>PHP 1.2.0 </br>Python 1.14.0 </br>.NET 1.14.0 </br>JS 3.3.1 | 0.15.0 | Supported (current) | [v1.14.1 release notes](https://github.com/dapr/dapr/releases/tag/v1.14.1) |
| August 14th 2024 | 1.14.0</br> | 1.14.0 | Java 1.12.0 </br>Go 1.11.0 </br>PHP 1.2.0 </br>Python 1.14.0 </br>.NET 1.14.0 </br>JS 3.3.1 | 0.15.0 | Supported (current) | [v1.14.0 release notes](https://github.com/dapr/dapr/releases/tag/v1.14.0) |
| May 29th 2024 | 1.13.4</br> | 1.13.0 | Java 1.11.0 </br>Go 1.10.0 </br>PHP 1.2.0 </br>Python 1.13.0 </br>.NET 1.13.0 </br>JS 3.3.0 | 0.14.0 | Supported | [v1.13.4 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.4) |
Expand Down Expand Up @@ -140,7 +141,7 @@ General guidance on upgrading can be found for [self hosted mode]({{< ref self-h
| 1.11.0 to 1.11.4 | N/A | 1.12.4 |
| 1.12.0 to 1.12.4 | N/A | 1.13.5 |
| 1.13.0 to 1.13.5 | N/A | 1.14.0 |
| 1.14.0 to 1.14.1 | N/A | 1.14.1 |
| 1.14.0 to 1.14.2 | N/A | 1.14.2 |

## Upgrade on Hosting platforms

Expand Down
4 changes: 4 additions & 0 deletions daprdocs/content/en/reference/api/jobs_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,13 @@ Parameter | Description

Systemd timer style cron accepts 6 fields:
seconds | minutes | hours | day of month | month | day of week
--- | --- | --- | --- | --- | ---
0-59 | 0-59 | 0-23 | 1-31 | 1-12/jan-dec | 0-7/sun-sat

##### Example 1
"0 30 * * * *" - every hour on the half hour

##### Example 2
"0 15 3 * * *" - every day at 03:15

Period string expressions:
Expand Down
26 changes: 16 additions & 10 deletions daprdocs/content/en/reference/resource-specs/component-schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,33 @@ description: "The basic spec for a Dapr component"

Dapr defines and registers components using a [resource specifications](https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/). All components are defined as a resource and can be applied to any hosting environment where Dapr is running, not just Kubernetes.

Typically, components are restricted to a particular [namepsace]({{< ref isolation-concept.md >}}) and restricted access through scopes to any particular set of applications. The namespace is either explicit on the component manifest itself, or set by the API server, which derives the namespace through context with applying to Kubernetes.

{{% alert title="Note" color="primary" %}}
The exception to this rule is in self-hosted mode, where daprd ingests component resources when the namespace field is omitted. However, the security profile is mute, as daprd has access to the manifest anyway, unlike in Kubernetes.
{{% /alert %}}

## Format

```yaml
apiVersion: dapr.io/v1alpha1
kind: Component
auth:
secretstore: [SECRET-STORE-NAME]
secretstore: <REPLACE-WITH-SECRET-STORE-NAME>
metadata:
name: [COMPONENT-NAME]
namespace: [COMPONENT-NAMESPACE]
name: <REPLACE-WITH-COMPONENT-NAME>
namespace: <REPLACE-WITH-COMPONENT-NAMESPACE>
spec:
type: [COMPONENT-TYPE]
type: <REPLACE-WITH-COMPONENT-TYPE>
version: v1
initTimeout: [TIMEOUT-DURATION]
ignoreErrors: [BOOLEAN]
initTimeout: <REPLACE-WITH-TIMEOUT-DURATION>
ignoreErrors: <REPLACE-WITH-BOOLEAN>
metadata:
- name: [METADATA-NAME]
value: [METADATA-VALUE]
- name: <REPLACE-WITH-METADATA-NAME>
value: <REPLACE-WITH-METADATA-VALUE>
scopes:
- [APPID]
- [APPID]
- <REPLACE-WITH-APPID>
- <REPLACE-WITH-APPID>
```
## Spec fields
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ aliases:

The `HTTPEndpoint` is a Dapr resource that is used to enable the invocation of non-Dapr endpoints from a Dapr application.

{{% alert title="Note" color="primary" %}}
Any HTTPEndpoint resource can be restricted to a particular [namepsace]({{< ref isolation-concept.md >}}) and restricted access through scopes to any particular set of applications.
{{% /alert %}}

## Format

```yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ description: "The basic spec for a Dapr resiliency resource"

The `Resiliency` Dapr resource allows you to define and apply fault tolerance resiliency policies. Resiliency specs are applied when the Dapr sidecar starts.

{{% alert title="Note" color="primary" %}}
Any resiliency resource can be restricted to a particular [namepsace]({{< ref isolation-concept.md >}}) and restricted access through scopes to any particular set of applications.
{{% /alert %}}

## Format

```yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ weight: 2000
description: "The basic spec for a Dapr subscription"
---

The `Subscription` Dapr resource allows you to subscribe declaratively to a topic using an external component YAML file. This guide demonstrates two subscription API versions:
The `Subscription` Dapr resource allows you to subscribe declaratively to a topic using an external component YAML file.

{{% alert title="Note" color="primary" %}}
Any subscription can be restricted to a particular [namepsace]({{< ref isolation-concept.md >}}) and restricted access through scopes to any particular set of applications.
{{% /alert %}}

This guide demonstrates two subscription API versions:

- `v2alpha` (default spec)
- `v1alpha1` (deprecated)
Expand Down
2 changes: 1 addition & 1 deletion daprdocs/layouts/shortcodes/dapr-latest-version.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{- if .Get "short" }}1.14{{ else if .Get "long" }}1.14.1{{ else if .Get "cli" }}1.14.1{{ else }}1.14.1{{ end -}}
{{- if .Get "short" }}1.14{{ else if .Get "long" }}1.14.2{{ else if .Get "cli" }}1.14.1{{ else }}1.14.1{{ end -}}

0 comments on commit 2a21d35

Please sign in to comment.