Merge pull request #3483 from spiffxp/add-subproject-contacts

Add contact (slack, mailing_list, teams) to subprojects

5 files changed, 36 insertions, 0 deletions

diff --git a/generator/app.go b/generator/app.go
index be33247f..295077b3 100644
--- a/generator/app.go
+++ b/generator/app.go
@@ -89,6 +89,7 @@ type GithubTeams struct {
 type Subproject struct {
 	Name        string
 	Description string
+	Contact     *Contact
 	Owners      []string
 	Meetings    []Meeting
 }
diff --git a/generator/sig_readme.tmpl b/generator/sig_readme.tmpl
index 0d4d347f..734c1512 100644
--- a/generator/sig_readme.tmpl
+++ b/generator/sig_readme.tmpl
@@ -68,6 +68,21 @@ The following subprojects are owned by sig-{{.Label}}:
 {{- range .Owners }}
     - {{.}}
 {{- end }}
+{{- if .Contact }}
+  - Contact
+{{- if .Contact.Slack }}
+    - Slack: [#{{.Contact.Slack}}](https://kubernetes.slack.com/messages/{{.Contact.Slack}})
+{{- end }}
+{{- if .Contact.MailingList }}
+    - [Mailing List]({{.Contact.MailingList}})
+{{- end }}
+{{- if .Contact.GithubTeams }}
+    - GitHub Teams: 
+{{- range .Contact.GithubTeams }}
+      - [@kubernetes/{{.Name}}](https://github.com/orgs/kubernetes/teams/{{.Name}}) {{- if .Description }}({{.Description}}){{- end}}
+{{- end }}
+{{- end }}
+{{- end }}
 {{- if .Meetings }}
   - Meetings:
 {{- range .Meetings }}
diff --git a/sig-architecture/README.md b/sig-architecture/README.md
index 1c2d4537..d79b0a0d 100644
--- a/sig-architecture/README.md
+++ b/sig-architecture/README.md
@@ -48,6 +48,10 @@ The following subprojects are owned by sig-architecture:
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/test/conformance/testdata/OWNERS
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/test/conformance/OWNERS
+  - Contact
+    - Slack: [#k8s-conformance](https://kubernetes.slack.com/messages/k8s-conformance)
+    - GitHub Teams:
+      - [@kubernetes/cncf-conformance-wg](https://github.com/orgs/kubernetes/teams/cncf-conformance-wg)
 - **code-organization**
   - Description: [Described below](#code-organization)
   - Owners:
diff --git a/sig-testing/README.md b/sig-testing/README.md
index a932d388..17aa031d 100644
--- a/sig-testing/README.md
+++ b/sig-testing/README.md
@@ -49,6 +49,8 @@ The following subprojects are owned by sig-testing:
   - Description: Kubernetes IN Docker. Run Kubernetes test clusters on your local machine using Docker containers as nodes.
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-sigs/kind/master/OWNERS
+  - Contact
+    - Slack: [#kind](https://kubernetes.slack.com/messages/kind)
   - Meetings:
     - sigs.k8s.io/kind bi-weekly meeting: [Mondays at 11:00 PT (Pacific Time)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit) (bi-weekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=11:00&tz=PT%20%28Pacific%20Time%29).
       - [Meeting notes and Agenda](https://docs.google.com/document/d/1b9Ppm7ZT_tMWRs5Ph1zGJJKb5nF9c3ZHzMwg1olJIrc/edit).
@@ -57,11 +59,15 @@ The following subprojects are owned by sig-testing:
   - Description: Prow is a CI/CD system based on Kubernetes. See prow.k8s.io to see it in action for the Kubernetes project
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/test-infra/master/prow/OWNERS
+  - Contact
+    - Slack: [#prow](https://kubernetes.slack.com/messages/prow)
 - **testing-commons**
   - Description: The Testing Commons is a subproject within the Kubernetes sig-testing community interested code structure, layout, and execution of common test code used throughout the kubernetes project
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-sigs/testing_frameworks/master/OWNERS
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/test/OWNERS
+  - Contact
+    - Slack: [#testing-commons](https://kubernetes.slack.com/messages/testing-commons)
   - Meetings:
     - Testing Commons: [Fridays at 07:30 PT (Pacific Time)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit) (bi-weekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=07:30&tz=PT%20%28Pacific%20Time%29).
       - [Meeting notes and Agenda](https://docs.google.com/document/d/1TOC8vnmlkWw6HRNHoe5xSv5-qv7LelX6XK3UVCHuwb0/edit#heading=h.tnoevy5f439o).
diff --git a/sigs.yaml b/sigs.yaml
index 2055eef5..d75c15fb 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -264,6 +264,10 @@ sigs:
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/staging/src/k8s.io/api/OWNERS
     - name: conformance-definition
       description: "[Described below](#conformance-definition)"
+      contact:
+        slack: k8s-conformance
+        teams:
+          - name: cncf-conformance-wg
       owners:
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/test/conformance/testdata/OWNERS
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/test/conformance/OWNERS
@@ -2001,6 +2005,8 @@ sigs:
       description: >
         Kubernetes IN Docker. Run Kubernetes test clusters on your local
         machine using Docker containers as nodes.
+      contact:
+        slack: kind
       meetings:
       - description: sigs.k8s.io/kind bi-weekly meeting
         day: Monday
@@ -2016,6 +2022,8 @@ sigs:
       description: >
         Prow is a CI/CD system based on Kubernetes. See prow.k8s.io to see it
         in action for the Kubernetes project
+      contact:
+        slack: prow
       owners:
       - https://raw.githubusercontent.com/kubernetes/test-infra/master/prow/OWNERS
     - name: testing-commons
@@ -2023,6 +2031,8 @@ sigs:
         The Testing Commons is a subproject within the Kubernetes sig-testing community
         interested code structure, layout, and execution of common test code used
         throughout the kubernetes project
+      contact:
+        slack: testing-commons
       owners:
       - https://raw.githubusercontent.com/kubernetes-sigs/testing_frameworks/master/OWNERS
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/test/OWNERS