Unverified Commit 4c8eaad8 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #326542 from superherointj/k3s-use-teams 

k3s: use team for maintainers
parents 50207701 5266d2da

maintainers/team-list.nix

+14 −0
Original line number Diff line number Diff line
@@ -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

nixos/modules/services/cluster/k3s/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -432,4 +432,6 @@ in 
      };

    };

  };



  meta.maintainers = lib.teams.k3s.members;

}

nixos/tests/k3s/auto-deploy.nix

+2 −0
Original line number Diff line number Diff line
@@ -118,5 +118,7 @@ import ../make-test-python.nix ( 


      machine.shutdown()

    '';



    meta.maintainers = lib.teams.k3s.members;

  }

)

nixos/tests/k3s/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ let 
  allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs;

in

{

  # Test whether container images are imported and auto deploying manifests work

  auto-deploy = lib.mapAttrs (_: k3s: import ./auto-deploy.nix { inherit system pkgs k3s; }) allK3s;

  # Testing K3s with Etcd backend

  etcd = lib.mapAttrs (

    _: k3s:
@@ -19,6 +21,4 @@ in 
  single-node = lib.mapAttrs (_: k3s: import ./single-node.nix { inherit system pkgs k3s; }) allK3s;

  # Run a multi-node k3s cluster and verify pod networking works across nodes

  multi-node = lib.mapAttrs (_: k3s: import ./multi-node.nix { inherit system pkgs k3s; }) allK3s;

  # Test wether container images are imported and auto deploying manifests work

  auto-deploy = lib.mapAttrs (_: k3s: import ./auto-deploy.nix { inherit system pkgs k3s; }) allK3s;

}

nixos/tests/k3s/etcd.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

  }

)