Merge pull request #4686 from nkubala/owners

Update maintainers and add kpt codeowners

.github/CODEOWNERS

@@ -2,14 +2,13 @@
 
 * @GoogleContainerTools/skaffold-team
 
-# Buildpacks owners
-
-**/**buildpacks** @GoogleContainerTools/skaffold-team
-
 # JIB owners
 
 **/**jib** @GoogleContainerTools/skaffold-team @loosebazooka @TadCordle @chanseokoh
 
+# kpt owners
+pkg/skaffold/deploy/**kpt** @GoogleContainerTools/skaffold-team @yuwenma
+
 # Debug owners
 
 pkg/skaffold/debug/** @GoogleContainerTools/skaffold-team @loosebazooka @quoctruong

MAINTAINERS

@@ -1,7 +1,7 @@
-Balint Pato <balintp@google.com>
+Brian de Alwis <bdealwis@google.com>
 David Gageot <[email protected]>
+Gaurav Ghosh <[email protected]>
+Marlon Gamez <[email protected]>
 Nick Kubala <[email protected]>
 Tejal Desai <[email protected]>
-Brian de Alwis <[email protected]>
 Thomas Strömberg <[email protected]>
-Gaurav Ghosh <[email protected]>