diff options
author | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-07-12 09:01:55 -0300 |
---|---|---|
committer | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-07-12 09:30:38 -0300 |
commit | bbc168ab4cafa2c44d53fb77e7dae76d51487355 (patch) | |
tree | a59c2d671c2cb1f4d159f718a5e206fc276beb60 | |
parent | b521675c515be29b61d78194db97563c380a7574 (diff) |
k3s: use team for maintainers
-rw-r--r-- | maintainers/team-list.nix | 14 | ||||
-rw-r--r-- | nixos/modules/services/cluster/k3s/default.nix | 2 | ||||
-rw-r--r-- | nixos/tests/k3s/auto-deploy.nix | 2 | ||||
-rw-r--r-- | nixos/tests/k3s/etcd.nix | 2 | ||||
-rw-r--r-- | nixos/tests/k3s/multi-node.nix | 4 | ||||
-rw-r--r-- | nixos/tests/k3s/single-node.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/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 f54d0f4352492..d5fd828928226 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 32d8f3dfecd5a..9274779088a6b 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 c2fae36c60bee..19be88dc7402a 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 ac0aa90472516..fa6012afd54c5 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 b618d2aff34c4..504ac10d96c11 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 80d80a55ddf41..220f6086b0923 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 9d19d13af8a17..45eaa31e301f4 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 |