Merge pull request #337 from cblecker/teams-yay

Enable team management for peribolos

OWNERS_ALIASES

@@ -9,29 +9,32 @@ aliases:
   sig-architecture-leads:
     - bgrant0607
     - jdumars
+    - mattfarina
   sig-auth-leads:
-    - liggitt
     - mikedanese
+    - enj
     - tallclair
   sig-autoscaling-leads:
     - mwielgus
     - directxman12
   sig-aws-leads:
     - justinsb
     - kris-nova
-    - countspongebob
+    - d-nishi
   sig-azure-leads:
     - justaugustus
-    - shubheksha
+    - dstrebel
     - khenidak
+    - feiskyer
   sig-big-data-leads:
     - foxish
     - erikerlandson
     - liyinan926
   sig-cli-leads:
+    - soltysh
+    - seans3
     - soltysh
     - pwittrock
-    - AdoHe
   sig-cloud-provider-leads:
     - andrewsykim
     - hogepodge
@@ -49,9 +52,9 @@ aliases:
     - grodrigues3
     - cblecker
   sig-docs-leads:
-    - zacharysarah
     - chenopis
-    - jaredbhatti
+    - zacharysarah
+    - bradamant3
   sig-gcp-leads:
     - abgworrall
   sig-ibmcloud-leads:
@@ -64,7 +67,6 @@ aliases:
   sig-multicluster-leads:
     - csbell
     - quinton-hoole
-    - quinton-hoole-2
   sig-network-leads:
     - thockin
     - dcbw
@@ -81,19 +83,20 @@ aliases:
     - idvoretskyi
     - calebamiles
   sig-release-leads:
-    - jdumars
     - calebamiles
+    - justaugustus
+    - tpepper
   sig-scalability-leads:
     - wojtek-t
-    - countspongebob
+    - shyamjvs
   sig-scheduling-leads:
     - bsalamat
     - k82cn
   sig-service-catalog-leads:
-    - pmorie
     - carolynvs
     - kibbles-n-bytes
     - duglin
+    - jboyd01
   sig-storage-leads:
     - saad-ali
     - childsb
@@ -117,14 +120,14 @@ aliases:
     - garethr
   wg-apply-leads:
     - lavalamp
-  wg-cluster-api-leads:
-    - kris-nova
-    - roberthbailey
   wg-container-identity-leads:
     - smarterclayton
     - destijl
   wg-iot-edge-leads:
+    - cindyxing
     - dejanb
+    - ptone
+    - cantbewong
   wg-kubeadm-adoption-leads:
     - luxas
     - justinsb
@@ -139,26 +142,34 @@ aliases:
   wg-policy-leads:
     - hannibalhuang
     - tsandall
-    - davidopp
-    - smarterclayton
-    - xuanjia
+    - easeway
+    - ericavonb
+    - mdelder
   wg-resource-management-leads:
     - vishh
     - derekwaynecarr
+  wg-security-audit-leads:
+    - aasmall
+    - joelsmith
+    - cji
 ## BEGIN CUSTOM CONTENT
   steering-committee:
     - bgrant0607
     - brendanburns
     - derekwaynecarr
+    - dims
     - jbeda
     - michelleN
     - philips
     - pwittrock
-    - quinton-hoole
-    - quinton-hoole-2
     - sarahnovotny
     - smarterclayton
     - spiffxp
-    - thockin
     - timothysc
+  code-of-conduct-committee:
+    - jdumars
+    - parispittman
+    - eparis
+    - carolynvs
+    - bradamant3
 ## END CUSTOM CONTENT

admin/BUILD.bazel

@@ -7,6 +7,8 @@ sh_binary(
         "$(location //config:config.yaml)",
         "--fix-org",
         "--fix-org-members",
+        "--fix-teams",
+        "--fix-team-members",
         "--required-admins=calebamiles",
         "--required-admins=cblecker",
         "--required-admins=fejta",

config/BUILD.bazel

@@ -12,7 +12,7 @@ for val in $(SRCS); do
     parts+=(--org-part=$$key=$$val)
   fi
 done
-./$(location //cmd/merge) --ignore-teams $${parts[@]} > $(location config.yaml)""",
+./$(location //cmd/merge) --merge-teams $${parts[@]} > $(location config.yaml)""",
     tools = ["//cmd/merge"],
     visibility = ["//visibility:public"],
 )

config/kubernetes-client/org.yaml

@@ -44,3 +44,68 @@ members:
 - webwurst
 - yliaog
 - yue9944882
+teams:
+  Reviewers:
+    description: ""
+    members:
+    - arschles
+    - mbohlool
+    - krabhishek8260
+    - lwander
+    privacy: secret
+  csharp-admins:
+    description: admin access to csharp
+    maintainers:
+    - krabhishek8260
+    members:
+    - brendandburns
+    privacy: closed
+  gen-admins:
+    description: admin access to gen
+    maintainers:
+    - mbohlool
+    members:
+    - brendandburns
+    privacy: closed
+  haskell-admins:
+    description: admin access to haskell
+    maintainers:
+    - mbohlool
+    members:
+    - brendandburns
+    privacy: closed
+  java-admins:
+    description: admin access to java
+    maintainers:
+    - mbohlool
+    members:
+    - brendandburns
+    privacy: closed
+  javascript-admins:
+    description: admin access to javascript
+    maintainers:
+    - mbohlool
+    members:
+    - brendandburns
+    privacy: closed
+  python-admins:
+    description: admin access to python
+    maintainers:
+    - mbohlool
+    members:
+    - yliaog
+    privacy: closed
+  python-base-admins:
+    description: ""
+    maintainers:
+    - mbohlool
+    members:
+    - yliaog
+    privacy: closed
+  ruby-admins:
+    description: admin access to ruby
+    maintainers:
+    - mbohlool
+    members:
+    - brendandburns
+    privacy: closed