github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up CI warnings/errors 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/3210/head
Brad Davidson 2020-12-14 14:31:08 -08:00 committed by MonzElmasry
parent c2c742cf92
commit 98756c8c21
No known key found for this signature in database
GPG Key ID: C22EA9B1FF03F73E
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/Dockerfile
View File

@ -17,5 +17,6 @@ VOLUME /var/lib/rancher/k3s
VOLUME /var/lib/cni VOLUME /var/lib/cni
VOLUME /var/log VOLUME /var/log
ENV PATH="$PATH:/bin/aux" ENV PATH="$PATH:/bin/aux"
ENV CRI_CONFIG_FILE="/var/lib/rancher/k3s/agent/etc/crictl.yaml"
ENTRYPOINT ["/bin/k3s"] ENTRYPOINT ["/bin/k3s"]
CMD ["agent"] CMD ["agent"]

10
scripts/test-helpers
View File

@ -3,7 +3,7 @@
# --- # ---
port-used() { port-used() {
(cat </dev/null >/dev/tcp/127.0.0.1/$1) 2>/dev/null netstat -tuna | grep -q ":$1 "
} }
export -f port-used export -f port-used
@ -133,9 +133,10 @@ dump-logs() {
[ "$name" ] || continue [ "$name" ] || continue
mkdir -p $node/logs mkdir -p $node/logs
local hostname=$(docker exec $name hostname) local hostname=$(docker exec $name hostname)
docker logs $name >$node/logs/system.log 2>&1
if [[ $name == k3s-* ]]; then
docker exec $server kubectl describe node/$hostname >$node/logs/kubectl-describe-node.txt docker exec $server kubectl describe node/$hostname >$node/logs/kubectl-describe-node.txt
docker cp $name:/var/lib/rancher/k3s/agent/containerd/containerd.log $node/logs/containerd.log 2>/dev/null docker cp $name:/var/lib/rancher/k3s/agent/containerd/containerd.log $node/logs/containerd.log 2>/dev/null
docker logs $name >$node/logs/system.log 2>&1
docker exec $name crictl pods >$node/logs/crictl-pods.txt docker exec $name crictl pods >$node/logs/crictl-pods.txt
docker exec $name crictl ps -a >$node/logs/crictl-ps.txt docker exec $name crictl ps -a >$node/logs/crictl-ps.txt
docker exec $name crictl ps -a -o json >$node/metadata/crictl-ps.json docker exec $name crictl ps -a -o json >$node/metadata/crictl-ps.json
@ -143,6 +144,7 @@ dump-logs() {
local cname=$(jq -r '.containers[] | select(.id == "'$container'") | .metadata.name' <$node/metadata/crictl-ps.json) local cname=$(jq -r '.containers[] | select(.id == "'$container'") | .metadata.name' <$node/metadata/crictl-ps.json)
docker exec $name crictl logs $container >$node/logs/$cname-$container.log 2>&1 docker exec $name crictl logs $container >$node/logs/$cname-$container.log 2>&1
done done
fi
for log in $node/logs/*.log; do for log in $node/logs/*.log; do
echo echo
echo "#- Tail: $log" echo "#- Tail: $log"
@ -287,8 +289,8 @@ test-setup() {
mkdir -p $TEST_DIR/metadata mkdir -p $TEST_DIR/metadata
if [ "$LABEL" ]; then if [ "$LABEL" ]; then
exec > >(awk -W interactive "{ printf \"[\033[36m${LABEL}\033[m] %s\n\", \$0 }") \ exec > >(awk "{ printf \"[\033[36m${LABEL}\033[m] %s\n\", \$0; fflush() }") \
2> >(awk -W interactive "{ printf \"[\033[35m${LABEL}\033[m] %s\n\", \$0 }" >&2) 2> >(awk "{ printf \"[\033[35m${LABEL}\033[m] %s\n\", \$0; fflush() }" >&2)
echo "$LABEL" >$TEST_DIR/metadata/label echo "$LABEL" >$TEST_DIR/metadata/label
fi fi