diff options
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/app.go | 4 | ||||
| -rw-r--r-- | generator/committee_readme.tmpl | 60 | ||||
| -rw-r--r-- | generator/sig_readme.tmpl | 53 | ||||
| -rw-r--r-- | generator/ug_readme.tmpl | 28 | ||||
| -rw-r--r-- | generator/wg_readme.tmpl | 56 |
5 files changed, 91 insertions, 110 deletions
diff --git a/generator/app.go b/generator/app.go index 371add2a..a5f05b1f 100644 --- a/generator/app.go +++ b/generator/app.go @@ -468,9 +468,9 @@ func main() { errs := ctx.Validate() if len(errs) != 0 { for _, err := range errs { - fmt.Printf("NOTICE: %s\n", err.Error()) + fmt.Printf("ERROR: %s\n", err.Error()) } - fmt.Println("NOTICE: validation errors are ignored at present") + os.Exit(1) } // Write the Context struct back to yaml to enforce formatting diff --git a/generator/committee_readme.tmpl b/generator/committee_readme.tmpl index d84bd2b5..68b5b893 100644 --- a/generator/committee_readme.tmpl +++ b/generator/committee_readme.tmpl @@ -32,55 +32,67 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name} ## Contact {{- if .Contact.Slack }} -* [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.PrivateMailingList }} -* Private Mailing List: {{.Contact.PrivateMailingList}} +- Private Mailing List: {{.Contact.PrivateMailingList}} {{- end }} {{- if .Label }} -* [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/ug%2F{{.Label}}) +- [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/committee%2F{{.Label}}) {{- end }} +{{- if .Contact.GithubTeams }} +- GitHub Teams: +{{- range .Contact.GithubTeams }} + - [@kubernetes/{{.Name}}](https://github.com/orgs/kubernetes/teams/{{.Name}}) {{- if .Description }} - {{.Description}} {{- end}} +{{- end }} +{{- end }} + {{- if .Subprojects }} ## Subprojects -The following subprojects are owned by the {{.Name}} Committee: +The following [subprojects][subproject-definition] are owned by the {{.Name}} Committee: {{- range .Subprojects }} -- **{{.Name}}** +### {{.Name}} {{- if .Description }} - - Description: {{ trimSpace .Description }} +{{ trimSpace .Description }} {{- end }} - - Owners: +- **Owners:** {{- 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: +- **Meetings:** {{- range .Meetings }} - - {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}). + - {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}). {{- if .ArchiveURL }} - - [Meeting notes and Agenda]({{.ArchiveURL}}). + - [Meeting notes and Agenda]({{.ArchiveURL}}). {{- end }} {{- if .RecordingsURL }} - - [Meeting recordings]({{.RecordingsURL}}). + - [Meeting recordings]({{.RecordingsURL}}). {{- end }} {{- end }} {{- end }} {{- end }} {{- end }} -{{ if .Contact.GithubTeams }} -## GitHub Teams -The below teams can be mentioned on issues and PRs in order to get attention from the right people. -Note that the links to display team membership will only work if you are a member of the org. - -| Team Name | Details | Description | -| --------- |:-------:| ----------- | -{{- range .Contact.GithubTeams }} -| @kubernetes/{{.Name}} | [link](https://github.com/orgs/kubernetes/teams/{{.Name}}) | {{.Description}} | -{{- end }} -{{ end }} +[subproject-definition]: https://github.com/kubernetes/community/blob/master/governance.md#subprojects diff --git a/generator/sig_readme.tmpl b/generator/sig_readme.tmpl index 734c1512..12ad5bb4 100644 --- a/generator/sig_readme.tmpl +++ b/generator/sig_readme.tmpl @@ -48,64 +48,61 @@ subprojects, and resolve cross-subproject technical issues and decisions. {{- end }} ## Contact -* [Slack](https://kubernetes.slack.com/messages/{{.Contact.Slack}}) -* [Mailing list]({{.Contact.MailingList}}) +- Slack: [#{{.Contact.Slack}}](https://kubernetes.slack.com/messages/{{.Contact.Slack}}) +- [Mailing list]({{.Contact.MailingList}}) {{- if .Label }} -* [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/sig%2F{{.Label}}) +- [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/sig%2F{{.Label}}) {{- end }} +{{- if .Contact.GithubTeams }} +- GitHub Teams: +{{- range .Contact.GithubTeams }} + - [@kubernetes/{{.Name}}](https://github.com/orgs/kubernetes/teams/{{.Name}}) {{- if .Description }} - {{.Description}} {{- end}} +{{- end }} +{{- end }} + {{- if .Subprojects }} ## Subprojects -The following subprojects are owned by sig-{{.Label}}: +The following [subprojects][subproject-definition] are owned by sig-{{.Label}}: {{- range .Subprojects }} -- **{{.Name}}** +### {{.Name}} {{- if .Description }} - - Description: {{ trimSpace .Description }} +{{ trimSpace .Description }} {{- end }} - - Owners: +- **Owners:** {{- range .Owners }} - - {{.}} + - {{.}} {{- end }} {{- if .Contact }} - - 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 }} - - Meetings: +- **Meetings:** {{- range .Meetings }} - - {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}). + - {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}). {{- if .ArchiveURL }} - - [Meeting notes and Agenda]({{.ArchiveURL}}). + - [Meeting notes and Agenda]({{.ArchiveURL}}). {{- end }} {{- if .RecordingsURL }} - - [Meeting recordings]({{.RecordingsURL}}). + - [Meeting recordings]({{.RecordingsURL}}). {{- end }} {{- end }} {{- end }} {{- end }} {{- end }} -{{ if .Contact.GithubTeams }} -## GitHub Teams - -The below teams can be mentioned on issues and PRs in order to get attention from the right people. -Note that the links to display team membership will only work if you are a member of the org. -| Team Name | Details | Description | -| --------- |:-------:| ----------- | -{{- range .Contact.GithubTeams }} -| @kubernetes/{{.Name}} | [link](https://github.com/orgs/kubernetes/teams/{{.Name}}) | {{.Description}} | -{{- end }} -{{ end }} +[subproject-definition]: https://github.com/kubernetes/community/blob/master/governance.md#subprojects diff --git a/generator/ug_readme.tmpl b/generator/ug_readme.tmpl index e665f0e8..4062128e 100644 --- a/generator/ug_readme.tmpl +++ b/generator/ug_readme.tmpl @@ -26,24 +26,24 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name} * {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**){{if .Company}}, {{.Company}}{{end}} {{- end }} {{- end }} +{{- if .Leadership.EmeritusLeads }} + +## Emeritus Organizers +{{ range .Leadership.EmeritusLeads }} +* {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**){{if .Company}}, {{.Company}}{{end}} +{{- end }} +{{- end }} {{- end }} ## Contact -* [Slack](https://kubernetes.slack.com/messages/{{.Contact.Slack}}) -* [Mailing list]({{.Contact.MailingList}}) +- Slack: [#{{.Contact.Slack}}](https://kubernetes.slack.com/messages/{{.Contact.Slack}}) +- [Mailing list]({{.Contact.MailingList}}) {{- if .Label }} -* [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/ug%2F{{.Label}}) +- [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/ug%2F{{.Label}}) {{- end }} - -{{ if .Contact.GithubTeams }} -## GitHub Teams - -The below teams can be mentioned on issues and PRs in order to get attention from the right people. -Note that the links to display team membership will only work if you are a member of the org. - -| Team Name | Details | Description | -| --------- |:-------:| ----------- | +{{- if .Contact.GithubTeams }} +- GitHub Teams: {{- range .Contact.GithubTeams }} -| @kubernetes/{{.Name}} | [link](https://github.com/orgs/kubernetes/teams/{{.Name}}) | {{.Description}} | + - [@kubernetes/{{.Name}}](https://github.com/orgs/kubernetes/teams/{{.Name}}) {{- if .Description }} - {{.Description}} {{- end}} +{{- end }} {{- end }} -{{ end }} diff --git a/generator/wg_readme.tmpl b/generator/wg_readme.tmpl index ed3bb99f..0fc7ff47 100644 --- a/generator/wg_readme.tmpl +++ b/generator/wg_readme.tmpl @@ -32,52 +32,24 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name} * {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**){{if .Company}}, {{.Company}}{{end}} {{- end }} {{- end }} -{{- end }} - -## Contact -* [Slack](https://kubernetes.slack.com/messages/{{.Contact.Slack}}) -* [Mailing list]({{.Contact.MailingList}}) -{{- if .Label }} -* [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/wg%2F{{.Label}}) -{{- end }} -{{- if .Subprojects }} - -## Subprojects +{{- if .Leadership.EmeritusLeads }} -The following subprojects are owned by wg-{{.Label}}: - -{{- range .Subprojects }} -- **{{.Name}}** -{{- if .Description }} - - Description: {{ .Description }} -{{- end }} - - Owners: -{{- range .Owners }} - - {{.}} -{{- end }} -{{- if .Meetings }} - - Meetings: -{{- range .Meetings }} - - {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}}]({{.URL}}) ({{.Frequency}}). [Convert to your timezone](http://www.thetimezoneconverter.com/?t={{.Time}}&tz={{.TZ | tzUrlEncode}}). -{{- if .ArchiveURL }} - - [Meeting notes and Agenda]({{.ArchiveURL}}). -{{- end }} -{{- if .RecordingsURL }} - - [Meeting recordings]({{.RecordingsURL}}). -{{- end }} -{{- end }} +## Emeritus Organizers +{{ range .Leadership.EmeritusLeads }} +* {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**){{if .Company}}, {{.Company}}{{end}} {{- end }} {{- end }} {{- end }} -{{ if .Contact.GithubTeams }} -## GitHub Teams -The below teams can be mentioned on issues and PRs in order to get attention from the right people. -Note that the links to display team membership will only work if you are a member of the org. - -| Team Name | Details | Description | -| --------- |:-------:| ----------- | +## Contact +- Slack: [#{{.Contact.Slack}}](https://kubernetes.slack.com/messages/{{.Contact.Slack}}) +- [Mailing list]({{.Contact.MailingList}}) +{{- if .Label }} +- [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/wg%2F{{.Label}}) +{{- end }} +{{- if .Contact.GithubTeams }} +- GitHub Teams: {{- range .Contact.GithubTeams }} -| @kubernetes/{{.Name}} | [link](https://github.com/orgs/kubernetes/teams/{{.Name}}) | {{.Description}} | + - [@kubernetes/{{.Name}}](https://github.com/orgs/kubernetes/teams/{{.Name}}) {{- if .Description }} - {{.Description}} {{- end}} +{{- end }} {{- end }} -{{ end }} |