cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #150545 from johanot/fix-k8s-tests

Browse source 
nixos/kubernetes: drop tty and stdin for execs in test pods
This commit is contained in:
zowoq 2021-12-14 12:53:10 +10:00 committed by GitHub
commit 9a98c6c69c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/tests/kubernetes/default.nix
View file

@ -10,8 +10,6 @@ in
{ {
dns-single-node = dns.singlenode.test; dns-single-node = dns.singlenode.test;
dns-multi-node = dns.multinode.test; dns-multi-node = dns.multinode.test;
# timed out: https://hydra.nixos.org/build/160710933 rbac-single-node = rbac.singlenode.test;
#rbac-single-node = rbac.singlenode.test; rbac-multi-node = rbac.multinode.test;
# timed out: https://hydra.nixos.org/build/160711286
#rbac-multi-node = rbac.multinode.test;
} }

4
nixos/tests/kubernetes/dns.nix
View file

@ -100,7 +100,7 @@ let
machine1.succeed("host redis.default.svc.cluster.local") machine1.succeed("host redis.default.svc.cluster.local")
# check dns inside the container # 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") machine2.succeed("host redis.default.svc.cluster.local")
# check dns inside the container # 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 { in {

12
nixos/tests/kubernetes/rbac.nix
View file

@ -115,9 +115,9 @@ let
machine1.wait_until_succeeds("kubectl get pod kubectl | grep Running") machine1.wait_until_succeeds("kubectl get pod kubectl | grep Running")
machine1.wait_until_succeeds("kubectl exec -ti kubectl -- kubectl get pods") machine1.wait_until_succeeds("kubectl exec kubectl -- kubectl get pods")
machine1.fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json") machine1.fail("kubectl exec kubectl -- kubectl create -f /kubectl-pod-2.json")
machine1.fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl") 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 get pod kubectl | grep Running")
machine1.wait_until_succeeds("kubectl exec -ti kubectl -- kubectl get pods") machine1.wait_until_succeeds("kubectl exec kubectl -- kubectl get pods")
machine1.fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json") machine1.fail("kubectl exec kubectl -- kubectl create -f /kubectl-pod-2.json")
machine1.fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl") machine1.fail("kubectl exec kubectl -- kubectl delete pods -l name=kubectl")
''; '';
}; };