From 01b171fbb7d7514a50cfd53fe3de0b789f47c243 Mon Sep 17 00:00:00 2001
From: zhipengh <huangzhipeng@huawei.com>
Date: Sat, 27 Jan 2018 20:34:25 +0800
Subject: [PATCH] add auto-gen files for wg-policy

Also removed merge conflicts error msgs in sig-list.md

Signed-off-by: zhipengh <huangzhipeng@huawei.com>
---
 OWNERS_ALIASES      |  6 ++++++
 sig-list.md         |  1 +
 wg-policy/README.md | 30 ++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 wg-policy/README.md

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 079205dac..69ac2386f 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -118,6 +118,12 @@ aliases:
   wg-multitenancy-leads:
     - davidopp
     - jessfraz
+  wg-policy-leads:
+    - hannibalhuang
+    - tsandall
+    - davidopp
+    - smarterclayton
+    - xuanjia
   wg-resource-management-leads:
     - vishh
     - derekwaynecarr
diff --git a/sig-list.md b/sig-list.md
index 9ff2ae256..62e77cf25 100644
--- a/sig-list.md
+++ b/sig-list.md
@@ -62,6 +62,7 @@ When the need arises, a [new SIG can be created](sig-creation-procedure.md)
 |[Container Identity](wg-container-identity/README.md)|* [Clayton Coleman](https://github.com/smarterclayton), Red Hat<br>* [Greg Gastle](https://github.com/destijl), Google<br>|* [Slack](https://kubernetes.slack.com/messages/wg-container-identity)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-container-identity)|* Regular WG Meeting: [Tuesdays at 15:00 UTC (bi-weekly (On demand))](TBD)<br>
 |[Kubeadm Adoption](wg-kubeadm-adoption/README.md)|* [Lucas Käldström](https://github.com/luxas), Luxas Labs (occasionally contracting for Weaveworks)<br>* [Justin Santa Barbara](https://github.com/justinsb)<br>|* [Slack](https://kubernetes.slack.com/messages/sig-cluster-lifecycle)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-cluster-lifecycle)|* Regular WG Meeting: [Tuesdays at 18:00 UTC (bi-weekly)](https://zoom.us/j/166836%E2%80%8B624)<br>
 |[Multitenancy](wg-multitenancy/README.md)|* [David Oppenheimer](https://github.com/davidopp), Google<br>* [Jessie Frazelle](https://github.com/jessfraz), Microsoft<br>|* [Slack](https://kubernetes.slack.com/messages/wg-multitenancy)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-multitenancy)|
+|[Policy](wg-policy/README.md)|* [Howard Huang](https://github.com/hannibalhuang), Huawei<br>* [Torin Sandall](https://github.com/tsandall), Google<br>* [David Oppenheimer](https://github.com/davidopp), Google<br>* [Clayton Coleman](https://github.com/smarterclayton), Red Hat<br>* [Xuan Jia](https://github.com/xuanjia), China Mobile<br>|* [Slack](https://kubernetes.slack.com/messages/wg-policy)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-policy)|* Regular WG Meeting: [Thursdays at 17:00 PT (Pacific Time) (weekly)](https://zoom.us/j/421702434)<br>
 |[Resource Management](wg-resource-management/README.md)|* [Vishnu Kannan](https://github.com/vishh), Google<br>* [Derek Carr](https://github.com/derekwaynecarr), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/wg-resource-mgmt)<br>* [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://zoom.us/j/4799874685)<br>
 <!-- BEGIN CUSTOM CONTENT -->
 
diff --git a/wg-policy/README.md b/wg-policy/README.md
new file mode 100644
index 000000000..2d3ae7715
--- /dev/null
+++ b/wg-policy/README.md
@@ -0,0 +1,30 @@
+<!---
+This is an autogenerated file!
+
+Please do not edit this file directly, but instead make changes to the
+sigs.yaml file in the project root.
+
+To understand how this file is generated, see https://git.k8s.io/community/generator/README.md
+-->
+# Policy Working Group
+
+Provide an overall architecture that describes both the current policy related implementations as well as future policy related proposals in Kubernetes. Through a collaborative method, we want to present both dev and end user a universal view of policy architecture in Kubernetes.
+
+## Meetings
+* Regular WG Meeting: [Thursdays at 17:00 PT (Pacific Time)](https://zoom.us/j/421702434) (weekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=17:00&tz=PT%20%28Pacific%20Time%29).
+  * [Meeting notes and Agenda](https://docs.google.com/document/d/1ihFfEfgViKlUMbY2NKxaJzBkgHh-Phk5hqKTzK-NEEs/edit?usp=sharing).
+
+## Organizers
+* Howard Huang (**[@hannibalhuang](https://github.com/hannibalhuang)**), Huawei
+* Torin Sandall (**[@tsandall](https://github.com/tsandall)**), Google
+* David Oppenheimer (**[@davidopp](https://github.com/davidopp)**), Google
+* Clayton Coleman (**[@smarterclayton](https://github.com/smarterclayton)**), Red Hat
+* Xuan Jia (**[@xuanjia](https://github.com/xuanjia)**), China Mobile
+
+## Contact
+* [Slack](https://kubernetes.slack.com/messages/wg-policy)
+* [Mailing list](https://groups.google.com/forum/#!forum/kubernetes-wg-policy)
+
+<!-- BEGIN CUSTOM CONTENT -->
+
+<!-- END CUSTOM CONTENT -->