summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohan Thomsen <jth@dbc.dk>2021-12-13 15:35:22 +0100
committerzowoq <59103226+zowoq@users.noreply.github.com>2021-12-14 11:02:07 +1000
commit282b303e83e37c8e1cc6472824c8ff40bda21bd6 (patch)
tree64a77876a76406eed458911d2a7b5e71cff3a062
parent69958994ab2c4c41f82db658ae6333b91079bcf6 (diff)
downloadnixpkgs-282b303e83e37c8e1cc6472824c8ff40bda21bd6.tar
nixpkgs-282b303e83e37c8e1cc6472824c8ff40bda21bd6.tar.gz
nixpkgs-282b303e83e37c8e1cc6472824c8ff40bda21bd6.tar.bz2
nixpkgs-282b303e83e37c8e1cc6472824c8ff40bda21bd6.tar.lz
nixpkgs-282b303e83e37c8e1cc6472824c8ff40bda21bd6.tar.xz
nixpkgs-282b303e83e37c8e1cc6472824c8ff40bda21bd6.tar.zst
nixpkgs-282b303e83e37c8e1cc6472824c8ff40bda21bd6.zip
nixos/kubernetes: drop tty and stdin for execs in test pods
-rw-r--r--nixos/tests/kubernetes/dns.nix4
-rw-r--r--nixos/tests/kubernetes/rbac.nix12
2 files changed, 8 insertions, 8 deletions
diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix
index b6cd811c5ae..79e35bfec5a 100644
--- a/nixos/tests/kubernetes/dns.nix
+++ b/nixos/tests/kubernetes/dns.nix
@@ -100,7 +100,7 @@ let
       machine1.succeed("host redis.default.svc.cluster.local")
 
       # check dns inside the container
-      machine1.succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local")
+      machine1.succeed("kubectl exec probe -- /bin/host redis.default.svc.cluster.local")
     '';
   };
 
@@ -142,7 +142,7 @@ let
       machine2.succeed("host redis.default.svc.cluster.local")
 
       # check dns inside the container
-      machine1.succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local")
+      machine1.succeed("kubectl exec probe -- /bin/host redis.default.svc.cluster.local")
     '';
   };
 in {
diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix
index 3fc8ed0fbe3..99194a69c26 100644
--- a/nixos/tests/kubernetes/rbac.nix
+++ b/nixos/tests/kubernetes/rbac.nix
@@ -115,9 +115,9 @@ let
 
       machine1.wait_until_succeeds("kubectl get pod kubectl | grep Running")
 
-      machine1.wait_until_succeeds("kubectl exec -ti kubectl -- kubectl get pods")
-      machine1.fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json")
-      machine1.fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl")
+      machine1.wait_until_succeeds("kubectl exec kubectl -- kubectl get pods")
+      machine1.fail("kubectl exec kubectl -- kubectl create -f /kubectl-pod-2.json")
+      machine1.fail("kubectl exec kubectl -- kubectl delete pods -l name=kubectl")
     '';
   };
 
@@ -152,9 +152,9 @@ let
 
       machine1.wait_until_succeeds("kubectl get pod kubectl | grep Running")
 
-      machine1.wait_until_succeeds("kubectl exec -ti kubectl -- kubectl get pods")
-      machine1.fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json")
-      machine1.fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl")
+      machine1.wait_until_succeeds("kubectl exec kubectl -- kubectl get pods")
+      machine1.fail("kubectl exec kubectl -- kubectl create -f /kubectl-pod-2.json")
+      machine1.fail("kubectl exec kubectl -- kubectl delete pods -l name=kubectl")
     '';
   };