commit 9fa52ae9a22091c978857ef5440372c06da4c99e · pyrox.dev/nixpkgs

+1 -1

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

···

       350
       350
        
                 listenPeerUrls = mkDefault ["https://0.0.0.0:2380"];

     

       351
       351
        
                 advertiseClientUrls = mkDefault ["https://${top.masterAddress}:2379"];

     

       352
       352
        
                 initialCluster = mkDefault ["${top.masterAddress}=https://${top.masterAddress}:2380"];

     

       353
       353
       -
                 name = top.masterAddress;

     

       353
       353
       +
                 name = mkDefault top.masterAddress;

     

       354
       354
        
                 initialAdvertisePeerUrls = mkDefault ["https://${top.masterAddress}:2380"];

     

       355
       355
        
               };

     

       356
       356

+1 -1

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

···

       131
       131
        
                 ${optionalString (cfg.tlsCertFile!=null)

     

       132
       132
        
                   "--tls-cert-file=${cfg.tlsCertFile}"} \

     

       133
       133
        
                 ${optionalString (cfg.tlsKeyFile!=null)

     

       134
       134
       -
                   "--tls-key-file=${cfg.tlsKeyFile}"} \

     

       134
       134
       +
                   "--tls-private-key-file=${cfg.tlsKeyFile}"} \

     

       135
       135
        
                 ${optionalString (elem "RBAC" top.apiserver.authorizationMode)

     

       136
       136
        
                   "--use-service-account-credentials"} \

     

       137
       137
        
                 ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \

+1 -1

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

···

       10
       10
        
           kind = "Config";

     

       11
       11
        
           clusters = [{

     

       12
       12
        
             name = "local";

     

       13
       13
       -
             cluster.certificate-authority = cfg.caFile;

     

       13
       13
       +
             cluster.certificate-authority = conf.caFile or cfg.caFile;

     

       14
       14
        
             cluster.server = conf.server;

     

       15
       15
        
           }];

     

       16
       16
        
           users = [{