10 files changed, 191 insertions, 154 deletions
diff --git a/.github/ISSUE_TEMPLATE/general-issue.yml b/.github/ISSUE_TEMPLATE/general-issue.yml
new file mode 100644
index 00000000..21195d7c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/general-issue.yml
@@ -0,0 +1,10 @@
+name: General Issue
+description: Open a general issue in the kubernetes/community repo
+body:
+- id: problem
+  type: textarea
+  attributes:
+    label: Describe the issue
+    placeholder: A clear and concise description of what you need assistance with.
+  validations:
+    required: true
diff --git a/.github/ISSUE_TEMPLATE/general-support.md b/.github/ISSUE_TEMPLATE/general-support.md
deleted file mode 100644
index f7d517db..00000000
--- a/.github/ISSUE_TEMPLATE/general-support.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: General Issue
-about: Open a general issue in the kubernetes/community repo
-title: ''
-labels: ''
-assignees: ''
-
----
diff --git a/.github/ISSUE_TEMPLATE/marketing-request.md b/.github/ISSUE_TEMPLATE/marketing-request.md
deleted file mode 100644
index 06699745..00000000
--- a/.github/ISSUE_TEMPLATE/marketing-request.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: Contributor Comms Request
-about: Get support on sending a message out to our community through coordinated outreach on email, Slack, social media, and other public channels.
-title: 'REQUEST: New communication about <topic>'
-labels: area/contributor-comms, sig/contributor-experience
-assignees: 
----
-
-**What do you want send out?** (Please include a link to a draft)
-<!-- Gists, Hackmd.io, or Google Doc preferred. Include any artwork, pics, diagrams, or any other assets with public links. 
-
-We use a combination of mailing lists, Slack messages, and Twitter to get the word out. (Click the links below for more details.) -->
-
-
-- [] I agree that if this is urgent, I will @contributor-comms in #sig-contribex Slack.
-<!-- The team looks at these at least once a week during its meeting, but we're happy to help when a message is urgent. -->
-
-
-<!-- Want to learn more about Contributor Comms? 
-
-We started the Upstream Marketing Team to focus on contributor-to-contributor communication throughout Kubernetes.
-
-Read about our charter here: https://github.com/kubernetes/community/blob/master/communication/marketing-team/CHARTER.md
-
-Or about the team: https://github.com/kubernetes/community/blob/master/communication/marketing-team
-
-And thanks for reaching out! We're here to help. -->
-\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/marketing-request.yml b/.github/ISSUE_TEMPLATE/marketing-request.yml
new file mode 100644
index 00000000..c1094946
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/marketing-request.yml
@@ -0,0 +1,11 @@
+name: Contributor Comms Request
+description: Get support on sending a message out to our community through coordinated outreach on email, Slack, social media, and other public channels.
+title: 'REQUEST: New communication about <topic>'
+labels: area/contributor-comms, sig/contributor-experience
+body:
+- type: textarea
+  attributes:
+    label: What do you want send out?(Please include a link to a draft)
+    description: Gists, Hackmd.io, or Google Doc preferred. Include any artwork, pics, diagrams, or any other assets with public links. We use a combination of mailing lists, Slack messages, and Twitter to get the word out.
+  validations:
+    required: true
+\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/moderator_application.md b/.github/ISSUE_TEMPLATE/moderator_application.md
deleted file mode 100644
index 831677fc..00000000
--- a/.github/ISSUE_TEMPLATE/moderator_application.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-name: Community Moderator Request
-about: Request moderator privileges on a Kubernetes property
-title: 'REQUEST: New moderator for <your-GH-handle> of <k8s property>'
-labels: area/community-management, sig/contributor-experience
-assignees: ''
-
----
-
-### GitHub Username
-e.g. (at)github_user
-
-### Property you'd like to Moderate
-e.g. discuss.k8s.io, kubernetes-dev
-
-### Username on Property Requested
-e.g. (at)property_user
-
-### Requirements
-
-- [ ] I am a Kubernetes Org member already
-- [ ] I have enabled 2FA on my account for the property I would like to moderate (if applicable).
-- [ ] I have read and will abide by the policies mentioned in the [Moderation Guidelines](https://git.k8s.io/community/communication/moderation.md)
-- [ ] I have two sponsors that meet the sponsor requirements listed in the moderator guidelines
-- [ ] I have spoken to my sponsors ahead of this application, and they have agreed to sponsor my application
-
-### Sponsors
-
-- (at)sponsor-1
-- (at)sponsor-2
-
-### List of qualifications for this position
-
-- Prior moderation experience
-- Links to public discussions showing your moderation experience (if available)
-- Any other qualifications
diff --git a/.github/ISSUE_TEMPLATE/moderator_application.yml b/.github/ISSUE_TEMPLATE/moderator_application.yml
new file mode 100644
index 00000000..e2f181e6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/moderator_application.yml
@@ -0,0 +1,65 @@
+name: Community Moderator Request
+description: Request moderator privileges on a Kubernetes property
+title: 'REQUEST: New moderator for <your-GH-handle> of <k8s property>'
+labels: area/community-management, sig/contributor-experience
+body:
+- id: github
+  type: input
+  attributes:
+    label: GitHub Username
+    placeholder: e.g. @example_user
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Property you'd like to Moderate
+    placeholder: e.g. discuss.k8s.io, kubernetes-dev
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Username on Property Requested
+    placeholder: e.g. (at)property_user
+  validations:
+    required: true
+- id: requirements
+  type: checkboxes
+  attributes:
+    label: Requirements
+    options:
+    - label: I am a Kubernetes Org member already
+      required: true
+    - label: I have [enabled 2FA on my GitHub account](https://github.com/settings/security)
+      required: true
+    - label: I have read and will abide by the policies mentioned in the [Moderation Guidelines](https://git.k8s.io/community/communication/moderation.md)
+      required: true
+    - label: I have two sponsors that meet the sponsor requirements listed in the moderator guidelines
+      required: true
+    - label: I have spoken to my sponsors ahead of this application, and they have agreed to sponsor my application
+      required: true
+- id: sponsor_1
+  type: input
+  attributes:
+    label: "Sponsor 1"
+    description: GitHub handle of your sponsor
+    placeholder: e.g. @sponsor-1
+  validations:
+    required: true
+- id: sponsor_2
+  type: input
+  attributes:
+    label: "Sponsor 2"
+    description: GitHub handle of your sponsor
+    placeholder: e.g. @sponsor-2
+  validations:
+    required: true
+- id: qualifications
+  type: textarea
+  attributes:
+    label: List of qualifications for this position
+    placeholder: |
+      - Prior moderation experience
+      - Links to public discussions showing your moderation experience (if available)
+      - Any other qualifications
+  validations:
+    required: true
+\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/slack-request.md b/.github/ISSUE_TEMPLATE/slack-request.md
deleted file mode 100644
index f0a7c168..00000000
--- a/.github/ISSUE_TEMPLATE/slack-request.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-name: Slack Request
-about: Request a Channel, User Group, Bot, Token, or Webhook
-title: 'REQUEST: New Slack <[channel|usergroup|bot|token|webhook]> <[channel|usergroup|bot|token|webhook] name>'
-labels: area/community-management, area/slack-management, sig/contributor-experience
-assignees: ''
----
-<!--
-ATTENTION: Channels and UserGroup requests can now be PR'ed directly speeding up the review process. 
-See the guidelines below for more information. 
-Channel Request: https://git.k8s.io/community/communication/slack-guidelines.md#Requesting-a-Channel
-UserGroup Request:  https://git.k8s.io/community/communication/slack-guidelines.md#Requesting-a-User-Group
-
-Bot/Token/Webhook Request: https://git.k8s.io/community/communication/slack-guidelines.md#Requesting-a-Bot-Token-or-Webhook
--->
-
-**GitHub Username:**
-<!--
-The github username of the Channel/Bot/Token/Webhook owner or primary contact.
---->
-
-
-**Slack Username:**
-<!--
-The Slack username of the Channel/Bot/Token/Webhook owner or primary contact.
---->
-
-
-**What Type of Request is it (Channel, User Group, Bot, Token, or Webhook)?**
-<!--
-ATTENTION: Channels and UserGroup requests can now be PR'ed directly speeding up the review process. 
-See the guidelines below for more information. 
-Channel Request: https://git.k8s.io/community/communication/slack-guidelines.md#Requesting-a-Channel
-User Group Request:  https://git.k8s.io/community/communication/slack-guidelines.md#Requesting-a-User-Group
--->
-
-
-**Name of Requested Resource:**
-
-
-**Description of Request:**
diff --git a/.github/ISSUE_TEMPLATE/slack-request.yml b/.github/ISSUE_TEMPLATE/slack-request.yml
new file mode 100644
index 00000000..b484b007
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/slack-request.yml
@@ -0,0 +1,36 @@
+name: Slack Request
+description: Request a Channel, User Group, Bot, Token, or Webhook
+title: 'REQUEST: New Slack <[channel|usergroup|bot|token|webhook]> <[channel|usergroup|bot|token|webhook] name>'
+labels: area/community-management, area/slack-management, sig/contributor-experience
+body:
+- id: github
+  type: input
+  attributes:
+    label: GitHub Username
+    description: The github username of the Channel/Bot/Token/Webhook owner or primary contact.
+    placeholder: e.g. @example_user
+  validations:
+    required: true
+- id: slack
+  type: input
+  attributes:
+    label: Slack Username
+    description: The slack username of the Channel/Bot/Token/Webhook owner or primary contact.
+    placeholder: e.g. @example_user
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: What Type of Request is it (Channel, User Group, Bot, Token, or Webhook)?
+  validations:
+    required: false
+- type: input
+  attributes:
+    label: Name of Requested Resource
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Description of Request
+  validations:
+    required: false
+\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/survey-request.md b/.github/ISSUE_TEMPLATE/survey-request.md
deleted file mode 100644
index 2f1df919..00000000
--- a/.github/ISSUE_TEMPLATE/survey-request.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-name: Community Survey Request
-about: Create and distribute a survey of the Kubernetes community, for the Kubernetes community
-title: 'SURVEY REQUEST: <topic>'
-labels: area/contributor-comms, sig/contributor-experience
-assignees:
----
-
-**Group Requesting:**
-<!-- The SIG, WG, team, subproject, or other Kubernetes community group wanting
-the survey to be conducted -->
-
-**Title of Survey:**
-
-**Goal of Survey:**
-<!-- what is the main thing you want this survey to determine?  Examples:
-"To research how end users are using this feature", "To decide when to host our
-SIG summit" -->
-
-**Target Audience:**
-<!-- who in the Kubernetes ecosystem should know about, and take, this survey? -->
-
-**Results Recipients:**
-<!-- list of individuals who are going to be able to see the raw data of the
-responses.  This needs to be a short list of individuals, not a team alias,
-for GDPR reasons. -->
-
-**Date Survey Starts:**
-
-**Date Survey Ends:**
-
-**Publicity Help Wanted?**  Y / N
-<!-- Do you need help from Contributor Communications in publicizing this
-survey?-->
-
-**Data Analysis Wanted?**  Y / N
-<!-- Do you want help creating charts or cross-checking data? Help is sometimes
-available. -->
-
-**Link to Draft Questions:**
-<!-- ideally, HackMD page, Google Doc, or some other format that supports comments
-so that we can help you improve your survey. -->
diff --git a/.github/ISSUE_TEMPLATE/survey-request.yml b/.github/ISSUE_TEMPLATE/survey-request.yml
new file mode 100644
index 00000000..f5540dbb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/survey-request.yml
@@ -0,0 +1,69 @@
+name: Community Survey Request
+description : Create and distribute a survey of the Kubernetes community, for the Kubernetes community
+title: 'SURVEY REQUEST: <topic>'
+labels: area/contributor-comms, sig/contributor-experience
+body:
+- type: input
+  attributes:
+    label: Group Requesting
+    description: The SIG, WG, team, subproject, or other Kubernetes community group wanting the survey to be conducted.
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Title of Survey
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Goal of Survey
+    description: what is the main thing you want this survey to determine?
+    placeholder: Examples- "To research how end users are using this feature", "To decide when to host our SIG summit" 
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Target Audience
+    description: who in the Kubernetes ecosystem should know about, and take, this survey?
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Results Recipients
+    description: list of individuals who are going to be able to see the raw data of the responses. This needs to be a short list of individuals, not a team alias, for GDPR reasons.
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Date Survey Starts
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Date Survey Ends
+  validations:
+    required: true
+- type: dropdown
+  attributes:
+    label: Publicity Help Wanted?
+    description: Do you need help from Contributor Communications in publicizing this survey?
+    options:
+        - "Yes"
+        - "No"
+  validations:
+    required: true
+- type: dropdown
+  attributes:
+    label: Data Analysis Wanted?
+    description: Do you want help creating charts or cross-checking data? Help is sometimes available.
+    options:
+        - "Yes"
+        - "No"
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Link to Draft Questions
+    description: Ideally, HackMD page, Google Doc, or some other format that supports comments so that we can help you improve your survey.
+  validations:
+    required: true