diff --git a/modules/k3s-airgap-images.nix b/modules/k3s-airgap-images.nix index 80d8b52..ae8d250 100644 --- a/modules/k3s-airgap-images.nix +++ b/modules/k3s-airgap-images.nix @@ -9,15 +9,15 @@ stdenv.mkDerivation rec { in { x86_64-linux = fetchurl { url = "https://github.com/rancher/k3s/releases/download/v${version}/k3s-airgap-images-amd64.tar"; - sha256 = "1fiq211vvsnxdzfx9ybb28yyyif08zls7bx3kl8xmv4hrf8xza4i"; + sha256 = "sha256-6kQmlpNV+4cU1Kn5lyZhutXYK5qYdey0jubzYRRF3vA="; }; aarch64-linux = fetchurl { url = "https://github.com/rancher/k3s/releases/download/v${version}/k3s-airgap-images-arm64.tar"; - sha256 = "1xaggiw5h0zndgvdikg7babwd9903n9vabp1dkh53g8al812sfnd"; + sha256 = "sha256-OlqqdAmBN+azT0kfjZ/Bd0CFbbW5hTg9/8T9U05N0zE="; }; armv7l-linux = fetchurl { url = "https://github.com/rancher/k3s/releases/download/v${version}/k3s-airgap-images-arm.tar"; - sha256 = "1v90wyvj47hz4nphdq7isfbl758yrzg4bx7c73ghmlgvr6p9cdzb"; + sha256 = "sha256-j/ARBtHDnfRk/7BpOvavoHe7L5dmsCZe5+wuZ5t4V/k="; }; }.${stdenv.hostPlatform.system} or throwError; diff --git a/modules/testing.nix b/modules/testing.nix index e247f8a..712bd38 100644 --- a/modules/testing.nix +++ b/modules/testing.nix @@ -192,11 +192,13 @@ let networking.primaryIPAddress = mkForce "192.168.1.1"; }; - testScript = '' - startAll; + skipLint = true; - $kube->waitForUnit('k3s.service'); - $kube->waitUntilSucceeds("kubectl get node kube | grep -w Ready"); + testScript = '' + start_all() + + kube.wait_for_unit('k3s.service') + kube.wait_until_succeeds("kubectl get node kube | grep -w Ready") ${testScript} ''; diff --git a/tests/k8s/deployment-k3s.nix b/tests/k8s/deployment-k3s.nix index 2cd6c78..738088d 100644 --- a/tests/k8s/deployment-k3s.nix +++ b/tests/k8s/deployment-k3s.nix @@ -32,11 +32,11 @@ in { services.kubernetes.kubelet.seedDockerImages = config.docker.export; }; testScript = '' - $kube->waitUntilSucceeds("kubectl apply -f ${config.kubernetes.result}"); + kube.wait_until_succeeds("kubectl apply -f ${config.kubernetes.result}") - $kube->succeed("kubectl get deployment | grep -i nginx"); - $kube->waitUntilSucceeds("kubectl get deployment -o go-template nginx --template={{.status.readyReplicas}} | grep 10"); - $kube->waitUntilSucceeds("curl http://nginx.default.svc.cluster.local | grep -i hello"); + kube.succeed("kubectl get deployment | grep -i nginx") + kube.wait_until_succeeds("kubectl get deployment -o go-template nginx --template={{.status.readyReplicas}} | grep 10") + kube.wait_until_succeeds("curl http://nginx.default.svc.cluster.local | grep -i hello") ''; };