Skip to content

Commit

Permalink
Merge branch 'v1.13' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
hhunter-ms authored Apr 25, 2024
2 parents 20fd7a9 + b951391 commit 70781fb
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 2 deletions.
2 changes: 1 addition & 1 deletion daprdocs/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ offlineSearch = false
github_repo = "https://github.com/dapr/docs"
github_project_repo = "https://github.com/dapr/dapr"
github_subdir = "daprdocs"
github_branch = "v1.12"
github_branch = "v1.13"

# Versioning
version_menu = "v1.13 (latest)"
Expand Down
7 changes: 7 additions & 0 deletions daprdocs/content/en/contributing/presentations.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ We welcome community members giving presentations on Dapr and spreading the word

{{< button text="Download the Dapr Presentation Deck" link="/presentations/dapr-slidedeck.pptx.zip" >}}

{{% alert color="primary" %}}
If you're using the PowerPoint template with MacOS, please install the Space Grotesk font to ensure the text is rendered properly:
```sh
brew install --cask homebrew/cask-fonts/font-space-grotesk
```
{{% /alert %}}

## Giving a Dapr presentation

- Begin by downloading the [Dapr Presentation Deck](/presentations/dapr-slidedeck.pptx.zip). This contains slides and diagrams needed to give a Dapr presentation.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
type: docs
title: "Integrations with Diagrid"
linkTitle: "Diagrid"
weight: 1000
description: "Dapr integrations with Diagrid"
---
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
type: docs
title: "Conductor: Enterprise Dapr for Kubernetes"
linkTitle: "Diagrid Conductor"
description: "Automate operations, enforce security best practices, improve uptime, and elevate insights across your Dapr clusters"
weight: 2000
---

<br /><img src="/images/diagrid-conductor.png" alt="Diagrid Conductor diagram" width="800">

[Diagrid Conductor](https://www.diagrid.io/conductor) quickly and securely connects to all your Kubernetes clusters running Dapr and Daprized applications, delivering operational excellence, security & reliability and insights & collaboration.

**Automated Dapr management**

One-click installation, upgrade and patching of Dapr with selective application update and automated rollback means you’re always up to date.

**Advisor: Discover and automate best practices**

Be informed and apply production best practices, with continuous checking to prevent misconfigurations, increasing security, reliability and performance.

**Resource usage reporting and tracking**

By studying past resource behavior, recommend application resource optimization usage leading to significant cost savings on CPU and memory.

**Application visualizer**

The application graph facilitates collaboration between dev and ops by providing a dynamic overview of your services and infrastructure components.

Try out [Conductor Free](https://www.diagrid.io/pricing), ideal for individual developers building and testing Dapr applications on Kubernetes.

{{< button text="Learn more about Diagrid Conductor" link="https://www.diagrid.io/conductor" >}}
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ The table below shows the versions of Dapr releases that have been tested togeth

| Release date | Runtime | CLI | SDKs | Dashboard | Status | Release notes |
|--------------------|:--------:|:--------|---------|---------|---------|------------|
| April 3rd 2024 | 1.13.2</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 (current) | [v1.13.2 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.2) |
| March 26th 2024 | 1.13.1</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 (current) | [v1.13.1 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.1) |
| March 6th 2024 | 1.13.0</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 (current) | [v1.13.0 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.0) |
| January 17th 2024 | 1.12.4</br> | 1.12.0 | Java 1.10.0 </br>Go 1.9.1 </br>PHP 1.2.0 </br>Python 1.12.0 </br>.NET 1.12.0 </br>JS 3.2.0 | 0.14.0 | Supported (current) | [v1.12.4 release notes](https://github.com/dapr/dapr/releases/tag/v1.12.4) |
| January 2nd 2024 | 1.12.3</br> | 1.12.0 | Java 1.10.0 </br>Go 1.9.1 </br>PHP 1.2.0 </br>Python 1.12.0 </br>.NET 1.12.0 </br>JS 3.2.0 | 0.14.0 | Supported (current) | [v1.12.3 release notes](https://github.com/dapr/dapr/releases/tag/v1.12.3) |
Expand Down Expand Up @@ -133,7 +135,7 @@ General guidance on upgrading can be found for [self hosted mode]({{< ref self-h
| 1.10.0 | N/A | 1.10.8 |
| 1.11.0 | N/A | 1.11.4 |
| 1.12.0 | N/A | 1.12.4 |
| 1.13.0 | N/A | 1.13.0 |
| 1.13.0 | N/A | 1.13.2 |

## Upgrade on Hosting platforms

Expand Down
Binary file added daprdocs/static/images/diagrid-conductor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 70781fb

Please sign in to comment.