commit b7802cf399658db4070a903550a6bb4a057f9677 · pyrox.dev/nixpkgs

+3

nixos/modules/services/cluster/kubernetes/addon-manager.nix

···

       84
       84
        
               Restart = "on-failure";

     

       85
       85
        
               RestartSec = 10;

     

       86
       86
        
             };

     

       87
       87
       +
             unitConfig = {

     

       88
       88
       +
               StartLimitIntervalSec = 0;

     

       89
       89
       +
             };

     

       87
       90
        
           };

     

       88
       91
        
       

     

       89
       92
        
           services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled

+4

nixos/modules/services/cluster/kubernetes/apiserver.nix

···

       398
       398
        
                   Restart = "on-failure";

     

       399
       399
        
                   RestartSec = 5;

     

       400
       400
        
                 };

     

       401
       401
       +
       

     

       402
       402
       +
                 unitConfig = {

     

       403
       403
       +
                   StartLimitIntervalSec = 0;

     

       404
       404
       +
                 };

     

       401
       405
        
               };

     

       402
       406
        
       

     

       403
       407
        
               services.etcd = {

+3

nixos/modules/services/cluster/kubernetes/controller-manager.nix

···

       146
       146
        
               User = "kubernetes";

     

       147
       147
        
               Group = "kubernetes";

     

       148
       148
        
             };

     

       149
       149
       +
             unitConfig = {

     

       150
       150
       +
               StartLimitIntervalSec = 0;

     

       151
       151
       +
             };

     

       149
       152
        
             path = top.path;

     

       150
       153
        
           };

     

       151
       154

+3

nixos/modules/services/cluster/kubernetes/kubelet.nix

···

       337
       337
        
                 '';

     

       338
       338
        
                 WorkingDirectory = top.dataDir;

     

       339
       339
        
               };

     

       340
       340
       +
               unitConfig = {

     

       341
       341
       +
                 StartLimitIntervalSec = 0;

     

       342
       342
       +
               };

     

       340
       343
        
             };

     

       341
       344
        
       

     

       342
       345
        
             # Allways include cni plugins

+3

nixos/modules/services/cluster/kubernetes/proxy.nix

···

       77
       77
        
               Restart = "on-failure";

     

       78
       78
        
               RestartSec = 5;

     

       79
       79
        
             };

     

       80
       80
       +
             unitConfig = {

     

       81
       81
       +
               StartLimitIntervalSec = 0;

     

       82
       82
       +
             };

     

       80
       83
        
           };

     

       81
       84
        
       

     

       82
       85
        
           services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName;

+3

nixos/modules/services/cluster/kubernetes/scheduler.nix

···

       79
       79
        
               Restart = "on-failure";

     

       80
       80
        
               RestartSec = 5;

     

       81
       81
        
             };

     

       82
       82
       +
             unitConfig = {

     

       83
       83
       +
               StartLimitIntervalSec = 0;

     

       84
       84
       +
             };

     

       82
       85
        
           };

     

       83
       86
        
       

     

       84
       87
        
           services.kubernetes.pki.certs = {

+1 -4

nixos/tests/all-tests.nix

···

       221
       221
        
         knot = handleTest ./knot.nix {};

     

       222
       222
        
         krb5 = discoverTests (import ./krb5 {});

     

       223
       223
        
         ksm = handleTest ./ksm.nix {};

     

       224
       224
       -
         kubernetes.dns = handleTestOn ["x86_64-linux"] ./kubernetes/dns.nix {};

     

       225
       225
       -
         # kubernetes.e2e should eventually replace kubernetes.rbac when it works

     

       226
       226
       -
         #kubernetes.e2e = handleTestOn ["x86_64-linux"] ./kubernetes/e2e.nix {};

     

       227
       227
       -
         kubernetes.rbac = handleTestOn ["x86_64-linux"] ./kubernetes/rbac.nix {};

     

       224
       224
       +
         kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};

     

       228
       225
        
         latestKernel.hardened = handleTest ./hardened.nix { latestKernel = true; };

     

       229
       226
        
         latestKernel.login = handleTest ./login.nix { latestKernel = true; };

     

       230
       227
        
         leaps = handleTest ./leaps.nix {};

+13 -5

nixos/tests/kubernetes/default.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem

     

       2
       2
       +
       , pkgs ? import <nixpkgs> { inherit system; }

     

       3
       3
       +
       }:

     

       4
       4
       +
       let

     

       5
       5
       +
         dns = import ./dns.nix { inherit system pkgs; };

     

       6
       6
       +
         rbac = import ./rbac.nix { inherit system pkgs; };

     

       7
       7
       +
         # TODO kubernetes.e2e should eventually replace kubernetes.rbac when it works

     

       8
       8
       +
         # e2e = import ./e2e.nix { inherit system pkgs; };

     

       9
       9
       +
       in

     

       2
       10
        
       {

     

       3
       3
       -
         dns = import ./dns.nix { inherit system; };

     

       4
       4
       -
         # e2e = import ./e2e.nix { inherit system; };  # TODO: make it pass

     

       5
       5
       -
         # the following test(s) can be removed when e2e is working:

     

       6
       6
       -
         rbac = import ./rbac.nix { inherit system; };

     

       11
       11
       +
         dns-single-node = dns.singlenode.test;

     

       12
       12
       +
         dns-multi-node = dns.multinode.test;

     

       13
       13
       +
         rbac-single-node = rbac.singlenode.test;

     

       14
       14
       +
         rbac-multi-node = rbac.multinode.test;

     

       7
       15
        
       }

+1 -6

pkgs/applications/networking/cluster/kubernetes/default.nix

···

       97
       97
        
           platforms = platforms.unix;

     

       98
       98
        
         };

     

       99
       99
        
       

     

       100
       100
       -
         passthru.tests = with nixosTests.kubernetes; {

     

       101
       101
       -
           dns-single-node = dns.singlenode;

     

       102
       102
       -
           dns-multi-node = dns.multinode;

     

       103
       103
       -
           rbac-single-node = rbac.singlenode;

     

       104
       104
       -
           rbac-multi-node = rbac.multinode;

     

       105
       105
       -
         };

     

       100
       100
       +
         passthru.tests = nixosTests.kubernetes;

     

       106
       101
        
       }