Merge remote-tracking branch 'upstream/master' into update_maintainer…

…_rules Signed-off-by: Artur Souza <[email protected]>
dapr · Jun 27, 2024 · f1bca32 · f1bca32
2 parents 4ef888e + 5251655
commit f1bca32
Show file tree

Hide file tree

Showing 14 changed files with 204 additions and 76 deletions.
diff --git a/.github/ISSUE_TEMPLATE/community-call-agenda.md b/.github/ISSUE_TEMPLATE/community-call-agenda.md
@@ -1,16 +1,16 @@
 ---
-name: Community Call Meeting Agenda Issue
+name: Community Call Agenda Issue
 about: Create a new community call agenda
-title: '<date>, Community Meeting Agenda'
+title: '<date>, Community Call Agenda'
 assignees: ''
-
+label: 'community call'
 ---
 
-## 📞 Dapr Community Meeting
+## 📞 Dapr Community Call Live Stream
 
-Every two weeks we host a [community meeting](../#community-meetings) to highlight community created content, showcase new features, review upcoming milestones, and engage in Q&A with the Dapr community - all are welcome, and we encourage participation.
+Every two weeks we live-stream a [community call](../#community-meetings) to highlight community created content, showcase new features, review upcoming milestones, and engage in Q&A with the Dapr community - everyone is welcome, and we encourage you to attend or give a session!
 
-The purpose of this thread is to form a discussion amongst the Dapr community on potential topics to highlight during the meeting. If you have a topic you wish to present or learn more about, please comment and be sure to include your name and a short description of the topic.
+The purpose of this issue is to form a discussion amongst the Dapr community on potential topics to highlight during the meeting. If you have a topic you wish to present or learn more about, please comment and be sure to include your name and a short description of the topic.
 
 <!--
 !!!REMINDER!!!
@@ -21,7 +21,7 @@ The purpose of this thread is to form a discussion amongst the Dapr community on
 
 The conversations in this thread will directly influence the meeting agenda for the community call on <Date>, at 9 AM PST ([See it in your local time](https://www.timeanddate.com/worldclock/fixedtime.html?iso=YYYYMMDDT09&p1=234&msg=Dapr+Community+Call)). The meeting agenda is finalized by a Community Call Host prior to the meeting.
 
-See you at the community call! 👋
+**We'll be live-streaming to [YouTube](https://www.youtube.com/@DaprDev/streams). See you at the community call! 👋**
 
 ## Agenda
 
@@ -63,7 +63,6 @@ See you at the community call! 👋
 
 ### After the meeting
 
-- [ ] Upload the meeting to YouTube
 - [ ] Add chapters to the video
 - [ ] Add links to the video description
   - [ ] Read-only link to slides

diff --git a/.github/holopin.yml b/.github/holopin.yml
@@ -1,6 +1,7 @@
 organization: dapr
-defaultSticker: clmjkxscc122740fl0mkmb7egi
+defaultSticker: clt3emu6c189400fjtk3prlisi
 stickers:
-  -
-    id: clmjkxscc122740fl0mkmb7egi
-    alias: ghc2023
+  - id: clt3emu6c189400fjtk3prlisi
+    alias: writer-badge
+  - id: clt3egohs11570gjnanpizv28
+    alias: presenter-badge
diff --git a/ADMINISTRATORS.md b/ADMINISTRATORS.md
@@ -39,14 +39,14 @@ An administrator might perform the following duties without requiring approval f
 
 ## Limits and Expiration
 
-The administrator role expires 6 months from the date it was approved. The process for renewal is the same as to become an administrator in the first place.
+The administrator role expires 2 years from the date it was approved. The process for renewal is the same as to become an administrator in the first place.
 
 To minimize the number of people with access to shared credentials, there can only be 3 active or suspended administrators. Adding one more requires the STC to remove another.
 
 ## Removal
 
 The administrator role is permanently removed in case any of the following:
-* Expiration of the 6 months term as administrator
+* Expiration of the term as administrator
 * Administrator is no longer a maintainer in Dapr
 * STC votes with simple majority to remove administrator
 * Administrator joins as an STC member

diff --git a/COMMUNITY-MANAGER.md b/COMMUNITY-MANAGER.md
@@ -19,7 +19,8 @@ A community manager has the following responsibilities:
    * Help new Discord users find the right channels & answers.
    * Announce new Dapr releases and events.
 * Review issues & pull requests in the community repository.
-* Review and publish Dapr blog posts submitted by the community.
+* Review and publish [Dapr blog posts](https://github.com/dapr/blog) submitted by the community.
+* Review community contributions to [presentations](presentations/README.md) and [blog posts](blogposts/README.md) and award contributors with digital badges.
 * Report on community health, growth trends, and top issues to maintainers and STC.
 * Propose new partnerships with other adjacent communities to STC and manage them.
 * Manage community analytics tools, including Google Analytics, CommonRoom.io and Scarf.sh.
@@ -60,7 +61,7 @@ The following community managers have been approved by the STC:
 | - | - | -  | - | - | - | - | -
 | Annu Singh | [@AnnuCode](https://github.com/annucode) | annusingh | Nirmata | Active | UTC+5.30/IST | Jan 1st, 2024 | Jan 1st, 2025
 | Cecil Phillip | [@cecilphillip](https://github.com/cecilphillip) | cecilphillip | Stripe | Active | UTC-5/EST | Jan 1st, 2024 | Jan 1st, 2025
-| Marc Duiker | [@marcduiker](https://github.com/marcduiker) | marcduiker | Diagrid | Active | UTC+1/CET | Feb 15th, 2023 | Feb 15th, 2024
+| Marc Duiker | [@marcduiker](https://github.com/marcduiker) | marcduiker | Diagrid | Active | UTC+1/CET | Apr 18th, 2024 | Apr 18th, 2025
 | Nyemade Uversky  | [@nyemade-uversky](https://github.com/nyemade-uversky) | nuversky#2099 | Microsoft | Inactive | UTC-8/PST | Feb 15th, 2023 | Feb 15th, 2024
 
 ### Statuses

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -3,21 +3,23 @@
 This is the list of maintainers for all Dapr repositories, in alphabetical order:
 
 - Alessandro Segala (Microsoft) [@ItalyPaleAle](https://github.com/ItalyPaleAle)
-- Amulya Varote (Microsoft) [@amulyavarote](https://github.com/amulyavarote)
 - Annu Singh (Nirmata) [@annucode](https://github.com/annucode) (non voting)
 - Artur Souza (Diagrid) [@artursouza](https://github.com/artursouza)
 - Bernd Verst (Microsoft) [@berndverst](https://github.com/berndverst)
-- Cecil Phillip (Stripe) [cecilphillip](https://github.com/cecilphillip) (non voting)
+- Cecil Phillip (Stripe) [@cecilphillip](https://github.com/cecilphillip) (non voting)
+- Deepanshu Agarwal (Microsoft) [@DeepanshuA](https://github.com/DeepanshuA)
 - Hannah Hunter (Microsoft) [@hhunter-ms](https://github.com/hhunter-ms)
 - Hal Spang (Microsoft) [@halspang](https://github.com/halspang)
+- Josh van Leeuwen (Diagrid) [@JoshVanL](https://github.com/JoshVanL)
 - Long Dai (Intel) [@daixiang0](https://github.com/daixiang0)
 - Marc Duiker (Diagrid) [@marcduiker](https://github.com/marcduiker) (non voting)
 - Mark Fussell (Diagrid) [@msfussell](https://github.com/msfussell)
+- Mike Nguyen (Independent) [@mikeee](https://github.com/mikeee)
 - Mukundan Sundararajan (Microsoft) [@mukundansundar](https://github.com/mukundansundar)
 - Nick Greenfield (Microsoft) [@greenie-msft](https://github.com/greenie-msft)
 - Paul Yuknewicz (Microsoft) [@paulyuk](https://github.com/paulyuk)
+- Phillip Hoff (Microsoft) [@philliphoff](https://github.com/philliphoff)
 - Rob Landers (Automattic) [@withinboredom](https://github.com/withinboredom)
-- Ryan Nowak (Microsoft) [@rynowak](https://github.com/rynowak)
 - Shubham Sharma (Microsoft) [@shubham1172](https://github.com/shubham1172)
 - Xavier Geernick (Proximus) [@XavierGeerinck](https://github.com/XavierGeerinck)
 - Yaron Schneider (Diagrid) [@yaron2](https://github.com/yaron2)
diff --git a/README.md b/README.md
@@ -1,12 +1,25 @@
 # Dapr Community
 
+[![License: Apache 2.0][apache-badge]][apache-url] [![Good First Issues][gfi-badge]][gfi-url] [![discord][discord-badge]][discord-url] [![YouTube][youtube-badge]][youtube-link] [![X/Twitter][x-badge]][x-link]
+
+[apache-badge]: https://img.shields.io/github/license/dapr/dapr?style=flat&label=License&logo=github
+[apache-url]: https://github.com/dapr/dapr/blob/master/LICENSE
+[gfi-badge]:https://img.shields.io/github/issues-search/dapr/community?query=type%3Aissue%20is%3Aopen%20label%3A%22good%20first%20issue%22&label=Good%20first%20issues&style=flat&logo=github
+[gfi-url]:https://github.com/dapr/community/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22
+[discord-badge]: https://img.shields.io/discord/778680217417809931?label=Discord&style=flat&logo=discord
+[discord-url]: http://bit.ly/dapr-discord
+[youtube-badge]:https://img.shields.io/youtube/channel/views/UCtpSQ9BLB_3EXdWAUQYwnRA?style=flat&label=YouTube%20views&logo=youtube
+[youtube-link]:https://youtube.com/@daprdev
+[x-badge]:https://img.shields.io/twitter/follow/daprdev?logo=x&style=flat
+[x-link]:https://twitter.com/daprdev
+
 Welcome to the Dapr community. This is the starting point for becoming a contributor, improving the code and docs, giving presentations and all the goodness of helping out on the project. We are a friendly, collaborative group and look forward to working together.
 
 - [Introduction](#introduction)
 - [Dapr authors](#dapr-authors)
 - [Questions and issues](#questions-and-issues)
 - [Communication and Discord](#communication-and-discord)
-- [Community meetings](#community-meetings)
+- [Community calls](#community-calls)
 - [Upcoming dates](#upcoming-dates)
 - [Dapr Blog](#dapr-blog)
 - [Roles](#roles)
@@ -24,54 +37,29 @@ Visit [dapr.io](https://dapr.io) for information about Dapr.
 Dapr is an open source project with an active development community.
 
 ## Communication and Discord
-We would greatly appreciate your contributions and suggestions! One of the easiest ways to contribute is to participate in Discord discussions, chat on Discord IM or join the bi-monthly community calls.
+We would greatly appreciate your contributions and suggestions! One of the easiest ways to contribute is to participate in Discord discussions, or join the bi-monthly [community calls](#community-calls).
 
 ### Questions and issues
 Reach out with any questions you may have and we'll make sure to answer them as soon as possible and as a community member feel free to jump in and answer questions.
 
 | Platform  | Link        |
 |:----------|:------------|
-| 💬 Discord (preferred) | [![Discord widget](https://discord.com/api/guilds/778680217417809931/widget.png?style=banner2)](https://aka.ms/dapr-discord)<br />https://aka.ms/dapr-discord
+| 💬 Discord (preferred) | [![Discord widget](https://discord.com/api/guilds/778680217417809931/widget.png?style=banner2)](http://bit.ly/dapr-discord)<br />http://bit.ly/dapr-discord
 | 🐤 Twitter | [@daprdev](https://twitter.com/daprdev)
 
-### Community meetings
-Every two weeks we host a community meeting to showcase new features, review upcoming milestones, and engage in a Q&A. For community calls, anyone from the Dapr community can participate, present a topic, or host. All are welcome! 
-
-<!--To present a specific topic on the next Dapr community call start by filling out this short form, [Dapr community call presenter sign-up form](https://forms.gle/Aa9L8iK32J4MBkxj7).  
--->
+### Community calls
 
-Issues in the community repo are used to suggest topics for a Dapr community. The next three upcoming community meetings are pinned as issues in this repository and can be used to enter in suggestions for the meeting. To speak about a Dapr related topic on a community call just enter your topic to the agenda issue marked for the date you would like to present on. Alternatively, you're also welcomed to use the the Discord Community Call Chat channel to talk about future agenda topics. The meeting agenda for each call is finalized by the community call host.
+> You can watch our community calls live on our [YouTube stream](https://www.youtube.com/@DaprDev/streams) or rewatch the recording later on the [Dapr YouTube channel](https://www.youtube.com/@daprdev).
 
-Community members (members of the Dapr GitHub org) can nominate themselves via an issue on the dapr/community repository to be a community call host. Members become approved community call hosts when two or more existing community hosts approve their request, similar to how members and approvers get accepted today.
+Every two weeks we live stream a community call on [YouTube](https://www.youtube.com/@daprdev) to showcase new features, highlight client case studies, review upcoming milestones, and engage in a Q&A. For these community calls, anyone from the Dapr community can participate, present a topic, or host. All are welcome!
 
-You can always catch up offline by watching the recordings on the Dapr YouTube channel.
+[Issues in this community repo](https://github.com/dapr/community/issues) are used to plan the community calls and suggest topics. The next three upcoming calls are pinned as issues in this repository and can be used to submit suggestions for the call. To speak about a Dapr related topic on a community call, comment on the issue for the date you would like to present on. Alternatively, you're also welcome to use the #general channel in the [Dapr Discord server](https://bit.ly/dapr-discord) to talk about future agenda topics. The meeting agenda for each call is finalized by the community call host.
 
-<!--
-!!!REMINDER!!!
-Do not add passcode to the Zoom URL. 
--->
-| Asset | Link        |
-|:-----------|:------------|
-| 🔗 Meeting Link & Password | **Zoom Call:** https://zoom.us/j/92337656846<br>**Passcode:** 815623 
-| 🎥 Meeting Recordings | http://aka.ms/dapr-recordings
-
-#### Upcoming dates
-
-Use the upcoming calendar events below to add the community call events to your calendar.
-
-<!--
-!!!REMINDER!!!
+Community members (members of the Dapr GitHub org) can nominate themselves via an issue on the dapr/community repository to be a community call host. Members become approved community call hosts when two or more existing community hosts approve their request, similar to how members and approvers get accepted today.
 
-When adding new scheduled meetings to this list:
-* make sure to update the URL for each entry too. The `iso` param should be updated following the `YYYYMMDD` format.
-* make sure the suffix is correct for the numeral: `st`, `nd`, `th` so it reads right like `22nd` and not `22th`
--->
+#### Upcoming community call dates
 
-| Date & time | Agenda
-| - | -
-| Wednesday January 10<sup>th</sup> 9:00am Pacific Time (PST) - [See it in your local time and add to your calendar](https://www.timeanddate.com/worldclock/fixedtime.html?iso=20240110T09&p1=234&msg=Dapr+Community+Call) | dapr/community#375
-| Wednesday January 24<sup>th</sup> 9:00am Pacific Time (PST) - [See it in your local time and add to your calendar](https://www.timeanddate.com/worldclock/fixedtime.html?iso=20240124T09&p1=234&msg=Dapr+Community+Call) | dapr/community#376
-| Wednesday February 7<sup>th</sup> 9:00am Pacific Time (PST) - [See it in your local time and add to your calendar](https://www.timeanddate.com/worldclock/fixedtime.html?iso=20240207T09&p1=234&msg=Dapr+Community+Call) | dapr/community#377
+Use this [issue query](https://github.com/dapr/community/issues?q=is%3Aissue+is%3Aopen+label%3A%22community+call%22) to check the date and agenda for the upcoming community calls.
 
 #### China Community Meetings
 
@@ -91,7 +79,7 @@ We are using a different link from Community Call because the Community Call req
 **Zoom Call:** https://zoom.us/j/91940016938<br> <!-- Do not add password to the Zoom URL. -->
 **Meeting ID:** 919 4001 6938<br>
 **Passcode:** 152697<br> 
-**Schedule:** Tuesdays at 7:30am Pacific Time.
+**Schedule:** Tuesdays at 9:00am US/Pacific Time (PT).
 
 Visit [here](https://github.com/dapr/community/blob/master/release-process.md) to learn more about the Dapr release process.
 
@@ -124,21 +112,35 @@ The [Dapr blog](https://blog.dapr.io/posts) has regular posts on releases, techn
 
 There are a several different roles that are available in the community.
 
-### Community membership
-There are various contributor roles in the Dapr community that you are strongly encouraged to be part of. Read [Community membership](community-membership.md)
-for more information.
+### Community membership roles
+
+Everyone is welcome to contribute to Dapr. Contribution can take many forms, it could be contributing source code to the many repositories, updating documentation, writing blog posts, or helping the community by answering questions on Discord or other social channels.
+
+These are the various contributor roles that are available in the Dapr community:
+
+- Contributor
+- Member
+- Approver
+- Maintainer
+- Administrator
+
+These roles are described in detail in [Community membership](community-membership.md).
+
+### Special roles
+
+Outside of the regular contributor roles, there are a few special roles that are available in the Dapr project.
+
+#### Release team
 
-### Release team
 At the start of a milestone a release team is chosen. The release team has the responsibility of enforcing processes to ensure the release is successfully delivered.  Read about the [Release process](https://github.com/dapr/community/blob/master/release-process.md#release-team)
 for more information.
 
-### Steering committee member
+#### Steering committee member
+
 The Dapr project has a single governance body called the Steering and Technical Committee (STC). The STC is responsible for the health of the Dapr community and for overall technical oversight. Read [Steering and Technical Committee (STC)](steering-and-technical-committee-charter.md)for more information.
 
-### Administrator Role
-Administrators have access to credentials equivalent to members of the steering and technical commitee (STC) and are responsible to perform pre-approved routine maintenance duties and ad-hoc tasks delegated by the STC without making isolated decisions. Read [Administrator Role](ADMINISTRATORS.md) for more information.
+#### Community manager
 
-### Community Manager Role
 Community managers are responsible for managing many aspects of the Dapr community. The role is to engage and promote the Dapr community and have someone that the community can reach out to for guidance. Read [Community Manager](COMMUNITY-MANAGER.md) for more information.
 
 ## How can I get involved?
@@ -154,8 +156,6 @@ If you're looking for something to work on, read the [contribution guidelines](h
 
 And, we can always use more testing, have more and improved docs, or just write a blog post on what you have discovered whilst using Dapr.
 
-If you're a developer, read the [development guide](https://github.com/dapr/dapr/tree/master/docs/development) for help on how to get started.
-
 Finally consider achieving one of the many [roles](#roles) that are in the Dapr project.
 
 ## Other Documents