commit 8d7ea96a13ab569d69aa7feaaa99f0d896b4f97a · pyrox.dev/nixpkgs

+14 -1

nixos/doc/manual/release-notes/rl-1809.xml

···

       288
       288
        
          </listitem>

     

       289
       289
        
          <listitem>

     

       290
       290
        
           <para>

     

       291
       291
       -
            Recommented way to access the Kubernetes Dashboard is with HTTPS (TLS)

     

       291
       291
       +
            Recommended way to access the Kubernetes Dashboard is via HTTPS (TLS)

     

       292
       292
        
            Therefore; public service port for the dashboard has changed to 443

     

       293
       293
        
            (container port 8443) and scheme to https.

     

       294
       294
       +
           </para>

     

       295
       295
       +
          </listitem>

     

       296
       296
       +
          <listitem>

     

       297
       297
       +
           <para>

     

       298
       298
       +
            The option <varname>services.kubernetes.apiserver.address</varname>

     

       299
       299
       +
            was renamed to <varname>services.kubernetes.apiserver.bindAddress</varname>.

     

       300
       300
       +
            Note that the default value has changed from 127.0.0.1 to 0.0.0.0.

     

       301
       301
       +
           </para>

     

       302
       302
       +
          </listitem>

     

       303
       303
       +
          <listitem>

     

       304
       304
       +
           <para>

     

       305
       305
       +
            The option <varname>services.kubernetes.apiserver.publicAddress</varname>

     

       306
       306
       +
            was not used and thus has been removed.

     

       294
       307
        
           </para>

     

       295
       308
        
          </listitem>

     

       296
       309
        
         </itemizedlist>

nixos/modules/rename.nix

···

       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" ])

     

       35
       35
       +
           (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])

     

       36
       36
       +
           (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")

     

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

     

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

     

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

+21 -14

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

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.kubernetes.addons.dashboard;

     

       7
       7
       -
       

     

       8
       8
       -
         name = "k8s.gcr.io/kubernetes-dashboard-amd64";

     

       9
       9
       -
         version = "v1.8.3";

     

       10
       10
       -
       

     

       11
       11
       -
         image = pkgs.dockerTools.pullImage {

     

       12
       12
       -
           imageName = name;

     

       13
       13
       -
           imageDigest = "sha256:dc4026c1b595435ef5527ca598e1e9c4343076926d7d62b365c44831395adbd0";

     

       14
       14
       -
           finalImageTag = version;

     

       15
       15
       -
           sha256 = "18ajcg0q1vignfjk2sm4xj4wzphfz8wah69ps8dklqfvv0164mc8";

     

       16
       16
       -
         };

     

       17
       7
        
       in {

     

       18
       8
        
         options.services.kubernetes.addons.dashboard = {

     

       19
       9
        
           enable = mkEnableOption "kubernetes dashboard addon";

     
···

       23
       13
        
             type = types.bool;

     

       24
       14
        
             default = elem "RBAC" config.services.kubernetes.apiserver.authorizationMode;

     

       25
       15
        
           };

     

       16
       16
       +
       

     

       17
       17
       +
           version = mkOption {

     

       18
       18
       +
             description = "Which version of the kubernetes dashboard to deploy";

     

       19
       19
       +
             type = types.str;

     

       20
       20
       +
             default = "v1.8.3";

     

       21
       21
       +
           };

     

       22
       22
       +
       

     

       23
       23
       +
           image = mkOption {

     

       24
       24
       +
             description = "Docker image to seed for the kubernetes dashboard container.";

     

       25
       25
       +
             type = types.attrs;

     

       26
       26
       +
             default = {

     

       27
       27
       +
               imageName = "k8s.gcr.io/kubernetes-dashboard-amd64";

     

       28
       28
       +
               imageDigest = "sha256:dc4026c1b595435ef5527ca598e1e9c4343076926d7d62b365c44831395adbd0";

     

       29
       29
       +
               finalImageTag = cfg.version;

     

       30
       30
       +
               sha256 = "18ajcg0q1vignfjk2sm4xj4wzphfz8wah69ps8dklqfvv0164mc8";

     

       31
       31
       +
             };

     

       32
       32
       +
           };

     

       26
       33
        
         };

     

       27
       34
        
       

     

       28
       35
        
         config = mkIf cfg.enable {

     

       29
       29
       -
           services.kubernetes.kubelet.seedDockerImages = [image];

     

       36
       36
       +
           services.kubernetes.kubelet.seedDockerImages = [(pkgs.dockerTools.pullImage cfg.image)];

     

       30
       37
        
       

     

       31
       38
        
           services.kubernetes.addonManager.addons = {

     

       32
       39
        
             kubernetes-dashboard-deployment = {

     
···

       36
       43
        
                 labels = {

     

       37
       44
        
                   k8s-addon = "kubernetes-dashboard.addons.k8s.io";

     

       38
       45
        
                   k8s-app = "kubernetes-dashboard";

     

       39
       39
       -
                   version = version;

     

       46
       46
       +
                   version = cfg.version;

     

       40
       47
        
                   "kubernetes.io/cluster-service" = "true";

     

       41
       48
        
                   "addonmanager.kubernetes.io/mode" = "Reconcile";

     

       42
       49
        
                 };

     
···

       52
       59
        
                     labels = {

     

       53
       60
        
                       k8s-addon = "kubernetes-dashboard.addons.k8s.io";

     

       54
       61
        
                       k8s-app = "kubernetes-dashboard";

     

       55
       55
       -
                       version = version;

     

       62
       62
       +
                       version = cfg.version;

     

       56
       63
        
                       "kubernetes.io/cluster-service" = "true";

     

       57
       64
        
                     };

     

       58
       65
        
                     annotations = {

     
···

       63
       70
        
                     priorityClassName = "system-cluster-critical";

     

       64
       71
        
                     containers = [{

     

       65
       72
        
                       name = "kubernetes-dashboard";

     

       66
       66
       -
                       image = "${name}:${version}";

     

       73
       73
       +
                       image = with cfg.image; "${imageName}:${finalImageTag}";

     

       67
       74
        
                       ports = [{

     

       68
       75
        
                         containerPort = 8443;

     

       69
       76
        
                         protocol = "TCP";

+28 -19

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

···

       73
       73
        
         mkKubeConfigOptions = prefix: {

     

       74
       74
        
           server = mkOption {

     

       75
       75
        
             description = "${prefix} kube-apiserver server address.";

     

       76
       76
       -
             default = "http://${cfg.apiserver.address}:${toString cfg.apiserver.port}";

     

       76
       76
       +
             default = "http://${if cfg.apiserver.advertiseAddress != null

     

       77
       77
       +
                                 then cfg.apiserver.advertiseAddress

     

       78
       78
       +
                                 else "127.0.0.1"}:${toString cfg.apiserver.port}";

     

       77
       79
        
             type = types.str;

     

       78
       80
        
           };

     

       79
       81
        
       

     
···

       103
       105
        
           keyFile = mkDefault cfg.kubeconfig.keyFile;

     

       104
       106
        
         };

     

       105
       107
        
       

     

       106
       106
       -
         cniConfig = pkgs.buildEnv {

     

       107
       107
       -
           name = "kubernetes-cni-config";

     

       108
       108
       -
           paths = imap (i: entry:

     

       109
       109
       -
             pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry)

     

       110
       110
       -
           ) cfg.kubelet.cni.config;

     

       111
       111
       -
         };

     

       108
       108
       +
         cniConfig =

     

       109
       109
       +
           if cfg.kubelet.cni.config != [] && !(isNull cfg.kubelet.cni.configDir) then

     

       110
       110
       +
             throw "Verbatim CNI-config and CNI configDir cannot both be set."

     

       111
       111
       +
           else if !(isNull cfg.kubelet.cni.configDir) then

     

       112
       112
       +
             cfg.kubelet.cni.configDir

     

       113
       113
       +
           else

     

       114
       114
       +
             (pkgs.buildEnv {

     

       115
       115
       +
               name = "kubernetes-cni-config";

     

       116
       116
       +
               paths = imap (i: entry:

     

       117
       117
       +
                 pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry)

     

       118
       118
       +
               ) cfg.kubelet.cni.config;

     

       119
       119
       +
             });

     

       112
       120
        
       

     

       113
       121
        
         manifests = pkgs.buildEnv {

     

       114
       122
        
           name = "kubernetes-manifests";

     
···

       244
       252
        
               type = types.listOf types.str;

     

       245
       253
        
             };

     

       246
       254
        
       

     

       247
       247
       -
             address = mkOption {

     

       248
       248
       -
               description = "Kubernetes apiserver listening address.";

     

       249
       249
       -
               default = "127.0.0.1";

     

       250
       250
       -
               type = types.str;

     

       251
       251
       -
             };

     

       252
       252
       -
       

     

       253
       253
       -
             publicAddress = mkOption {

     

       255
       255
       +
             bindAddress = mkOption {

     

       254
       256
        
               description = ''

     

       255
       255
       -
                 Kubernetes apiserver public listening address used for read only and

     

       256
       256
       -
                 secure port.

     

       257
       257
       +
                 The IP address on which to listen for the --secure-port port.

     

       258
       258
       +
                 The associated interface(s) must be reachable by the rest

     

       259
       259
       +
                 of the cluster, and by CLI/web clients.

     

       257
       260
        
               '';

     

       258
       258
       -
               default = cfg.apiserver.address;

     

       261
       261
       +
               default = "0.0.0.0";

     

       259
       262
        
               type = types.str;

     

       260
       263
        
             };

     

       261
       264
        
       

     
···

       670
       673
        
                   }]

     

       671
       674
        
                 '';

     

       672
       675
        
               };

     

       676
       676
       +
       

     

       677
       677
       +
               configDir = mkOption {

     

       678
       678
       +
                 description = "Path to Kubernetes CNI configuration directory.";

     

       679
       679
       +
                 type = types.nullOr types.path;

     

       680
       680
       +
                 default = null;

     

       681
       681
       +
               };

     

       673
       682
        
             };

     

       674
       683
        
       

     

       675
       684
        
             manifests = mkOption {

     
···

       892
       901
        
       

     

       893
       902
        
           (mkIf cfg.apiserver.enable {

     

       894
       903
        
             systemd.services.kube-apiserver = {

     

       895
       895
       -
               description = "Kubernetes Kubelet Service";

     

       904
       904
       +
               description = "Kubernetes APIServer Service";

     

       896
       905
        
               wantedBy = [ "kubernetes.target" ];

     

       897
       906
        
               after = [ "network.target" "docker.service" ];

     

       898
       907
        
               serviceConfig = {

     
···

       906
       915
        
                   ${optionalString (cfg.etcd.keyFile != null)

     

       907
       916
        
                     "--etcd-keyfile=${cfg.etcd.keyFile}"} \

     

       908
       917
        
                   --insecure-port=${toString cfg.apiserver.port} \

     

       909
       909
       -
                   --bind-address=${toString cfg.apiserver.address} \

     

       918
       918
       +
                   --bind-address=${cfg.apiserver.bindAddress} \

     

       910
       919
        
                   ${optionalString (cfg.apiserver.advertiseAddress != null)

     

       911
       920
        
                     "--advertise-address=${cfg.apiserver.advertiseAddress}"} \

     

       912
       921
        
                   --allow-privileged=${boolToString cfg.apiserver.allowPrivileged}\

+40 -29

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

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         version = "1.14.10";

     

       7
       7
       -
       

     

       8
       8
       -
         k8s-dns-kube-dns = pkgs.dockerTools.pullImage {

     

       9
       9
       -
           imageName = "k8s.gcr.io/k8s-dns-kube-dns-amd64";

     

       10
       10
       -
           imageDigest = "sha256:b99fc3eee2a9f052f7eb4cc00f15eb12fc405fa41019baa2d6b79847ae7284a8";

     

       11
       11
       -
           finalImageTag = version;

     

       12
       12
       -
           sha256 = "0x583znk9smqn0fix7ld8sm5jgaxhqhx3fq97b1wkqm7iwhvl3pj";

     

       13
       13
       -
         };

     

       14
       14
       -
       

     

       15
       15
       -
         k8s-dns-dnsmasq-nanny = pkgs.dockerTools.pullImage {

     

       16
       16
       -
           imageName = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64";

     

       17
       17
       -
           imageDigest = "sha256:bbb2a290a568125b3b996028958eb773f33b5b87a6b37bf38a28f8b62dddb3c8";

     

       18
       18
       -
           finalImageTag = version;

     

       19
       19
       -
           sha256 = "1fihml7s2mfwgac51cbqpylkwbivc8nyhgi4vb820s83zvl8a6y1";

     

       20
       20
       -
         };

     

       21
       21
       -
       

     

       22
       22
       -
         k8s-dns-sidecar = pkgs.dockerTools.pullImage {

     

       23
       23
       -
           imageName = "k8s.gcr.io/k8s-dns-sidecar-amd64";

     

       24
       24
       -
           imageDigest = "sha256:4f1ab957f87b94a5ec1edc26fae50da2175461f00afecf68940c4aa079bd08a4";

     

       25
       25
       -
           finalImageTag = version;

     

       26
       26
       -
           sha256 = "08l1bv5jgrhvjzpqpbinrkgvv52snc4fzyd8ya9v18ns2klyz7m0";

     

       27
       27
       -
         };

     

       28
       28
       -
       

     

       29
       7
        
         cfg = config.services.kubernetes.addons.dns;

     

       30
       8
        
       in {

     

       31
       9
        
         options.services.kubernetes.addons.dns = {

     
···

       48
       26
        
             default = "cluster.local";

     

       49
       27
        
             type = types.str;

     

       50
       28
        
           };

     

       29
       29
       +
       

     

       30
       30
       +
           kube-dns = mkOption {

     

       31
       31
       +
             description = "Docker image to seed for the kube-dns main container.";

     

       32
       32
       +
             type = types.attrs;

     

       33
       33
       +
             default = {

     

       34
       34
       +
               imageName = "k8s.gcr.io/k8s-dns-kube-dns-amd64";

     

       35
       35
       +
               imageDigest = "sha256:b99fc3eee2a9f052f7eb4cc00f15eb12fc405fa41019baa2d6b79847ae7284a8";

     

       36
       36
       +
               finalImageTag = version;

     

       37
       37
       +
               sha256 = "0x583znk9smqn0fix7ld8sm5jgaxhqhx3fq97b1wkqm7iwhvl3pj";

     

       38
       38
       +
             };

     

       39
       39
       +
           };

     

       40
       40
       +
       

     

       41
       41
       +
           dnsmasq-nanny = mkOption {

     

       42
       42
       +
             description = "Docker image to seed for the kube-dns dnsmasq container.";

     

       43
       43
       +
             type = types.attrs;

     

       44
       44
       +
             default = {

     

       45
       45
       +
               imageName = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64";

     

       46
       46
       +
               imageDigest = "sha256:bbb2a290a568125b3b996028958eb773f33b5b87a6b37bf38a28f8b62dddb3c8";

     

       47
       47
       +
               finalImageTag = version;

     

       48
       48
       +
               sha256 = "1fihml7s2mfwgac51cbqpylkwbivc8nyhgi4vb820s83zvl8a6y1";

     

       49
       49
       +
             };

     

       50
       50
       +
           };

     

       51
       51
       +
       

     

       52
       52
       +
           sidecar = mkOption {

     

       53
       53
       +
             description = "Docker image to seed for the kube-dns sidecar container.";

     

       54
       54
       +
             type = types.attrs;

     

       55
       55
       +
             default = {

     

       56
       56
       +
               imageName = "k8s.gcr.io/k8s-dns-sidecar-amd64";

     

       57
       57
       +
               imageDigest = "sha256:4f1ab957f87b94a5ec1edc26fae50da2175461f00afecf68940c4aa079bd08a4";

     

       58
       58
       +
               finalImageTag = version;

     

       59
       59
       +
               sha256 = "08l1bv5jgrhvjzpqpbinrkgvv52snc4fzyd8ya9v18ns2klyz7m0";

     

       60
       60
       +
             };

     

       61
       61
       +
           };

     

       51
       62
        
         };

     

       52
       63
        
       

     

       53
       64
        
         config = mkIf cfg.enable {

     

       54
       54
       -
           services.kubernetes.kubelet.seedDockerImages = [

     

       55
       55
       -
             k8s-dns-kube-dns

     

       56
       56
       -
             k8s-dns-dnsmasq-nanny

     

       57
       57
       -
             k8s-dns-sidecar

     

       65
       65
       +
           services.kubernetes.kubelet.seedDockerImages = with pkgs.dockerTools; [

     

       66
       66
       +
             (pullImage cfg.kube-dns)

     

       67
       67
       +
             (pullImage cfg.dnsmasq-nanny)

     

       68
       68
       +
             (pullImage cfg.sidecar)

     

       58
       69
        
           ];

     

       59
       70
        
       

     

       60
       71
        
           services.kubernetes.addonManager.addons = {

     
···

       88
       99
        
                     containers = [

     

       89
       100
        
                       {

     

       90
       101
        
                         name = "kubedns";

     

       91
       91
       -
                         image = "k8s.gcr.io/k8s-dns-kube-dns-amd64:${version}";

     

       102
       102
       +
                         image = with cfg.kube-dns; "${imageName}:${finalImageTag}";

     

       92
       103
        
                         resources = {

     

       93
       104
        
                           limits.memory = "170Mi";

     

       94
       105
        
                           requests = {

     
···

       154
       165
        
                       }

     

       155
       166
        
                       {

     

       156
       167
        
                         name = "dnsmasq";

     

       157
       157
       -
                         image = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:${version}";

     

       168
       168
       +
                         image = with cfg.dnsmasq-nanny; "${imageName}:${finalImageTag}";

     

       158
       169
        
                         livenessProbe = {

     

       159
       170
        
                           httpGet = {

     

       160
       171
        
                             path = "/healthcheck/dnsmasq";

     
···

       206
       217
        
                       }

     

       207
       218
        
                       {

     

       208
       219
        
                         name = "sidecar";

     

       209
       209
       -
                         image = "k8s.gcr.io/k8s-dns-sidecar-amd64:${version}";

     

       220
       220
       +
                         image = with cfg.sidecar; "${imageName}:${finalImageTag}";

     

       210
       221
        
                         livenessProbe = {

     

       211
       222
        
                           httpGet = {

     

       212
       223
        
                             path = "/metrics";