Merge pull request #384 from fluxcd/update-maintainers-data

Update maintainers data

CORE-MAINTAINERS

@@ -13,7 +13,7 @@ should.
 In alphabetical order:
 
 Aurel Canciu, NexHealth <[email protected]> (github: @relu, slack: relu)
-Hidde Beydals, Weaveworks <hidde@weave.works> (github: @hiddeco, slack: hidde)
+Hidde Beydals, Independent <hidde@hhh.computers> (github: @hiddeco, slack: hidde)
 Max Jonas Werner, Associmates <[email protected]> (github: @makkes, slack: max)
 Paulo Gomes, SUSE <[email protected]> (github: @pjbgf, slack: pjbgf)
 Sanskar Jaiswal, Independent <[email protected]> (github: @aryan9600, slack: aryan9600)

ORG-ADMINS

@@ -3,7 +3,7 @@
 | Name | Slack handle | GitHub handle | Affiliation |
 | -- | -- | -- | -- |
 | Chris Aniszczyk | `caniszczyk` | `@caniszczyk` | CNCF |
-| Hidde Beydals | `hidde` | `@hiddeco` | Weaveworks  |
+| Hidde Beydals | `hidde` | `@hiddeco` | Independent  |
 | Michael Bridgen | `Michael Bridgen` | `@squaremo` | Independent  |
 | Stefan Prodan | `stefanprodan` | `@stefanprodan` | ControlPlane  |
 | The Linux Foundation | - | `thelinuxfoundation` | The Linux Foundation |

project/flux-project-emeriti.yaml

@@ -6,6 +6,7 @@ flux:
 - Justin Barrick
 - Michael Bridgen
 - Nick Cabatoff
+- Philip Laine
 go-git-providers:
 - Dinos Kousidis
 - Michael Beaumont

project/flux-project-maintainers.yaml

@@ -12,7 +12,6 @@ flux2:
 - hiddeco
 - makkes
 - pjbgf
-- phillebaba
 - aryan9600
 - souleb
 - stefanprodan
@@ -23,9 +22,6 @@ go-git-providers:
 - souleb
 - stefanprodan
 - yiannistri
-image-automation-controller:
-# Plus flux2 maintainers
-- pjbgf
 notification-controller:
 # Plus flux2 maintainers
 - somtochiama

project/rolodex.yaml

@@ -9,6 +9,7 @@ emeriti:
 - Michael Beaumont
 - Michael Bridgen
 - Nick Cabatoff
+- Philip Laine
 - Sara El-Zayat
 - Sean Eagan
 maintainers:
@@ -29,8 +30,8 @@ maintainers:
     slack: simonh
 - hiddeco:
     name: Hidde Beydals
-    email: hidde@weave.works
-    affiliation: Weaveworks
+    email: hidde@hhh.computer
+    affiliation: Independent
     slack: hidde
 - kingdonb:
     name: Kingdon Barrett
@@ -52,11 +53,6 @@ maintainers:
     email: [email protected]
     affiliation: Independent
     slack: tamao
-- phillebaba:
-    name: Philip Laine
-    email: [email protected]
-    affiliation: Xenit
-    slack: phillebaba
 - pjbgf:
     name: Paulo Gomes
     email: [email protected]
@@ -80,7 +76,7 @@ maintainers:
 - souleb:
     name: Soule BA
     email: [email protected]
-    affiliation: Independent
+    affiliation: ControlPlane
     slack: souleb
 - stefanprodan:
     name: Stefan Prodan