From 565397a445a22124d3ea4e890813d62dfbc4c8c4 Mon Sep 17 00:00:00 2001 From: Atharva Shinde Date: Tue, 16 May 2023 07:44:32 +0530 Subject: [PATCH 1/4] modified teams.yaml to add v1.28 enhancements team to github teams and resolve merge conflicts --- config/kubernetes/sig-architecture/teams.yaml | 2 +- config/kubernetes/sig-release/teams.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/kubernetes/sig-architecture/teams.yaml b/config/kubernetes/sig-architecture/teams.yaml index 2b25d0e000..8a0231ad01 100644 --- a/config/kubernetes/sig-architecture/teams.yaml +++ b/config/kubernetes/sig-architecture/teams.yaml @@ -38,12 +38,12 @@ teams: maintainers: - mrbobbytables # subproject owner members: + - Atharva-Shinde # 1.28 RT Enhancements Lead - jeremyrickard # subproject owner - johnbelamaric # subproject owner - justaugustus # subproject owner - kikisdeliveryservice # subproject owner - LappleApple # subproject owner - - marosset # 1.27 RT Enhancements Lead privacy: closed teams: enhancements-admins: diff --git a/config/kubernetes/sig-release/teams.yaml b/config/kubernetes/sig-release/teams.yaml index db018a932d..4ff8acdb0c 100644 --- a/config/kubernetes/sig-release/teams.yaml +++ b/config/kubernetes/sig-release/teams.yaml @@ -62,6 +62,7 @@ teams: - floreks # UI - foxish # Big Data - frapposelli # VMware + - fsmunoz # 1.28 Release Notes Shadow - furkatgofurov7 # 1.28 Bug Triage Lead - gracenng # Release Manager Associate - helayoty # 1.28 Lead Shadow @@ -84,6 +85,7 @@ teams: - k8s-release-robot # Release - Kasambx # 1.28 Enhancements Shadow - khenidak # Azure + - Kasambx # 1.28 Enhancements Shadow - KnVerey # CLI - kow3ns # Apps - lavalamp # API Machinery @@ -302,6 +304,7 @@ teams: - jameslaverack # subproject owner (1.24 RT Lead) - jeremyrickard # subproject owner / Technical Lead - justaugustus # subproject owner / Chair + - katcosgrove # 1.28 RT Lead Shadow - Kasambx # 1.28 Enhancements Shadow - leonardpahlke # subproject owner (1.26 RT Lead) - marosset # 1.28 RT Lead Shadow @@ -369,6 +372,7 @@ teams: - npolshakova # 1.28 Enhancements Shadow - ruheenaansari34 # 1.28 Enhancements Shadow - salehsedghpour # 1.28 Enhancements Shadow + privacy: closed release-team-release-notes: description: Members of the Release Notes team for the current release From eece0b2f980e357cc6ebbe0cad8e8b0a05b3b45e Mon Sep 17 00:00:00 2001 From: Atharva Shinde Date: Thu, 18 May 2023 12:21:38 +0530 Subject: [PATCH 2/4] Add v1.28 enhancements team to github teams and update teams.yaml to resolve merge conflicts --- config/kubernetes/sig-release/teams.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/kubernetes/sig-release/teams.yaml b/config/kubernetes/sig-release/teams.yaml index 4ff8acdb0c..96d336ba51 100644 --- a/config/kubernetes/sig-release/teams.yaml +++ b/config/kubernetes/sig-release/teams.yaml @@ -84,8 +84,8 @@ teams: - justinsb # AWS / Cluster Lifecycle - k8s-release-robot # Release - Kasambx # 1.28 Enhancements Shadow + - katcosgrove # 1.27 RT Lead Shadow - khenidak # Azure - - Kasambx # 1.28 Enhancements Shadow - KnVerey # CLI - kow3ns # Apps - lavalamp # API Machinery @@ -304,8 +304,8 @@ teams: - jameslaverack # subproject owner (1.24 RT Lead) - jeremyrickard # subproject owner / Technical Lead - justaugustus # subproject owner / Chair - - katcosgrove # 1.28 RT Lead Shadow - Kasambx # 1.28 Enhancements Shadow + - katcosgrove # 1.27 RT Lead Shadow - leonardpahlke # subproject owner (1.26 RT Lead) - marosset # 1.28 RT Lead Shadow - mickeyboxell # 1.28 RT Lead Shadow From b1463ddbbff636456202bef7ad0d354c0cc4b973 Mon Sep 17 00:00:00 2001 From: Atharva Shinde Date: Thu, 13 Jul 2023 02:57:56 +0530 Subject: [PATCH 3/4] Update teams.yaml and remove an empty line --- config/kubernetes/sig-release/teams.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/kubernetes/sig-release/teams.yaml b/config/kubernetes/sig-release/teams.yaml index 96d336ba51..08f053eb85 100644 --- a/config/kubernetes/sig-release/teams.yaml +++ b/config/kubernetes/sig-release/teams.yaml @@ -372,7 +372,6 @@ teams: - npolshakova # 1.28 Enhancements Shadow - ruheenaansari34 # 1.28 Enhancements Shadow - salehsedghpour # 1.28 Enhancements Shadow - privacy: closed release-team-release-notes: description: Members of the Release Notes team for the current release From 0d63dd6d83f6d7fe791df65db7ec3043c4c1c642 Mon Sep 17 00:00:00 2001 From: Atharva Shinde Date: Thu, 13 Jul 2023 03:05:38 +0530 Subject: [PATCH 4/4] Update teams.yaml --- config/kubernetes/sig-release/teams.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/kubernetes/sig-release/teams.yaml b/config/kubernetes/sig-release/teams.yaml index 08f053eb85..65b7e4838b 100644 --- a/config/kubernetes/sig-release/teams.yaml +++ b/config/kubernetes/sig-release/teams.yaml @@ -84,7 +84,7 @@ teams: - justinsb # AWS / Cluster Lifecycle - k8s-release-robot # Release - Kasambx # 1.28 Enhancements Shadow - - katcosgrove # 1.27 RT Lead Shadow + - katcosgrove # 1.28 RT Lead Shadow - khenidak # Azure - KnVerey # CLI - kow3ns # Apps @@ -305,7 +305,7 @@ teams: - jeremyrickard # subproject owner / Technical Lead - justaugustus # subproject owner / Chair - Kasambx # 1.28 Enhancements Shadow - - katcosgrove # 1.27 RT Lead Shadow + - katcosgrove # 1.28 RT Lead Shadow - leonardpahlke # subproject owner (1.26 RT Lead) - marosset # 1.28 RT Lead Shadow - mickeyboxell # 1.28 RT Lead Shadow