summary refs log tree commit diff
path: root/nixos/tests/kubernetes/dns.nix
diff options
context:
space:
mode:
authorJohan Thomsen <jth@dbc.dk>2018-07-22 13:14:20 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2019-02-20 21:08:01 +0100
commite2380e79e191cdcb92790fd02cf57c47067718b1 (patch)
treee10595f11a1db95b68a880752ed2595d711aa703 /nixos/tests/kubernetes/dns.nix
parent5a4c8092c008f5ae64a9b2bc904242819fb2acfb (diff)
downloadnixpkgs-e2380e79e191cdcb92790fd02cf57c47067718b1.tar
nixpkgs-e2380e79e191cdcb92790fd02cf57c47067718b1.tar.gz
nixpkgs-e2380e79e191cdcb92790fd02cf57c47067718b1.tar.bz2
nixpkgs-e2380e79e191cdcb92790fd02cf57c47067718b1.tar.lz
nixpkgs-e2380e79e191cdcb92790fd02cf57c47067718b1.tar.xz
nixpkgs-e2380e79e191cdcb92790fd02cf57c47067718b1.tar.zst
nixpkgs-e2380e79e191cdcb92790fd02cf57c47067718b1.zip
nixos/kubernetes: major module refactor
- All kubernetes components have been seperated into different files
- All TLS-enabled ports have been deprecated and disabled by default
- EasyCert option added to support automatic cluster PKI-bootstrap
- RBAC has been enforced for all cluster components by default
- NixOS kubernetes test cases make use of easyCerts to setup PKI
Diffstat (limited to 'nixos/tests/kubernetes/dns.nix')
-rw-r--r--nixos/tests/kubernetes/dns.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix
index f25ea5b9ed8..42eafcfc195 100644
--- a/nixos/tests/kubernetes/dns.nix
+++ b/nixos/tests/kubernetes/dns.nix
@@ -71,7 +71,7 @@ let
 
   base = {
     name = "dns";
-    inherit domain certs extraConfiguration;
+    inherit domain extraConfiguration;
   };
 
   singleNodeTest = {
@@ -99,8 +99,11 @@ let
 
   multiNodeTest = {
     test = ''
+      # Node token exchange
+      $machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret");
+      $machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join");
+
       # prepare machines for test
-      $machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready");
       $machine1->waitUntilSucceeds("kubectl get node machine2.${domain} | grep -w Ready");
       $machine2->execute("docker load < ${redisImage}");
       $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}");