Merge pull request #1170 from mercedes-benz/schloc/release-0-5-sync-owners

🏃 sync OWNERS and OWNERS_ALIASES for v0.5 release branch

Author: k8s-ci-robot

OWNERS

@@ -10,15 +10,13 @@ reviewers:
   - cluster-api-openstack-maintainers
   - cluster-api-openstack-reviewers
 
-emeritus_maintainers:
+emeritus_approvers:
   - ncdc
   - chaosaffe
   - chrigl
   - dims
   - gyliu513
   - Lion-Wei
   - m1093782566
-
-emeritus_reviewers:
-  - iamemilio
-  - YorikSar
+  - sbueringer
+  - hidekazuna

OWNERS_ALIASES

@@ -1,4 +1,10 @@
 # See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
+#
+# When making changes to this file, also consider if you need to update:
+# - https://github.com/kubernetes/org/blob/main/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml
+# - https://github.com/kubernetes/test-infra/blob/master/OWNERS_ALIASES
+# - https://github.com/kubernetes/k8s.io/blob/main/groups/sig-architecture/groups.yaml
+# - https://github.com/kubernetes/k8s.io/blob/main/groups/sig-cluster-lifecycle/groups.yaml
 
 aliases:
   # correct as of 2021/03/03
@@ -19,10 +25,11 @@ aliases:
     - vincepri
     - CecileRobertMichon
   cluster-api-openstack-maintainers:
+    - chrischdi
     - jichenjc
-    - sbueringer
-    - hidekazuna
+    - mdbooth
+    - seanschneeweiss
+    - tobiasgiese
   cluster-api-openstack-reviewers:
-    - chrischdi
+    - macaptain
     - prankul88
-    - seanschneeweiss