From bbc168ab4cafa2c44d53fb77e7dae76d51487355 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Fri, 12 Jul 2024 09:01:55 -0300
Subject: [PATCH] k3s: use team for maintainers

---
 maintainers/team-list.nix                          | 14 ++++++++++++++
 nixos/modules/services/cluster/k3s/default.nix     |  2 ++
 nixos/tests/k3s/auto-deploy.nix                    |  2 ++
 nixos/tests/k3s/etcd.nix                           |  2 +-
 nixos/tests/k3s/multi-node.nix                     |  4 ++--
 nixos/tests/k3s/single-node.nix                    |  3 ++-
 .../networking/cluster/k3s/builder.nix             |  9 +--------
 7 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index f54d0f435249..d5fd82892822 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -496,6 +496,20 @@ with lib.maintainers;
     shortName = "Jupyter";
   };
 
+  k3s = {
+    githubTeams = [ "k3s" ];
+    members = [
+      euank
+      marcusramberg
+      mic92
+      superherointj
+      wrmilling
+      yajo
+    ];
+    scope = "Maintain K3s package, NixOS module, NixOS tests, update script";
+    shortName = "K3s";
+  };
+
   kubernetes = {
     members = [
       johanot
diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix
index 32d8f3dfecd5..9274779088a6 100644
--- a/nixos/modules/services/cluster/k3s/default.nix
+++ b/nixos/modules/services/cluster/k3s/default.nix
@@ -432,4 +432,6 @@ in
       };
     };
   };
+
+  meta.maintainers = lib.teams.k3s.members;
 }
diff --git a/nixos/tests/k3s/auto-deploy.nix b/nixos/tests/k3s/auto-deploy.nix
index c2fae36c60be..19be88dc7402 100644
--- a/nixos/tests/k3s/auto-deploy.nix
+++ b/nixos/tests/k3s/auto-deploy.nix
@@ -118,5 +118,7 @@ import ../make-test-python.nix (
 
       machine.shutdown()
     '';
+
+    meta.maintainers = lib.teams.k3s.members;
   }
 )
diff --git a/nixos/tests/k3s/etcd.nix b/nixos/tests/k3s/etcd.nix
index ac0aa9047251..fa6012afd54c 100644
--- a/nixos/tests/k3s/etcd.nix
+++ b/nixos/tests/k3s/etcd.nix
@@ -125,6 +125,6 @@ import ../make-test-python.nix (
           etcd.shutdown()
     '';
 
-    meta.maintainers = etcd.meta.maintainers ++ k3s.meta.maintainers;
+    meta.maintainers = etcd.meta.maintainers ++ lib.teams.k3s.members;
   }
 )
diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix
index b618d2aff34c..504ac10d96c1 100644
--- a/nixos/tests/k3s/multi-node.nix
+++ b/nixos/tests/k3s/multi-node.nix
@@ -189,8 +189,6 @@ import ../make-test-python.nix (
         };
     };
 
-    meta.maintainers = k3s.meta.maintainers;
-
     testScript = ''
       machines = [server, server2, agent]
       for m in machines:
@@ -239,5 +237,7 @@ import ../make-test-python.nix (
       for m in machines:
           m.shutdown()
     '';
+
+    meta.maintainers = lib.teams.k3s.members;
   }
 )
diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix
index 80d80a55ddf4..220f6086b092 100644
--- a/nixos/tests/k3s/single-node.nix
+++ b/nixos/tests/k3s/single-node.nix
@@ -40,7 +40,6 @@ import ../make-test-python.nix (
   in
   {
     name = "${k3s.name}-single-node";
-    meta.maintainers = k3s.meta.maintainers;
 
     nodes.machine =
       { pkgs, ... }:
@@ -120,5 +119,7 @@ import ../make-test-python.nix (
 
         machine.shutdown()
       '';
+
+    meta.maintainers = lib.teams.k3s.members;
   }
 )
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index 9d19d13af8a1..45eaa31e301f 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -92,14 +92,7 @@ let
     description = "Lightweight Kubernetes distribution";
     license = licenses.asl20;
     homepage = "https://k3s.io";
-    maintainers = with maintainers; [
-      euank
-      mic92
-      marcusramberg
-      superherointj
-      wrmilling
-      yajo
-    ];
+    maintainers = lib.teams.k3s.members;
     platforms = platforms.linux;
 
     # resolves collisions with other installations of kubectl, crictl, ctr