forked from mirrors/nixpkgs
kubernetes: add passthru tests
Also defensively quote a path and reformat a comment to trigger the right review.
This commit is contained in:
parent
52168faa5b
commit
b9acd426df
|
@ -189,7 +189,7 @@ in
|
||||||
# manually paste it in place. Just symlink.
|
# manually paste it in place. Just symlink.
|
||||||
# otherwise, create the target file, ready for users to insert the token
|
# otherwise, create the target file, ready for users to insert the token
|
||||||
|
|
||||||
mkdir -p $(dirname ${certmgrAPITokenPath})
|
mkdir -p "$(dirname "${certmgrAPITokenPath}")"
|
||||||
if [ -f "${cfsslAPITokenPath}" ]; then
|
if [ -f "${cfsslAPITokenPath}" ]; then
|
||||||
ln -fs "${cfsslAPITokenPath}" "${certmgrAPITokenPath}"
|
ln -fs "${cfsslAPITokenPath}" "${certmgrAPITokenPath}"
|
||||||
else
|
else
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, rsync
|
, rsync
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
|
, nixosTests
|
||||||
|
|
||||||
, components ? [
|
, components ? [
|
||||||
"cmd/kubelet"
|
"cmd/kubelet"
|
||||||
|
@ -66,8 +67,8 @@ stdenv.mkDerivation rec {
|
||||||
install -D build/pause/linux/pause -t $pause/bin
|
install -D build/pause/linux/pause -t $pause/bin
|
||||||
installManPage docs/man/man1/*.[1-9]
|
installManPage docs/man/man1/*.[1-9]
|
||||||
|
|
||||||
# Unfortunately, kube-addons-main.sh only looks for the lib file in either the current working dir
|
# Unfortunately, kube-addons-main.sh only looks for the lib file in either the
|
||||||
# or in /opt. We have to patch this for now.
|
# current working dir or in /opt. We have to patch this for now.
|
||||||
substitute cluster/addons/addon-manager/kube-addons-main.sh $out/bin/kube-addons \
|
substitute cluster/addons/addon-manager/kube-addons-main.sh $out/bin/kube-addons \
|
||||||
--subst-var out
|
--subst-var out
|
||||||
|
|
||||||
|
@ -95,4 +96,11 @@ stdenv.mkDerivation rec {
|
||||||
maintainers = with maintainers; [ johanot offline saschagrunert ];
|
maintainers = with maintainers; [ johanot offline saschagrunert ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
passthru.tests = with nixosTests.kubernetes; {
|
||||||
|
dns-single-node = dns.singlenode;
|
||||||
|
dns-multi-node = dns.multinode;
|
||||||
|
rbac-single-node = rbac.singlenode;
|
||||||
|
rbac-multi-node = rbac.multinode;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue