diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-26 19:01:18 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-26 19:01:18 +0300 |
| commit | 2760b2446242e7873962e5e6548bee95dfe35aff (patch) | |
| tree | 86d929e5c62e2a7054d6872adad7889a595a1bda /nixos/tests | |
| parent | 840e430744013afa1e5df95173977e070b6edfa1 (diff) | |
| parent | 59c09a52f2793bc31a68742082d8a89ca4795a8f (diff) | |
| download | nixlib-2760b2446242e7873962e5e6548bee95dfe35aff.tar nixlib-2760b2446242e7873962e5e6548bee95dfe35aff.tar.gz nixlib-2760b2446242e7873962e5e6548bee95dfe35aff.tar.bz2 nixlib-2760b2446242e7873962e5e6548bee95dfe35aff.tar.lz nixlib-2760b2446242e7873962e5e6548bee95dfe35aff.tar.xz nixlib-2760b2446242e7873962e5e6548bee95dfe35aff.tar.zst nixlib-2760b2446242e7873962e5e6548bee95dfe35aff.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/kubernetes/base.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/kubernetes/kubernetes-common.nix | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index 27b99aacab7d..e4bc5b326d34 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -24,7 +24,7 @@ let { config, pkgs, lib, nodes, ... }: mkMerge [ { - virtualisation.memorySize = mkDefault 768; + virtualisation.memorySize = mkDefault 1536; virtualisation.diskSize = mkDefault 4096; networking = { inherit domain extraHosts; diff --git a/nixos/tests/kubernetes/kubernetes-common.nix b/nixos/tests/kubernetes/kubernetes-common.nix index ddf427e1b01a..125c176f1132 100644 --- a/nixos/tests/kubernetes/kubernetes-common.nix +++ b/nixos/tests/kubernetes/kubernetes-common.nix @@ -6,7 +6,6 @@ let featureGates = ["AllAlpha"]; flannel.enable = true; addons.dashboard.enable = true; - verbose = true; caFile = "${certs.master}/ca.pem"; apiserver = { |