commit 0630233afa6440473f0c04825f252c508e8c534b · pyrox.dev/nixpkgs

+2 -2

nixos/modules/services/misc/etcd.nix

···

       28
       28
        
       

     

       29
       29
        
           listenClientUrls = mkOption {

     

       30
       30
        
             description = "Etcd list of URLs to listen on for client traffic.";

     

       31
       31
       -
             default = ["http://localhost:2379"];

     

       31
       31
       +
             default = ["http://127.0.0.1:2379"];

     

       32
       32
        
             type = types.listOf types.str;

     

       33
       33
        
           };

     

       34
       34
        
       

     

       35
       35
        
           listenPeerUrls = mkOption {

     

       36
       36
        
             description = "Etcd list of URLs to listen on for peer traffic.";

     

       37
       37
       -
             default = ["http://localhost:2380"];

     

       37
       37
       +
             default = ["http://127.0.0.1:2380"];

     

       38
       38
        
             type = types.listOf types.str;

     

       39
       39
        
           };

     

       40
       40

+128

nixos/tests/etcd-cluster.nix

···

       1
       1
       +
       # This test runs simple etcd cluster

     

       2
       2
       +
       

     

       3
       3
       +
       import ./make-test.nix ({ pkgs, ... } : let

     

       4
       4
       +
         certs = pkgs.runCommand "certs" {

     

       5
       5
       +
           buildInputs = [pkgs.openssl];

     

       6
       6
       +
         } ''

     

       7
       7
       +
           mkdir -p $out

     

       8
       8
       +
           openssl genrsa -out $out/ca-key.pem 2048

     

       9
       9
       +
           openssl req -x509 -new -nodes -key $out/ca-key.pem -days 10000 -out $out/ca.pem -subj "/CN=etcd-ca"

     

       10
       10
       +
       

     

       11
       11
       +
           cat << EOF > openssl.cnf

     

       12
       12
       +
           ions = v3_req

     

       13
       13
       +
           distinguished_name = req_distinguished_name

     

       14
       14
       +
           [req_distinguished_name]

     

       15
       15
       +
           [ v3_req ]

     

       16
       16
       +
           basicConstraints = CA:FALSE

     

       17
       17
       +
           keyUsage = digitalSignature, keyEncipherment

     

       18
       18
       +
           extendedKeyUsage = serverAuth

     

       19
       19
       +
           subjectAltName = @alt_names

     

       20
       20
       +
           [alt_names]

     

       21
       21
       +
           DNS.1 = node1

     

       22
       22
       +
           DNS.2 = node2

     

       23
       23
       +
           DNS.3 = node3

     

       24
       24
       +
           IP.1 = 127.0.0.1

     

       25
       25
       +
           EOF

     

       26
       26
       +
       

     

       27
       27
       +
           openssl genrsa -out $out/etcd-key.pem 2048

     

       28
       28
       +
           openssl req -new -key $out/etcd-key.pem -out etcd.csr -subj "/CN=etcd" -config openssl.cnf

     

       29
       29
       +
           openssl x509 -req -in etcd.csr -CA $out/ca.pem -CAkey $out/ca-key.pem -CAcreateserial -out $out/etcd.pem -days 365 -extensions v3_req -extfile openssl.cnf

     

       30
       30
       +
       

     

       31
       31
       +
           cat << EOF > client-openssl.cnf

     

       32
       32
       +
           ions = v3_req

     

       33
       33
       +
           distinguished_name = req_distinguished_name

     

       34
       34
       +
           [req_distinguished_name]

     

       35
       35
       +
           [ v3_req ]

     

       36
       36
       +
           basicConstraints = CA:FALSE

     

       37
       37
       +
           keyUsage = digitalSignature, keyEncipherment

     

       38
       38
       +
           extendedKeyUsage = clientAuth

     

       39
       39
       +
           EOF

     

       40
       40
       +
       

     

       41
       41
       +
           openssl genrsa -out $out/etcd-client-key.pem 2048

     

       42
       42
       +
           openssl req -new -key $out/etcd-client-key.pem -out etcd-client.csr -subj "/CN=etcd-client" -config client-openssl.cnf

     

       43
       43
       +
           openssl x509 -req -in etcd-client.csr -CA $out/ca.pem -CAkey $out/ca-key.pem -CAcreateserial -out $out/etcd-client.pem -days 365 -extensions v3_req -extfile client-openssl.cnf

     

       44
       44
       +
         '';

     

       45
       45
       +
       

     

       46
       46
       +
         nodeConfig = {

     

       47
       47
       +
           services = {

     

       48
       48
       +
             etcd = {

     

       49
       49
       +
               enable = true;

     

       50
       50
       +
               keyFile = "${certs}/etcd-key.pem";

     

       51
       51
       +
               certFile = "${certs}/etcd.pem";

     

       52
       52
       +
               trustedCaFile = "${certs}/ca.pem";

     

       53
       53
       +
               peerClientCertAuth = true;

     

       54
       54
       +
               listenClientUrls = ["https://127.0.0.1:2379"];

     

       55
       55
       +
               listenPeerUrls = ["https://0.0.0.0:2380"];

     

       56
       56
       +
             };

     

       57
       57
       +
           };

     

       58
       58
       +
       

     

       59
       59
       +
           environment.variables = {

     

       60
       60
       +
             ETCDCTL_CERT_FILE = "${certs}/etcd-client.pem";

     

       61
       61
       +
             ETCDCTL_KEY_FILE = "${certs}/etcd-client-key.pem";

     

       62
       62
       +
             ETCDCTL_CA_FILE = "${certs}/ca.pem";

     

       63
       63
       +
             ETCDCTL_PEERS = "https://127.0.0.1:2379";

     

       64
       64
       +
           };

     

       65
       65
       +
       

     

       66
       66
       +
           networking.firewall.allowedTCPPorts = [ 2380 ];

     

       67
       67
       +
         };

     

       68
       68
       +
       in {

     

       69
       69
       +
         name = "etcd";

     

       70
       70
       +
       

     

       71
       71
       +
         meta = with pkgs.stdenv.lib.maintainers; {

     

       72
       72
       +
           maintainers = [ offline ];

     

       73
       73
       +
         };

     

       74
       74
       +
       

     

       75
       75
       +
         nodes = {

     

       76
       76
       +
           node1 = { config, pkgs, nodes, ... }: {

     

       77
       77
       +
             require = [nodeConfig];

     

       78
       78
       +
             services.etcd = {

     

       79
       79
       +
               initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"];

     

       80
       80
       +
               initialAdvertisePeerUrls = ["https://node1:2380"];

     

       81
       81
       +
             };

     

       82
       82
       +
           };

     

       83
       83
       +
       

     

       84
       84
       +
           node2 = { config, pkgs, ... }: {

     

       85
       85
       +
             require = [nodeConfig];

     

       86
       86
       +
             services.etcd = {

     

       87
       87
       +
               initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"];

     

       88
       88
       +
               initialAdvertisePeerUrls = ["https://node2:2380"];

     

       89
       89
       +
             };

     

       90
       90
       +
           };

     

       91
       91
       +
       

     

       92
       92
       +
           node3 = { config, pkgs, ... }: {

     

       93
       93
       +
             require = [nodeConfig];

     

       94
       94
       +
             services.etcd = {

     

       95
       95
       +
               initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380" "node3=https://node3:2380"];

     

       96
       96
       +
               initialAdvertisePeerUrls = ["https://node3:2380"];

     

       97
       97
       +
               initialClusterState = "existing";

     

       98
       98
       +
             };

     

       99
       99
       +
           };

     

       100
       100
       +
         };

     

       101
       101
       +
       

     

       102
       102
       +
         testScript = ''

     

       103
       103
       +
           subtest "should start etcd cluster", sub {

     

       104
       104
       +
             $node1->start();

     

       105
       105
       +
             $node2->start();

     

       106
       106
       +
             $node1->waitForUnit("etcd.service");

     

       107
       107
       +
             $node2->waitForUnit("etcd.service");

     

       108
       108
       +
             $node2->waitUntilSucceeds("etcdctl cluster-health");

     

       109
       109
       +
             $node1->succeed("etcdctl set /foo/bar 'Hello world'");

     

       110
       110
       +
             $node2->succeed("etcdctl get /foo/bar | grep 'Hello world'");

     

       111
       111
       +
           };

     

       112
       112
       +
       

     

       113
       113
       +
           subtest "should add another member", sub {

     

       114
       114
       +
             $node1->succeed("etcdctl member add node3 https://node3:2380");

     

       115
       115
       +
             $node3->start();

     

       116
       116
       +
             $node3->waitForUnit("etcd.service");

     

       117
       117
       +
             $node3->waitUntilSucceeds("etcdctl member list | grep 'node3'");

     

       118
       118
       +
             $node3->succeed("etcdctl cluster-health");

     

       119
       119
       +
           };

     

       120
       120
       +
       

     

       121
       121
       +
           subtest "should survive member crash", sub {

     

       122
       122
       +
             $node3->crash;

     

       123
       123
       +
             $node1->succeed("etcdctl cluster-health");

     

       124
       124
       +
             $node1->succeed("etcdctl set /foo/bar 'Hello degraded world'");

     

       125
       125
       +
             $node1->succeed("etcdctl get /foo/bar | grep 'Hello degraded world'");

     

       126
       126
       +
           };

     

       127
       127
       +
         '';

     

       128
       128
       +
       })

+11 -112

nixos/tests/etcd.nix

···

       1
       1
       -
       # This test runs simple etcd cluster

     

       2
       2
       -
       

     

       3
       3
       -
       import ./make-test.nix ({ pkgs, ... } : let

     

       4
       4
       -
         certs = pkgs.runCommand "certs" {

     

       5
       5
       -
           buildInputs = [pkgs.openssl];

     

       6
       6
       -
         } ''

     

       7
       7
       -
           mkdir -p $out

     

       8
       8
       -
           openssl genrsa -out $out/ca-key.pem 2048

     

       9
       9
       -
           openssl req -x509 -new -nodes -key $out/ca-key.pem -days 10000 -out $out/ca.pem -subj "/CN=etcd-ca"

     

       10
       10
       -
       

     

       11
       11
       -
           cat << EOF > openssl.cnf

     

       12
       12
       -
           ions = v3_req

     

       13
       13
       -
           distinguished_name = req_distinguished_name

     

       14
       14
       -
           [req_distinguished_name]

     

       15
       15
       -
           [ v3_req ]

     

       16
       16
       -
           basicConstraints = CA:FALSE

     

       17
       17
       -
           keyUsage = digitalSignature, keyEncipherment

     

       18
       18
       -
           extendedKeyUsage = serverAuth

     

       19
       19
       -
           subjectAltName = @alt_names

     

       20
       20
       -
           [alt_names]

     

       21
       21
       -
           DNS.1 = node1

     

       22
       22
       -
           DNS.2 = node2

     

       23
       23
       -
           DNS.3 = node3

     

       24
       24
       -
           IP.1 = 127.0.0.1

     

       25
       25
       -
           EOF

     

       26
       26
       -
       

     

       27
       27
       -
           openssl genrsa -out $out/etcd-key.pem 2048

     

       28
       28
       -
           openssl req -new -key $out/etcd-key.pem -out etcd.csr -subj "/CN=etcd" -config openssl.cnf

     

       29
       29
       -
           openssl x509 -req -in etcd.csr -CA $out/ca.pem -CAkey $out/ca-key.pem -CAcreateserial -out $out/etcd.pem -days 365 -extensions v3_req -extfile openssl.cnf

     

       30
       30
       -
       

     

       31
       31
       -
           cat << EOF > client-openssl.cnf

     

       32
       32
       -
           ions = v3_req

     

       33
       33
       -
           distinguished_name = req_distinguished_name

     

       34
       34
       -
           [req_distinguished_name]

     

       35
       35
       -
           [ v3_req ]

     

       36
       36
       -
           basicConstraints = CA:FALSE

     

       37
       37
       -
           keyUsage = digitalSignature, keyEncipherment

     

       38
       38
       -
           extendedKeyUsage = clientAuth

     

       39
       39
       -
           EOF

     

       40
       40
       -
       

     

       41
       41
       -
           openssl genrsa -out $out/etcd-client-key.pem 2048

     

       42
       42
       -
           openssl req -new -key $out/etcd-client-key.pem -out etcd-client.csr -subj "/CN=etcd-client" -config client-openssl.cnf

     

       43
       43
       -
           openssl x509 -req -in etcd-client.csr -CA $out/ca.pem -CAkey $out/ca-key.pem -CAcreateserial -out $out/etcd-client.pem -days 365 -extensions v3_req -extfile client-openssl.cnf

     

       44
       44
       -
         '';

     

       1
       1
       +
       # This test runs simple etcd node

     

       45
       2
        
       

     

       46
       46
       -
         nodeConfig = {

     

       47
       47
       -
           services = {

     

       48
       48
       -
             etcd = {

     

       49
       49
       -
               enable = true;

     

       50
       50
       -
               keyFile = "${certs}/etcd-key.pem";

     

       51
       51
       -
               certFile = "${certs}/etcd.pem";

     

       52
       52
       -
               trustedCaFile = "${certs}/ca.pem";

     

       53
       53
       -
               peerClientCertAuth = true;

     

       54
       54
       -
               listenClientUrls = ["https://127.0.0.1:2379"];

     

       55
       55
       -
               listenPeerUrls = ["https://0.0.0.0:2380"];

     

       56
       56
       -
             };

     

       57
       57
       -
           };

     

       58
       58
       -
       

     

       59
       59
       -
           environment.variables = {

     

       60
       60
       -
             ETCDCTL_CERT_FILE = "${certs}/etcd-client.pem";

     

       61
       61
       -
             ETCDCTL_KEY_FILE = "${certs}/etcd-client-key.pem";

     

       62
       62
       -
             ETCDCTL_CA_FILE = "${certs}/ca.pem";

     

       63
       63
       -
             ETCDCTL_PEERS = "https://127.0.0.1:2379";

     

       64
       64
       -
           };

     

       65
       65
       -
       

     

       66
       66
       -
           networking.firewall.allowedTCPPorts = [ 2380 ];

     

       67
       67
       -
         };

     

       68
       68
       -
       in {

     

       3
       3
       +
       import ./make-test.nix ({ pkgs, ... } : {

     

       69
       4
        
         name = "etcd";

     

       70
       5
        
       

     

       71
       6
        
         meta = with pkgs.stdenv.lib.maintainers; {

     
···

       73
       8
        
         };

     

       74
       9
        
       

     

       75
       10
        
         nodes = {

     

       76
       76
       -
           node1 = { config, pkgs, nodes, ... }: {

     

       77
       77
       -
             require = [nodeConfig];

     

       78
       78
       -
             services.etcd = {

     

       79
       79
       -
               initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"];

     

       80
       80
       -
               initialAdvertisePeerUrls = ["https://node1:2380"];

     

       81
       81
       -
             };

     

       82
       82
       -
           };

     

       83
       83
       -
       

     

       84
       84
       -
           node2 = { config, pkgs, ... }: {

     

       85
       85
       -
             require = [nodeConfig];

     

       86
       86
       -
             services.etcd = {

     

       87
       87
       -
               initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"];

     

       88
       88
       -
               initialAdvertisePeerUrls = ["https://node2:2380"];

     

       89
       89
       -
             };

     

       90
       90
       -
           };

     

       91
       91
       -
       

     

       92
       92
       -
           node3 = { config, pkgs, ... }: {

     

       93
       93
       -
             require = [nodeConfig];

     

       94
       94
       -
             services.etcd = {

     

       95
       95
       -
               initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380" "node3=https://node3:2380"];

     

       96
       96
       -
               initialAdvertisePeerUrls = ["https://node3:2380"];

     

       97
       97
       -
               initialClusterState = "existing";

     

       98
       98
       -
             };

     

       11
       11
       +
           node = { config, pkgs, nodes, ... }: {

     

       12
       12
       +
             services.etcd.enable = true;

     

       99
       13
        
           };

     

       100
       14
        
         };

     

       101
       15
        
       

     

       102
       16
        
         testScript = ''

     

       103
       103
       -
           subtest "should start etcd cluster", sub {

     

       104
       104
       -
             $node1->start();

     

       105
       105
       -
             $node2->start();

     

       106
       106
       -
             $node1->waitForUnit("etcd.service");

     

       107
       107
       -
             $node2->waitForUnit("etcd.service");

     

       108
       108
       -
             $node2->waitUntilSucceeds("etcdctl cluster-health");

     

       109
       109
       -
             $node1->succeed("etcdctl set /foo/bar 'Hello world'");

     

       110
       110
       -
             $node2->succeed("etcdctl get /foo/bar | grep 'Hello world'");

     

       111
       111
       -
           };

     

       112
       112
       -
       

     

       113
       113
       -
           subtest "should add another member", sub {

     

       114
       114
       -
             $node1->succeed("etcdctl member add node3 https://node3:2380");

     

       115
       115
       -
             $node3->start();

     

       116
       116
       -
             $node3->waitForUnit("etcd.service");

     

       117
       117
       -
             $node3->waitUntilSucceeds("etcdctl member list | grep 'node3'");

     

       118
       118
       -
             $node3->succeed("etcdctl cluster-health");

     

       17
       17
       +
           subtest "should start etcd node", sub {

     

       18
       18
       +
             $node->start();

     

       19
       19
       +
             $node->waitForUnit("etcd.service");

     

       119
       20
        
           };

     

       120
       21
        
       

     

       121
       121
       -
           subtest "should survive member crash", sub {

     

       122
       122
       -
             $node3->crash;

     

       123
       123
       -
             $node1->succeed("etcdctl cluster-health");

     

       124
       124
       -
             $node1->succeed("etcdctl set /foo/bar 'Hello degraded world'");

     

       125
       125
       -
             $node1->succeed("etcdctl get /foo/bar | grep 'Hello degraded world'");

     

       126
       126
       -
           };

     

       22
       22
       +
           subtest "should write and read some values to etcd", sub {

     

       23
       23
       +
             $node->succeed("etcdctl set /foo/bar 'Hello world'");

     

       24
       24
       +
             $node->succeed("etcdctl get /foo/bar | grep 'Hello world'");

     

       25
       25
       +
           }

     

       127
       26
        
         '';

     

       128
       27
        
       })