From 2e1518026be0bccfb2ecf5af2aa4b85317c293c3 Mon Sep 17 00:00:00 2001
From: Aaron Crickenberger <spiffxp@google.com>
Date: Wed, 20 Mar 2019 10:59:17 -0700
Subject: [PATCH] Make subproject contacts optional, nest in display

---
 generator/app.go           |  2 +-
 generator/sig_readme.tmpl  | 11 +++++++----
 sig-architecture/README.md |  7 ++++---
 sig-testing/README.md      |  9 ++++++---
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/generator/app.go b/generator/app.go
index 3756d1484..295077b3f 100644
--- a/generator/app.go
+++ b/generator/app.go
@@ -89,7 +89,7 @@ type GithubTeams struct {
 type Subproject struct {
 	Name        string
 	Description string
-	Contact     Contact
+	Contact     *Contact
 	Owners      []string
 	Meetings    []Meeting
 }
diff --git a/generator/sig_readme.tmpl b/generator/sig_readme.tmpl
index 6cc9ba7b6..734c1512c 100644
--- a/generator/sig_readme.tmpl
+++ b/generator/sig_readme.tmpl
@@ -68,16 +68,19 @@ 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}})
+    - Slack: [#{{.Contact.Slack}}](https://kubernetes.slack.com/messages/{{.Contact.Slack}})
 {{- end }}
 {{- if .Contact.MailingList }}
-  - [Mailing List]({{.Contact.MailingList}})
+    - [Mailing List]({{.Contact.MailingList}})
 {{- end }}
 {{- if .Contact.GithubTeams }}
-  - GitHub Teams: 
+    - GitHub Teams: 
 {{- range .Contact.GithubTeams }}
-    - [@kubernetes/{{.Name}}](https://github.com/orgs/kubernetes/teams/{{.Name}}) {{- if .Description }}({{.Description}}){{- end}}
+      - [@kubernetes/{{.Name}}](https://github.com/orgs/kubernetes/teams/{{.Name}}) {{- if .Description }}({{.Description}}){{- end}}
+{{- end }}
 {{- end }}
 {{- end }}
 {{- if .Meetings }}
diff --git a/sig-architecture/README.md b/sig-architecture/README.md
index ff33ad733..d79b0a0d2 100644
--- a/sig-architecture/README.md
+++ b/sig-architecture/README.md
@@ -48,9 +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
-  - 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)
+  - 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 cb209a312..86de75289 100644
--- a/sig-testing/README.md
+++ b/sig-testing/README.md
@@ -49,7 +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
-  - Slack: [#kind](https://kubernetes.slack.com/messages/kind)
+  - Contact
+    - Slack: [#kind](https://kubernetes.slack.com/messages/kind)
   - Meetings:
     - sigs.k8s.io/kind weekly meeting: [Mondays at 11:00 PT (Pacific Time)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit) (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).
@@ -58,13 +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
-  - Slack: [#prow](https://kubernetes.slack.com/messages/prow)
+  - 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
-  - Slack: [#testing-commons](https://kubernetes.slack.com/messages/testing-commons)
+  - 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).