commit 996849ab8644c637ba7b22ebcca1852f5a113fdf · pyrox.dev/nixpkgs

nixos/modules/rename.nix

···

       31
       31
        
           (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])

     

       32
       32
        
           (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])

     

       33
       33
        
           (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ])

     

       34
       34
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])

     

       34
       35
        
           (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])

     

       35
       36
        
           (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])

     

       36
       37
        
           (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])

+46 -6

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

···

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.kubernetes;

     

       7
       7
        
       

     

       8
       8
       +
         # YAML config; see:

     

       9
       9
       +
         #   https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/

     

       10
       10
       +
         #   https://github.com/kubernetes/kubernetes/blob/release-1.10/pkg/kubelet/apis/kubeletconfig/v1beta1/types.go

     

       11
       11
       +
         #

     

       12
       12
       +
         # TODO: migrate the following flags to this config file

     

       13
       13
       +
         #

     

       14
       14
       +
         #   --pod-manifest-path

     

       15
       15
       +
         #   --address

     

       16
       16
       +
         #   --port

     

       17
       17
       +
         #   --tls-cert-file

     

       18
       18
       +
         #   --tls-private-key-file

     

       19
       19
       +
         #   --client-ca-file

     

       20
       20
       +
         #   --authentication-token-webhook

     

       21
       21
       +
         #   --authentication-token-webhook-cache-ttl

     

       22
       22
       +
         #   --authorization-mode

     

       23
       23
       +
         #   --healthz-bind-address

     

       24
       24
       +
         #   --healthz-port

     

       25
       25
       +
         #   --allow-privileged

     

       26
       26
       +
         #   --cluster-dns

     

       27
       27
       +
         #   --cluster-domain

     

       28
       28
       +
         #   --hairpin-mode

     

       29
       29
       +
         #   --feature-gates

     

       30
       30
       +
         kubeletConfig = pkgs.runCommand "kubelet-config.yaml" { } ''

     

       31
       31
       +
           echo > $out ${pkgs.lib.escapeShellArg (builtins.toJSON {

     

       32
       32
       +
             kind = "KubeletConfiguration";

     

       33
       33
       +
             apiVersion = "kubelet.config.k8s.io/v1beta1";

     

       34
       34
       +
             ${if cfg.kubelet.applyManifests then "staticPodPath" else null} =

     

       35
       35
       +
               manifests;

     

       36
       36
       +
           })}

     

       37
       37
       +
         '';

     

       38
       38
       +
       

     

       8
       39
        
         skipAttrs = attrs: map (filterAttrs (k: v: k != "enable"))

     

       9
       40
        
           (filter (v: !(hasAttr "enable" v) || v.enable) attrs);

     

       10
       41
        
       

     
···

       339
       370
        
               type = types.str;

     

       340
       371
        
             };

     

       341
       372
        
       

     

       342
       342
       -
             admissionControl = mkOption {

     

       373
       373
       +
             enableAdmissionPlugins = mkOption {

     

       343
       374
        
               description = ''

     

       344
       344
       -
                 Kubernetes admission control plugins to use. See

     

       375
       375
       +
                 Kubernetes admission control plugins to enable. See

     

       345
       376
        
                 <link xlink:href="https://kubernetes.io/docs/admin/admission-controllers/"/>

     

       346
       377
        
               '';

     

       347
       378
        
               default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" "NodeRestriction"];

     
···

       353
       384
        
               type = types.listOf types.str;

     

       354
       385
        
             };

     

       355
       386
        
       

     

       387
       387
       +
             disableAdmissionPlugins = mkOption {

     

       388
       388
       +
               description = ''

     

       389
       389
       +
                 Kubernetes admission control plugins to disable. See

     

       390
       390
       +
                 <link xlink:href="https://kubernetes.io/docs/admin/admission-controllers/"/>

     

       391
       391
       +
               '';

     

       392
       392
       +
               default = [];

     

       393
       393
       +
               type = types.listOf types.str;

     

       394
       394
       +
             };

     

       395
       395
       +
       

     

       356
       396
        
             serviceAccountKeyFile = mkOption {

     

       357
       397
        
               description = ''

     

       358
       398
        
                 Kubernetes apiserver PEM-encoded x509 RSA private or public key file,

     
···

       573
       613
        
               type = types.bool;

     

       574
       614
        
             };

     

       575
       615
        
       

     

       616
       616
       +
             # TODO: remove this deprecated flag

     

       576
       617
        
             cadvisorPort = mkOption {

     

       577
       618
        
               description = "Kubernetes kubelet local cadvisor port.";

     

       578
       619
        
               default = 4194;

     
···

       783
       824
        
               serviceConfig = {

     

       784
       825
        
                 Slice = "kubernetes.slice";

     

       785
       826
        
                 ExecStart = ''${cfg.package}/bin/kubelet \

     

       786
       786
       -
                   ${optionalString cfg.kubelet.applyManifests

     

       787
       787
       -
                     "--pod-manifest-path=${manifests}"} \

     

       788
       827
        
                   ${optionalString (taints != "")

     

       789
       828
        
                     "--register-with-taints=${taints}"} \

     

       790
       829
        
                   --kubeconfig=${mkKubeConfig "kubelet" cfg.kubelet.kubeconfig} \

     

       791
       791
       -
                   --require-kubeconfig \

     

       830
       830
       +
                   --config=${kubeletConfig} \

     

       792
       831
        
                   --address=${cfg.kubelet.address} \

     

       793
       832
        
                   --port=${toString cfg.kubelet.port} \

     

       794
       833
        
                   --register-node=${boolToString cfg.kubelet.registerNode} \

     
···

       899
       938
        
                   --service-cluster-ip-range=${cfg.apiserver.serviceClusterIpRange} \

     

       900
       939
        
                   ${optionalString (cfg.apiserver.runtimeConfig != "")

     

       901
       940
        
                     "--runtime-config=${cfg.apiserver.runtimeConfig}"} \

     

       902
       902
       -
                   --admission_control=${concatStringsSep "," cfg.apiserver.admissionControl} \

     

       941
       941
       +
                   --enable-admission-plugins=${concatStringsSep "," cfg.apiserver.enableAdmissionPlugins} \

     

       942
       942
       +
                   --disable-admission-plugins=${concatStringsSep "," cfg.apiserver.disableAdmissionPlugins} \

     

       903
       943
        
                   ${optionalString (cfg.apiserver.serviceAccountKeyFile!=null)

     

       904
       944
        
                     "--service-account-key-file=${cfg.apiserver.serviceAccountKeyFile}"} \

     

       905
       945
        
                   ${optionalString cfg.verbose "--v=6"} \

+4 -4

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

···

       7
       7
        
           "cmd/kube-apiserver"

     

       8
       8
        
           "cmd/kube-controller-manager"

     

       9
       9
        
           "cmd/kube-proxy"

     

       10
       10
       -
           "plugin/cmd/kube-scheduler"

     

       10
       10
       +
           "cmd/kube-scheduler"

     

       11
       11
        
           "test/e2e/e2e.test"

     

       12
       12
        
         ]

     

       13
       13
        
       }:

     
···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         name = "kubernetes-${version}";

     

       19
       19
       -
         version = "1.9.7";

     

       19
       19
       +
         version = "1.10.0";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "kubernetes";

     

       23
       23
        
           repo = "kubernetes";

     

       24
       24
        
           rev = "v${version}";

     

       25
       25
       -
           sha256 = "1dykh48c6bvypg51mlxjdyrggpjq597mjj83xgj1pfadsy6pp9bh";

     

       25
       25
       +
           sha256 = "0k6m55p0q8qscg8l7y1ymmp5vc3i07znqk61g4hs1gx0dj3id6mc";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
       -
         # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60373

     

       28
       28
       +
         # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60597

     

       29
       29
        
         buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ];

     

       30
       30
        
       

     

       31
       31
        
         outputs = ["out" "man" "pause"];