kubernetes
/
community
mirror of https://github.com/kubernetes/community.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4120 from nikhita/emeritus-company 

generator: don't specify company for emeritus_leads
This commit is contained in:
Kubernetes Prow Robot 2019-10-04 23:05:13 -07:00 committed by GitHub
parent 395d34e5c8 0a1177290b
commit 9126cd5742
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 33 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
generator/app.go
View File

@ -68,7 +68,7 @@ func (x FoldedString) MarshalYAML() (interface{}, error) {
type Person struct { type Person struct {
GitHub string GitHub string
Name string Name string
Company string Company string `yaml:"company,omitempty"`
} }
// Meeting represents a regular meeting for a group. // Meeting represents a regular meeting for a group.
@ -233,12 +233,16 @@ func (c *Context) Validate() []error {
for prefix, persons := range group.Leadership.PrefixToPersonMap() { for prefix, persons := range group.Leadership.PrefixToPersonMap() {
for _, person := range persons { for _, person := range persons {
if val, ok := people[person.GitHub]; ok { if val, ok := people[person.GitHub]; ok {
if val.Name != person.Name || val.Company != person.Company { if val.Name != person.Name || (prefix != "emeritus_lead" && val.Company != person.Company) {
errors = append(errors, fmt.Errorf("%s: %ss: expected person: %v, got: %v", group.Dir, prefix, val, person)) errors = append(errors, fmt.Errorf("%s: %ss: expected person: %v, got: %v", group.Dir, prefix, val, person))
} }
} else { } else if prefix != "emeritus_lead" {
people[person.GitHub] = person people[person.GitHub] = person
} }
if prefix == "emeritus_lead" && person.Company != "" {
errors = append(errors, fmt.Errorf("%s: emeritus leads should not have company specified; company specified for: %s", group.Dir, person.Name))
}
} }
} }
if len(group.StakeholderSIGs) != 0 { if len(group.StakeholderSIGs) != 0 {

2
generator/sig_readme.tmpl
View File

@ -42,7 +42,7 @@ subprojects, and resolve cross-subproject technical issues and decisions.
## Emeritus Leads ## Emeritus Leads
{{ range .Leadership.EmeritusLeads }} {{ range .Leadership.EmeritusLeads }}
* {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**){{if .Company}}, {{.Company}}{{end}} * {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**)
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

2
generator/ug_readme.tmpl
View File

@ -30,7 +30,7 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name}
## Emeritus Organizers ## Emeritus Organizers
{{ range .Leadership.EmeritusLeads }} {{ range .Leadership.EmeritusLeads }}
* {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**){{if .Company}}, {{.Company}}{{end}} * {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**)
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

2
generator/wg_readme.tmpl
View File

@ -36,7 +36,7 @@ The [charter]({{.CharterLink}}) defines the scope and governance of the {{.Name}
## Emeritus Organizers ## Emeritus Organizers
{{ range .Leadership.EmeritusLeads }} {{ range .Leadership.EmeritusLeads }}
* {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**){{if .Company}}, {{.Company}}{{end}} * {{.Name}} (**[@{{.GitHub}}](https://github.com/{{.GitHub}})**)
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

4
sig-auth/README.md
View File

@ -38,8 +38,8 @@ subprojects, and resolve cross-subproject technical issues and decisions.
## Emeritus Leads ## Emeritus Leads
* Eric Chiang (**[@ericchiang](https://github.com/ericchiang)**), Red Hat * Eric Chiang (**[@ericchiang](https://github.com/ericchiang)**)
* Eric Tune (**[@erictune](https://github.com/erictune)**), Google * Eric Tune (**[@erictune](https://github.com/erictune)**)
## Contact ## Contact
- Slack: [#sig-auth](https://kubernetes.slack.com/messages/sig-auth) - Slack: [#sig-auth](https://kubernetes.slack.com/messages/sig-auth)

4
sig-cli/README.md
View File

@ -34,8 +34,8 @@ subprojects, and resolve cross-subproject technical issues and decisions.
## Emeritus Leads ## Emeritus Leads
* Tony Ado (**[@AdoHe](https://github.com/AdoHe)**), Alibaba * Tony Ado (**[@AdoHe](https://github.com/AdoHe)**)
* Fabiano Franz (**[@fabianofranz](https://github.com/fabianofranz)**), Red Hat * Fabiano Franz (**[@fabianofranz](https://github.com/fabianofranz)**)
## Contact ## Contact
- Slack: [#sig-cli](https://kubernetes.slack.com/messages/sig-cli) - Slack: [#sig-cli](https://kubernetes.slack.com/messages/sig-cli)

4
sig-cloud-provider/README.md
View File

@ -27,8 +27,8 @@ The Chairs of the SIG run operations and processes governing the SIG.
## Emeritus Leads ## Emeritus Leads
* Chris Hoge (**[@hogepodge](https://github.com/hogepodge)**), OpenStack Foundation * Chris Hoge (**[@hogepodge](https://github.com/hogepodge)**)
* Jago Macleod (**[@jagosan](https://github.com/jagosan)**), Google * Jago Macleod (**[@jagosan](https://github.com/jagosan)**)
## Contact ## Contact
- Slack: [#sig-cloud-provider](https://kubernetes.slack.com/messages/sig-cloud-provider) - Slack: [#sig-cloud-provider](https://kubernetes.slack.com/messages/sig-cloud-provider)

4
sig-cluster-lifecycle/README.md
View File

@ -55,8 +55,8 @@ The Chairs of the SIG run operations and processes governing the SIG.
## Emeritus Leads ## Emeritus Leads
* Lucas Käldström (**[@luxas](https://github.com/luxas)**), Luxas Labs (occasionally contracting for Weaveworks) * Lucas Käldström (**[@luxas](https://github.com/luxas)**)
* Robert Bailey (**[@roberthbailey](https://github.com/roberthbailey)**), Google * Robert Bailey (**[@roberthbailey](https://github.com/roberthbailey)**)
## Contact ## Contact
- Slack: [#sig-cluster-lifecycle](https://kubernetes.slack.com/messages/sig-cluster-lifecycle) - Slack: [#sig-cluster-lifecycle](https://kubernetes.slack.com/messages/sig-cluster-lifecycle)

2
sig-contributor-experience/README.md
View File

@ -34,7 +34,7 @@ subprojects, and resolve cross-subproject technical issues and decisions.
## Emeritus Leads ## Emeritus Leads
* Garrett Rodrigues (**[@grodrigues3](https://github.com/grodrigues3)**), Google * Garrett Rodrigues (**[@grodrigues3](https://github.com/grodrigues3)**)
## Contact ## Contact
- Slack: [#sig-contribex](https://kubernetes.slack.com/messages/sig-contribex) - Slack: [#sig-contribex](https://kubernetes.slack.com/messages/sig-contribex)

4
sig-docs/README.md
View File

@ -34,8 +34,8 @@ The Chairs of the SIG run operations and processes governing the SIG.
## Emeritus Leads ## Emeritus Leads
* Andrew Chen (**[@chenopis](https://github.com/chenopis)**), Google * Andrew Chen (**[@chenopis](https://github.com/chenopis)**)
* Jared Bhatti (**[@jaredbhatti](https://github.com/jaredbhatti)**), Google * Jared Bhatti (**[@jaredbhatti](https://github.com/jaredbhatti)**)
## Contact ## Contact
- Slack: [#sig-docs](https://kubernetes.slack.com/messages/sig-docs) - Slack: [#sig-docs](https://kubernetes.slack.com/messages/sig-docs)

4
sig-pm/README.md
View File

@ -32,8 +32,8 @@ The Chairs of the SIG run operations and processes governing the SIG.
## Emeritus Leads ## Emeritus Leads
* Aparna Sinha (**[@apsinha](https://github.com/apsinha)**), Google * Aparna Sinha (**[@apsinha](https://github.com/apsinha)**)
* Ihor Dvoretskyi (**[@idvoretskyi](https://github.com/idvoretskyi)**), CNCF * Ihor Dvoretskyi (**[@idvoretskyi](https://github.com/idvoretskyi)**)
## Contact ## Contact
- Slack: [#sig-pm](https://kubernetes.slack.com/messages/sig-pm) - Slack: [#sig-pm](https://kubernetes.slack.com/messages/sig-pm)

2
sig-release/README.md
View File

@ -28,7 +28,7 @@ The Chairs of the SIG run operations and processes governing the SIG.
## Emeritus Leads ## Emeritus Leads
* Jaice Singer DuMars (**[@jdumars](https://github.com/jdumars)**), Google * Jaice Singer DuMars (**[@jdumars](https://github.com/jdumars)**)
## Contact ## Contact
- Slack: [#sig-release](https://kubernetes.slack.com/messages/sig-release) - Slack: [#sig-release](https://kubernetes.slack.com/messages/sig-release)

2
sig-scheduling/README.md
View File

@ -28,7 +28,7 @@ The Chairs of the SIG run operations and processes governing the SIG.
## Emeritus Leads ## Emeritus Leads
* Bobby (Babak) Salamat (**[@bsalamat](https://github.com/bsalamat)**), Google * Bobby (Babak) Salamat (**[@bsalamat](https://github.com/bsalamat)**)
## Contact ## Contact
- Slack: [#sig-scheduling](https://kubernetes.slack.com/messages/sig-scheduling) - Slack: [#sig-scheduling](https://kubernetes.slack.com/messages/sig-scheduling)

14
sig-service-catalog/README.md
View File

@ -27,13 +27,13 @@ The Chairs of the SIG run operations and processes governing the SIG.
## Emeritus Leads ## Emeritus Leads
* Aaron Schlesinger (**[@arschles](https://github.com/arschles)**), Microsoft * Aaron Schlesinger (**[@arschles](https://github.com/arschles)**)
* Carolyn Van Slyck (**[@carolynvs](https://github.com/carolynvs)**), Microsoft * Carolyn Van Slyck (**[@carolynvs](https://github.com/carolynvs)**)
* Doug Davis (**[@duglin](https://github.com/duglin)**), IBM * Doug Davis (**[@duglin](https://github.com/duglin)**)
* Jay Boyd (**[@jboyd01](https://github.com/jboyd01)**), Red Hat * Jay Boyd (**[@jboyd01](https://github.com/jboyd01)**)
* Michael Kibbe (**[@kibbles-n-bytes](https://github.com/kibbles-n-bytes)**), Google * Michael Kibbe (**[@kibbles-n-bytes](https://github.com/kibbles-n-bytes)**)
* Paul Morie (**[@pmorie](https://github.com/pmorie)**), Red Hat * Paul Morie (**[@pmorie](https://github.com/pmorie)**)
* Ville Aikas (**[@vaikas-google](https://github.com/vaikas-google)**), Google * Ville Aikas (**[@vaikas-google](https://github.com/vaikas-google)**)
## Contact ## Contact
- Slack: [#sig-service-catalog](https://kubernetes.slack.com/messages/sig-service-catalog) - Slack: [#sig-service-catalog](https://kubernetes.slack.com/messages/sig-service-catalog)

23
sigs.yaml
View File

@ -342,10 +342,8 @@ sigs:
emeritus_leads: emeritus_leads:
- github: ericchiang - github: ericchiang
name: Eric Chiang name: Eric Chiang
company: Red Hat
- github: erictune - github: erictune
name: Eric Tune name: Eric Tune
company: Google
meetings: meetings:
- description: Regular SIG Meeting - description: Regular SIG Meeting
day: Wednesday day: Wednesday
@ -558,10 +556,8 @@ sigs:
emeritus_leads: emeritus_leads:
- github: AdoHe - github: AdoHe
name: Tony Ado name: Tony Ado
company: Alibaba
- github: fabianofranz - github: fabianofranz
name: Fabiano Franz name: Fabiano Franz
company: Red Hat
meetings: meetings:
- description: Regular SIG Meeting - description: Regular SIG Meeting
day: Wednesday day: Wednesday
@ -642,10 +638,8 @@ sigs:
emeritus_leads: emeritus_leads:
- github: hogepodge - github: hogepodge
name: Chris Hoge name: Chris Hoge
company: OpenStack Foundation
- github: jagosan - github: jagosan
name: Jago Macleod name: Jago Macleod
company: Google
meetings: meetings:
- description: Regular SIG Meeting - description: Regular SIG Meeting
day: Wednesday day: Wednesday
@ -809,10 +803,8 @@ sigs:
emeritus_leads: emeritus_leads:
- github: luxas - github: luxas
name: Lucas Käldström name: Lucas Käldström
company: Luxas Labs (occasionally contracting for Weaveworks)
- github: roberthbailey - github: roberthbailey
name: Robert Bailey name: Robert Bailey
company: Google
meetings: meetings:
- description: Cluster API (AWS implementation) office hours - description: Cluster API (AWS implementation) office hours
day: Monday day: Monday
@ -1041,7 +1033,6 @@ sigs:
emeritus_leads: emeritus_leads:
- github: grodrigues3 - github: grodrigues3
name: Garrett Rodrigues name: Garrett Rodrigues
company: Google
meetings: meetings:
- description: Regular SIG Meeting - description: Regular SIG Meeting
day: Wednesday day: Wednesday
@ -1170,10 +1161,8 @@ sigs:
emeritus_leads: emeritus_leads:
- github: chenopis - github: chenopis
name: Andrew Chen name: Andrew Chen
company: Google
- github: jaredbhatti - github: jaredbhatti
name: Jared Bhatti name: Jared Bhatti
company: Google
meetings: meetings:
- description: APAC SIG Meeting - description: APAC SIG Meeting
day: Wednesday day: Wednesday
@ -1564,10 +1553,8 @@ sigs:
emeritus_leads: emeritus_leads:
- github: apsinha - github: apsinha
name: Aparna Sinha name: Aparna Sinha
company: Google
- github: idvoretskyi - github: idvoretskyi
name: Ihor Dvoretskyi name: Ihor Dvoretskyi
company: CNCF
meetings: meetings:
- description: Regular SIG Meeting - description: Regular SIG Meeting
day: Tuesday day: Tuesday
@ -1605,7 +1592,6 @@ sigs:
emeritus_leads: emeritus_leads:
- github: jdumars - github: jdumars
name: Jaice Singer DuMars name: Jaice Singer DuMars
company: Google
meetings: meetings:
- description: Regular SIG Meeting - description: Regular SIG Meeting
day: Monday day: Monday
@ -1767,7 +1753,6 @@ sigs:
emeritus_leads: emeritus_leads:
- github: bsalamat - github: bsalamat
name: Bobby (Babak) Salamat name: Bobby (Babak) Salamat
company: Google
meetings: meetings:
- description: 10AM PT Meeting - description: 10AM PT Meeting
day: Thursday day: Thursday
@ -1839,25 +1824,18 @@ sigs:
emeritus_leads: emeritus_leads:
- github: arschles - github: arschles
name: Aaron Schlesinger name: Aaron Schlesinger
company: Microsoft
- github: carolynvs - github: carolynvs
name: Carolyn Van Slyck name: Carolyn Van Slyck
company: Microsoft
- github: duglin - github: duglin
name: Doug Davis name: Doug Davis
company: IBM
- github: jboyd01 - github: jboyd01
name: Jay Boyd name: Jay Boyd
company: Red Hat
- github: kibbles-n-bytes - github: kibbles-n-bytes
name: Michael Kibbe name: Michael Kibbe
company: Google
- github: pmorie - github: pmorie
name: Paul Morie name: Paul Morie
company: Red Hat
- github: vaikas-google - github: vaikas-google
name: Ville Aikas name: Ville Aikas
company: Google
meetings: meetings:
- description: Regular SIG Meeting - description: Regular SIG Meeting
day: Monday day: Monday
@ -2484,7 +2462,6 @@ workinggroups:
emeritus_leads: emeritus_leads:
- github: davidopp - github: davidopp
name: David Oppenheimer name: David Oppenheimer
company: Google
meetings: meetings:
- description: Regular WG Meeting - description: Regular WG Meeting
day: Tuesday day: Tuesday

2
wg-multitenancy/README.md
View File

@ -30,7 +30,7 @@ Define the models of multitenancy that Kubernetes will support. Discuss and exec
## Emeritus Organizers ## Emeritus Organizers
* David Oppenheimer (**[@davidopp](https://github.com/davidopp)**), Google * David Oppenheimer (**[@davidopp](https://github.com/davidopp)**)
## Contact ## Contact
- Slack: [#wg-multitenancy](https://kubernetes.slack.com/messages/wg-multitenancy) - Slack: [#wg-multitenancy](https://kubernetes.slack.com/messages/wg-multitenancy)