From 347f7d07d35979b952d52b1c4b234f3761dab2eb Mon Sep 17 00:00:00 2001 From: Nikhita Raghunath Date: Fri, 15 Mar 2019 16:33:11 +0530 Subject: [PATCH 1/4] generator: add support for committees Since committees can have private mailing lists, this commit also adds a new field for specifying private mailing lists in the "Contacts" section. --- generator/README.md | 24 +++++++++++--- generator/aliases.tmpl | 6 ++++ generator/app.go | 17 ++++++++-- generator/committee_readme.tmpl | 57 +++++++++++++++++++++++++++++++++ generator/list.tmpl | 7 ++++ hack/verify-generated-docs.sh | 2 +- 6 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 generator/committee_readme.tmpl diff --git a/generator/README.md b/generator/README.md index 2c5ef157c..de68d18ee 100644 --- a/generator/README.md +++ b/generator/README.md @@ -1,7 +1,8 @@ # SIG Doc builder This folder contains scripts to automatically generate documentation about the -different Special Interest Groups (SIGs) and Working Groups (WGs) of Kubernetes. The authoritative +different Special Interest Groups (SIGs), Working Groups (WGs), +User Groups (UGs) and Committees of Kubernetes. The authoritative source for SIG information is the [`sigs.yaml`](/sigs.yaml) file in the project root. All updates must be done there. @@ -14,6 +15,7 @@ The documentation follows a template and uses the values from [`sigs.yaml`](/sig - SIG README: [`sig_readme.tmpl`](sig_readme.tmpl) - WG README: [`wg_readme.tmpl`](wg_readme.tmpl) - UG README: [`ug_readme.tmpl`](ug_readme.tmpl) +- Committee README: [`committee_readme.tmpl`](committee_readme.tmpl) **Time Zone gotcha**: Time zones make everything complicated. @@ -24,12 +26,13 @@ Practically, that means US pacific time must be `PT (Pacific Time)`. `PT` isn't good enough, unfortunately. When an update happens to the this file, the next step is to generate the -accompanying documentation. This takes the format of three types of doc files: +accompanying documentation. This takes the format of the following types of doc files: ``` sig-/README.md wg-/README.md ug-/README.md +committee-/README.md sig-list.md ``` @@ -64,9 +67,11 @@ make WHAT=container-identity where the `WHAT` var refers to the directory being built. -## Adding custom content to your README +## Adding custom content -If your SIG or WG wishes to add custom content, you can do so by placing it within +### README + +If your SIG, WG, UG or Committee wishes to add custom content, you can do so by placing it within the following code comments: ```markdown @@ -88,3 +93,14 @@ An example might be: - Do that ``` + +### OWNERS_ALIASES + +Similarly, custom aliases can be added in the `OWNERS_ALIASES` file by placing +it within the following code comments: + +```yaml +## BEGIN CUSTOM CONTENT + +## END CUSTOM CONTENT +``` diff --git a/generator/aliases.tmpl b/generator/aliases.tmpl index 313be36e8..52a7176e5 100644 --- a/generator/aliases.tmpl +++ b/generator/aliases.tmpl @@ -20,3 +20,9 @@ aliases: - {{.GitHub}} {{- end}} {{- end}} + {{- range .Committees}} + {{.Dir}}: + {{- range .Leadership.Chairs}} + - {{.GitHub}} + {{- end}} + {{- end}} diff --git a/generator/app.go b/generator/app.go index 0b17b100a..be33247f4 100644 --- a/generator/app.go +++ b/generator/app.go @@ -73,9 +73,10 @@ type Meeting struct { // Contact represents the various contact points for a group. type Contact struct { - Slack string - MailingList string `yaml:"mailing_list"` - GithubTeams []GithubTeams `yaml:"teams"` + Slack string + MailingList string `yaml:"mailing_list"` + PrivateMailingList string `yaml:"private_mailing_list"` + GithubTeams []GithubTeams `yaml:"teams"` } // GithubTeams represents a specific Github Team. @@ -125,6 +126,7 @@ type Context struct { Sigs []Group WorkingGroups []Group UserGroups []Group + Committees []Group } func pathExists(path string) bool { @@ -310,6 +312,10 @@ func main() { return strings.ToLower(ctx.UserGroups[i].Name) <= strings.ToLower(ctx.UserGroups[j].Name) }) + sort.Slice(ctx.Committees, func(i, j int) bool { + return strings.ToLower(ctx.Committees[i].Name) <= strings.ToLower(ctx.Committees[j].Name) + }) + err = createGroupReadme(ctx.Sigs, "sig") if err != nil { log.Fatal(err) @@ -325,6 +331,11 @@ func main() { log.Fatal(err) } + err = createGroupReadme(ctx.Committees, "committee") + if err != nil { + log.Fatal(err) + } + fmt.Println("Generating sig-list.md") outputPath := filepath.Join(baseGeneratorDir, sigListOutput) err = writeTemplate(filepath.Join(baseGeneratorDir, templateDir, listTemplate), outputPath, "markdown", ctx) diff --git a/generator/committee_readme.tmpl b/generator/committee_readme.tmpl new file mode 100644 index 000000000..c0337b472 --- /dev/null +++ b/generator/committee_readme.tmpl @@ -0,0 +1,57 @@ +{{- template "header" }} +# {{.Name}} Committee + +{{ .MissionStatement }} +{{- if .CharterLink }} +The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name}} Committee. +{{- 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 }} + +{{- end }} +{{- if .Leadership }} +{{- if .Leadership.Chairs }} + +## Members +{{ range .Leadership.Chairs }} +* {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**){{if .Company}}, {{.Company}}{{end}} +{{- end }} +{{- end }} +{{- end }} + +## Contact + +{{- if .Contact.Slack }} +* [Slack](https://kubernetes.slack.com/messages/{{.Contact.Slack}}) +{{- end }} +{{- if .Contact.MailingList }} +* [Mailing list]({{.Contact.MailingList}}) +{{- end }} +{{- if .Contact.PrivateMailingList }} +* Private Mailing List: {{.Contact.PrivateMailingList}} +{{- end }} +{{- if .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 | +| --------- |:-------:| ----------- | +{{- range .Contact.GithubTeams }} +| @kubernetes/{{.Name}} | [link](https://github.com/orgs/kubernetes/teams/{{.Name}}) | {{.Description}} | +{{- end }} +{{ end }} diff --git a/generator/list.tmpl b/generator/list.tmpl index 1299ee66a..d8970ceae 100644 --- a/generator/list.tmpl +++ b/generator/list.tmpl @@ -44,3 +44,10 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md) |[{{.Name}}]({{.Dir}}/README.md)|{{range .Leadership.Chairs}}* [{{.Name}}](https://github.com/{{.GitHub}}){{if .Company}}, {{.Company}}{{end}}
{{end}}|* [Slack](https://kubernetes.slack.com/messages/{{.Contact.Slack}})
* [Mailing List]({{.Contact.MailingList}})|{{range .Meetings}}* {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})
{{end}} {{- end }} {{ end }} +### Master Committee List + +| Name | Label | Members | Contact | +|------|--------|---------|---------| +{{- range .Committees}} +|[{{.Name}}]({{.Dir}}/README.md)|{{.Label}}|{{range .Leadership.Chairs}}* [{{.Name}}](https://github.com/{{.GitHub}}){{if .Company}}, {{.Company}}{{end}}
{{end}}|{{ if .Contact.Slack }}* [Slack](https://kubernetes.slack.com/messages/{{.Contact.Slack}})
{{ end }}{{ if .Contact.MailingList }}* [Mailing List]({{.Contact.MailingList}})
{{ end }}{{ if .Contact.PrivateMailingList }}* [Private Mailing List]({{.Contact.PrivateMailingList}}){{ end }} +{{- end }} diff --git a/hack/verify-generated-docs.sh b/hack/verify-generated-docs.sh index fab0cae72..73302358f 100755 --- a/hack/verify-generated-docs.sh +++ b/hack/verify-generated-docs.sh @@ -37,7 +37,7 @@ make 1>/dev/null mismatches=0 break=$(printf "=%.0s" $(seq 1 68)) -for file in $(ls ${CRT_DIR}/sig-*/README.md ${CRT_DIR}/wg-*/README.md ${CRT_DIR}/ug-*/README.md ${CRT_DIR}/sig-list.md ${CRT_DIR}/OWNERS_ALIASES); do +for file in $(ls ${CRT_DIR}/sig-*/README.md ${CRT_DIR}/wg-*/README.md ${CRT_DIR}/ug-*/README.md ${CRT_DIR}/committee-*/README.md ${CRT_DIR}/sig-list.md ${CRT_DIR}/OWNERS_ALIASES); do real=${file#$CRT_DIR/} if ! diff -q ${file} ${WORKING_DIR}/${real} &>/dev/null; then echo "${file} does not match ${WORKING_DIR}/${real}"; From 9904fe7dbda0cf9f97ff51d7657831f90e83ac93 Mon Sep 17 00:00:00 2001 From: Nikhita Raghunath Date: Fri, 15 Mar 2019 16:54:01 +0530 Subject: [PATCH 2/4] Add Steering Committee to sigs.yaml --- OWNERS | 2 +- OWNERS_ALIASES | 4 +-- committee-steering/OWNERS | 4 +-- committee-steering/README.md | 50 +++++++++++++++++++++++++++++ sig-list.md | 5 +++ sigs.yaml | 62 ++++++++++++++++++++++++++++++++++++ 6 files changed, 122 insertions(+), 5 deletions(-) create mode 100644 committee-steering/README.md diff --git a/OWNERS b/OWNERS index b01f75999..ae587343e 100644 --- a/OWNERS +++ b/OWNERS @@ -16,4 +16,4 @@ approvers: - idvoretskyi - jdumars - parispittman - - steering-committee + - committee-steering diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 391e95c08..36c5491c3 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -157,8 +157,7 @@ aliases: - joelsmith - cji - jaybeale -## BEGIN CUSTOM CONTENT - steering-committee: + committee-steering: - bgrant0607 - brendanburns - derekwaynecarr @@ -171,6 +170,7 @@ aliases: - smarterclayton - spiffxp - timothysc +## BEGIN CUSTOM CONTENT code-of-conduct-committee: - jdumars - parispittman diff --git a/committee-steering/OWNERS b/committee-steering/OWNERS index b2b41a77c..c73d211d9 100644 --- a/committee-steering/OWNERS +++ b/committee-steering/OWNERS @@ -1,8 +1,8 @@ # See the OWNERS docs at https://go.k8s.io/owners reviewers: - - steering-committee + - committee-steering approvers: - - steering-committee + - committee-steering labels: - committee/steering diff --git a/committee-steering/README.md b/committee-steering/README.md new file mode 100644 index 000000000..b9632b399 --- /dev/null +++ b/committee-steering/README.md @@ -0,0 +1,50 @@ + +# Steering Committee + +The Kubernetes Steering Committee is the governing body of the Kubernetes project, providing decision-making and oversight pertaining to the Kubernetes project bylaws, sub-organizations, and financial planning. The Steering Committee also defines the project values and structure. + +The [charter](https://git.k8s.io/steering/charter.md) defines the scope and governance of the Steering Committee. + +## Meetings +* Public Steering Committee Meeting: [Wednesdays at 13:00 PT (Pacific Time)](https://bit.ly/k8s-steering-wd) (biweekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=13:00&tz=PT%20%28Pacific%20Time%29). + * [Meeting recordings](https://www.youtube.com/watch?v=YAzgJRQxsdc&list=PL69nYSiGNLP1yP1B_nd9-drjoxp0Q14qM). + +## Members + +* Brian Grant (**[@bgrant0607](https://github.com/bgrant0607)**), Google +* Brendan Burns (**[@brendanburns](https://github.com/brendanburns)**), Microsoft +* Derek Carr (**[@derekwaynecarr](https://github.com/derekwaynecarr)**), Red Hat +* Davanum Srinivas (**[@dims](https://github.com/dims)**), Huawei +* Joe Beda (**[@jbeda](https://github.com/jbeda)**), VMware +* Michelle Noorali (**[@michelleN](https://github.com/michelleN)**), Microsoft +* Brandon Philips (**[@philips](https://github.com/philips)**), Red Hat +* Phillip Wittrock (**[@pwittrock](https://github.com/pwittrock)**), Google +* Sarah Novotny (**[@sarahnovotny](https://github.com/sarahnovotny)**), Google +* Clayton Coleman (**[@smarterclayton](https://github.com/smarterclayton)**), Red Hat +* Aaron Crickenberger (**[@spiffxp](https://github.com/spiffxp)**), Google +* Timothy St. Clair (**[@timothysc](https://github.com/timothysc)**), VMware + +## Contact +* [Mailing list](https://groups.google.com/a/kubernetes.io/forum/#!forum/steering) +* Private Mailing List: steering-private@kubernetes.io +* [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/ug%2Fsteering) + +## 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 | +| --------- |:-------:| ----------- | +| @kubernetes/steering-committee | [link](https://github.com/orgs/kubernetes/teams/steering-committee) | General Discussion | + + + + diff --git a/sig-list.md b/sig-list.md index ef1882897..d3e1edbe6 100644 --- a/sig-list.md +++ b/sig-list.md @@ -68,6 +68,11 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md) |[Resource Management](wg-resource-management/README.md)||* [Vishnu Kannan](https://github.com/vishh), Google
* [Derek Carr](https://github.com/derekwaynecarr), Red Hat
|* [Slack](https://kubernetes.slack.com/messages/wg-resource-mgmt)
* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-resource-management)|* Regular WG Meeting: [Wednesdays at 11:00 PT (Pacific Time) (biweekly (On demand))](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)
|[Security Audit](wg-security-audit/README.md)||* [Aaron Small](https://github.com/aasmall), Google
* [Joel Smith](https://github.com/joelsmith), Red Hat
* [Craig Ingram](https://github.com/cji), Salesforce
* [Jay Beale](https://github.com/jaybeale), InGuardians
|* [Slack](https://kubernetes.slack.com/messages/wg-security-audit)
* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-security-audit)|* Regular WG Meeting: [Mondays at 13:00 PT (Pacific Time) (weekly)](https://docs.google.com/document/d/1RbC4SBZBlKth7IjYv_NaEpnmLGwMJ0ElpUOmsG-bdRA/edit)
+### Master Committee List + +| Name | Label | Members | Contact | +|------|--------|---------|---------| +|[Steering](committee-steering/README.md)|steering|* [Brian Grant](https://github.com/bgrant0607), Google
* [Brendan Burns](https://github.com/brendanburns), Microsoft
* [Derek Carr](https://github.com/derekwaynecarr), Red Hat
* [Davanum Srinivas](https://github.com/dims), Huawei
* [Joe Beda](https://github.com/jbeda), VMware
* [Michelle Noorali](https://github.com/michelleN), Microsoft
* [Brandon Philips](https://github.com/philips), Red Hat
* [Phillip Wittrock](https://github.com/pwittrock), Google
* [Sarah Novotny](https://github.com/sarahnovotny), Google
* [Clayton Coleman](https://github.com/smarterclayton), Red Hat
* [Aaron Crickenberger](https://github.com/spiffxp), Google
* [Timothy St. Clair](https://github.com/timothysc), VMware
|* [Mailing List](https://groups.google.com/a/kubernetes.io/forum/#!forum/steering)
* [Private Mailing List](steering-private@kubernetes.io) diff --git a/sigs.yaml b/sigs.yaml index 5e67ef06b..e90783190 100644 --- a/sigs.yaml +++ b/sigs.yaml @@ -2491,3 +2491,65 @@ workinggroups: contact: slack: wg-k8s-infra mailing_list: https://groups.google.com/forum/#!forum/kubernetes-wg-k8s-infra +committees: + - name: Steering + dir: committee-steering + mission_statement: > + The Kubernetes Steering Committee is the governing body of the Kubernetes + project, providing decision-making and oversight pertaining to the + Kubernetes project bylaws, sub-organizations, and financial planning. + The Steering Committee also defines the project values and structure. + label: steering + charter_link: https://git.k8s.io/steering/charter.md + leadership: + chairs: + - name: Brian Grant + github: bgrant0607 + company: Google + - name: Brendan Burns + github: brendanburns + company: Microsoft + - name: Derek Carr + github: derekwaynecarr + company: Red Hat + - name: Davanum Srinivas + github: dims + company: Huawei + - name: Joe Beda + github: jbeda + company: VMware + - name: Michelle Noorali + github: michelleN + company: Microsoft + - name: Brandon Philips + github: philips + company: Red Hat + - name: Phillip Wittrock + github: pwittrock + company: Google + - name: Sarah Novotny + github: sarahnovotny + company: Google + - name: Clayton Coleman + github: smarterclayton + company: Red Hat + - name: Aaron Crickenberger + github: spiffxp + company: Google + - name: Timothy St. Clair + github: timothysc + company: VMware + meetings: + - description: Public Steering Committee Meeting + day: Wednesday + time: "13:00" + tz: "PT (Pacific Time)" + frequency: biweekly + url: https://bit.ly/k8s-steering-wd + recordings_url: https://www.youtube.com/watch?v=YAzgJRQxsdc&list=PL69nYSiGNLP1yP1B_nd9-drjoxp0Q14qM + contact: + mailing_list: https://groups.google.com/a/kubernetes.io/forum/#!forum/steering + private_mailing_list: steering-private@kubernetes.io + teams: + - name: steering-committee + description: General Discussion From 17a44f8238f2a8ed23680724fefd37aab08c78e7 Mon Sep 17 00:00:00 2001 From: Nikhita Raghunath Date: Fri, 15 Mar 2019 17:47:34 +0530 Subject: [PATCH 3/4] Add Code of Conduct Committee to sigs.yaml --- OWNERS_ALIASES | 12 +++++----- committee-code-of-conduct/OWNERS | 4 ++-- committee-code-of-conduct/README.md | 36 ++++++++++++++++++++++++++++- sig-list.md | 1 + sigs.yaml | 29 +++++++++++++++++++++++ 5 files changed, 73 insertions(+), 9 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 36c5491c3..4add17474 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -157,6 +157,12 @@ aliases: - joelsmith - cji - jaybeale + committee-code-of-conduct: + - jdumars + - parispittman + - carolynvs + - eparis + - bradamant3 committee-steering: - bgrant0607 - brendanburns @@ -171,12 +177,6 @@ aliases: - spiffxp - timothysc ## BEGIN CUSTOM CONTENT - code-of-conduct-committee: - - jdumars - - parispittman - - eparis - - carolynvs - - bradamant3 product-security-committee: - philips - jessfraz diff --git a/committee-code-of-conduct/OWNERS b/committee-code-of-conduct/OWNERS index 4db02842f..1e7cf4437 100644 --- a/committee-code-of-conduct/OWNERS +++ b/committee-code-of-conduct/OWNERS @@ -1,8 +1,8 @@ # See the OWNERS docs at https://go.k8s.io/owners reviewers: - - code-of-conduct-committee + - committee-code-of-conduct approvers: - - code-of-conduct-committee + - committee-code-of-conduct labels: - committee/conduct diff --git a/committee-code-of-conduct/README.md b/committee-code-of-conduct/README.md index 7f6902d5a..fe0f44e05 100644 --- a/committee-code-of-conduct/README.md +++ b/committee-code-of-conduct/README.md @@ -1,7 +1,40 @@ -# Kubernetes Code of Conduct Committee (CoCC) + +# Code of Conduct Committee The Kubernetes Code of Conduct Committee (CoCC) is the body that is responsible for enforcing and maintaining the Kubernetes Code of Conduct. + +## Members + +* Jaice Singer Dumars (**[@jdumars](https://github.com/jdumars)**), Google +* Paris Pittman (**[@parispittman](https://github.com/parispittman)**), Google +* Carolyn Van Slyck (**[@carolynvs](https://github.com/carolynvs)**), Microsoft +* Eric Paris (**[@eparis](https://github.com/eparis)**), Red Hat +* Jennifer Rondeau (**[@bradamant3](https://github.com/bradamant3)**), VMware + +## Contact +* Private Mailing List: conduct@kubernetes.io +* [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/ug%2Fconduct) + +## 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 | +| --------- |:-------:| ----------- | +| @kubernetes/code-of-conduct-committee | [link](https://github.com/orgs/kubernetes/teams/code-of-conduct-committee) | General Discussion | + + +## Terms + The members and their terms are as follows: - Jaice Singer Dumars (Google) - 2 years - Paris Pittman (Google) - 2 years @@ -12,3 +45,4 @@ The members and their terms are as follows: Please see the [bootstrapping document](./bootstrapping-process.md) for more information on how members are picked, their responsibilities, and how the committee will initially function. _More information on how to contact this committee and learn about its process to come in the near future. For now, any Code of Conduct or Code of Conduct Committee concerns can be directed to _. + diff --git a/sig-list.md b/sig-list.md index d3e1edbe6..7978c0f8e 100644 --- a/sig-list.md +++ b/sig-list.md @@ -72,6 +72,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md) | Name | Label | Members | Contact | |------|--------|---------|---------| +|[Code of Conduct](committee-code-of-conduct/README.md)|conduct|* [Jaice Singer Dumars](https://github.com/jdumars), Google
* [Paris Pittman](https://github.com/parispittman), Google
* [Carolyn Van Slyck](https://github.com/carolynvs), Microsoft
* [Eric Paris](https://github.com/eparis), Red Hat
* [Jennifer Rondeau](https://github.com/bradamant3), VMware
|* [Private Mailing List](conduct@kubernetes.io) |[Steering](committee-steering/README.md)|steering|* [Brian Grant](https://github.com/bgrant0607), Google
* [Brendan Burns](https://github.com/brendanburns), Microsoft
* [Derek Carr](https://github.com/derekwaynecarr), Red Hat
* [Davanum Srinivas](https://github.com/dims), Huawei
* [Joe Beda](https://github.com/jbeda), VMware
* [Michelle Noorali](https://github.com/michelleN), Microsoft
* [Brandon Philips](https://github.com/philips), Red Hat
* [Phillip Wittrock](https://github.com/pwittrock), Google
* [Sarah Novotny](https://github.com/sarahnovotny), Google
* [Clayton Coleman](https://github.com/smarterclayton), Red Hat
* [Aaron Crickenberger](https://github.com/spiffxp), Google
* [Timothy St. Clair](https://github.com/timothysc), VMware
|* [Mailing List](https://groups.google.com/a/kubernetes.io/forum/#!forum/steering)
* [Private Mailing List](steering-private@kubernetes.io) diff --git a/sigs.yaml b/sigs.yaml index e90783190..090b2ea16 100644 --- a/sigs.yaml +++ b/sigs.yaml @@ -2553,3 +2553,32 @@ committees: teams: - name: steering-committee description: General Discussion + - name: Code of Conduct + dir: committee-code-of-conduct + mission_statement: > + The Kubernetes Code of Conduct Committee (CoCC) is the body that is + responsible for enforcing and maintaining the Kubernetes Code of Conduct. + label: conduct + charter_link: + leadership: + chairs: + - name: Jaice Singer Dumars + github: jdumars + company: Google + - name: Paris Pittman + github: parispittman + company: Google + - name: Carolyn Van Slyck + github: carolynvs + company: Microsoft + - name: Eric Paris + github: eparis + company: Red Hat + - name: Jennifer Rondeau + github: bradamant3 + company: VMware + contact: + private_mailing_list: conduct@kubernetes.io + teams: + - name: code-of-conduct-committee + description: General Discussion From 2620823b10cdb1b66d15fcdf24c6fdf77d06b527 Mon Sep 17 00:00:00 2001 From: Nikhita Raghunath Date: Fri, 15 Mar 2019 18:05:36 +0530 Subject: [PATCH 4/4] Add Product Security Committee to sigs.yaml --- OWNERS_ALIASES | 13 +++++----- committee-product-security/OWNERS | 4 +-- committee-product-security/README.md | 38 +++++++++++++++++++++++++--- sig-list.md | 1 + sigs.yaml | 28 ++++++++++++++++++++ 5 files changed, 73 insertions(+), 11 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 4add17474..373b87788 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -163,6 +163,12 @@ aliases: - carolynvs - eparis - bradamant3 + committee-product-security: + - philips + - jessfraz + - cjcullen + - tallclair + - liggitt committee-steering: - bgrant0607 - brendanburns @@ -177,10 +183,5 @@ aliases: - spiffxp - timothysc ## BEGIN CUSTOM CONTENT - product-security-committee: - - philips - - jessfraz - - cjcullen - - tallclair - - liggitt + ## END CUSTOM CONTENT diff --git a/committee-product-security/OWNERS b/committee-product-security/OWNERS index 17be418d9..b49dedd57 100644 --- a/committee-product-security/OWNERS +++ b/committee-product-security/OWNERS @@ -1,8 +1,8 @@ # See the OWNERS docs at https://go.k8s.io/owners reviewers: - - product-security-committee + - committee-product-security approvers: - - product-security-committee + - committee-product-security labels: - committee/product-security diff --git a/committee-product-security/README.md b/committee-product-security/README.md index 9267d381f..8cc26236c 100644 --- a/committee-product-security/README.md +++ b/committee-product-security/README.md @@ -1,8 +1,40 @@ -# Kubernetes Product Security Committee + +# Product Security Committee The Kubernetes Product Security Committee is the body that is responsible for receiving and responding to reports of security issues in Kubernetes products. -Current committee members are listed on the [Product Security Committee section](https://git.k8s.io/security/security-release-process.md#product-security-committee-psc) of the committee's documentation. -Information on how members are selected is in the [Product Security Committee Membership section](https://git.k8s.io/security/security-release-process.md#product-security-committee-membership) of the same document. + +## Members + +* Brandon Philips (**[@philips](https://github.com/philips)**), Red Hat +* Jess Frazelle (**[@jessfraz](https://github.com/jessfraz)**) +* CJ Cullen (**[@cjcullen](https://github.com/cjcullen)**), Google +* Tim Allclair (**[@tallclair](https://github.com/tallclair)**), Google +* Jordan Liggitt (**[@liggitt](https://github.com/liggitt)**), Google + +## Contact +* Private Mailing List: security@kubernetes.io +* [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/ug%2Fproduct-security) + +## 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 | +| --------- |:-------:| ----------- | +| @kubernetes/product-security-committee | [link](https://github.com/orgs/kubernetes/teams/product-security-committee) | General Discussion | + + +**Note**: Information on how members are selected can be found +[here](https://git.k8s.io/security/security-release-process.md#product-security-committee-membership). _To report a security issue, please email the private security@kubernetes.io list with the security details and the details expected for all Kubernetes bug reports._ + diff --git a/sig-list.md b/sig-list.md index 7978c0f8e..c364fc8d6 100644 --- a/sig-list.md +++ b/sig-list.md @@ -73,6 +73,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md) | Name | Label | Members | Contact | |------|--------|---------|---------| |[Code of Conduct](committee-code-of-conduct/README.md)|conduct|* [Jaice Singer Dumars](https://github.com/jdumars), Google
* [Paris Pittman](https://github.com/parispittman), Google
* [Carolyn Van Slyck](https://github.com/carolynvs), Microsoft
* [Eric Paris](https://github.com/eparis), Red Hat
* [Jennifer Rondeau](https://github.com/bradamant3), VMware
|* [Private Mailing List](conduct@kubernetes.io) +|[Product Security](committee-product-security/README.md)|product-security|* [Brandon Philips](https://github.com/philips), Red Hat
* [Jess Frazelle](https://github.com/jessfraz)
* [CJ Cullen](https://github.com/cjcullen), Google
* [Tim Allclair](https://github.com/tallclair), Google
* [Jordan Liggitt](https://github.com/liggitt), Google
|* [Private Mailing List](security@kubernetes.io) |[Steering](committee-steering/README.md)|steering|* [Brian Grant](https://github.com/bgrant0607), Google
* [Brendan Burns](https://github.com/brendanburns), Microsoft
* [Derek Carr](https://github.com/derekwaynecarr), Red Hat
* [Davanum Srinivas](https://github.com/dims), Huawei
* [Joe Beda](https://github.com/jbeda), VMware
* [Michelle Noorali](https://github.com/michelleN), Microsoft
* [Brandon Philips](https://github.com/philips), Red Hat
* [Phillip Wittrock](https://github.com/pwittrock), Google
* [Sarah Novotny](https://github.com/sarahnovotny), Google
* [Clayton Coleman](https://github.com/smarterclayton), Red Hat
* [Aaron Crickenberger](https://github.com/spiffxp), Google
* [Timothy St. Clair](https://github.com/timothysc), VMware
|* [Mailing List](https://groups.google.com/a/kubernetes.io/forum/#!forum/steering)
* [Private Mailing List](steering-private@kubernetes.io) diff --git a/sigs.yaml b/sigs.yaml index 090b2ea16..b40aeaae6 100644 --- a/sigs.yaml +++ b/sigs.yaml @@ -2582,3 +2582,31 @@ committees: teams: - name: code-of-conduct-committee description: General Discussion + - name: Product Security + dir: committee-product-security + mission_statement: > + The Kubernetes Product Security Committee is the body that is responsible + for receiving and responding to reports of security issues in Kubernetes + products. + label: product-security + leadership: + chairs: + - name: Brandon Philips + github: philips + company: Red Hat + - name: Jess Frazelle + github: jessfraz + - name: CJ Cullen + github: cjcullen + company: Google + - name: Tim Allclair + github: tallclair + company: Google + - name: Jordan Liggitt + github: liggitt + company: Google + contact: + private_mailing_list: security@kubernetes.io + teams: + - name: product-security-committee + description: General Discussion