Skip to content

Commit

Permalink
cilium: don't invoke deprecated cilium daemon
Browse files Browse the repository at this point in the history
Commit c7d4002 ("Switch to spf13/cobra and spf13/viper to
implement CLI & config") split the daemon and the cli into two
separate binaries, as a result 'cilium daemon' doesn't exist
anymore. There are a few letfover spots in the test suite that
are using 'cilium daemon' and throwing error messages such as:

  # BENCHMARK=1 ./02-perf.sh
  [...]
  + cilium daemon config DropNotification=false Debug=false
  Error: unknown command "daemon" for "cilium"
  Run 'cilium --help' for usage.
  unknown command "daemon" for "cilium"
  [...]
  ++ cilium daemon config DropNotification=true Debug=true
  Error: unknown command "daemon" for "cilium"
  Run 'cilium --help' for usage.
  unknown command "daemon" for "cilium"
  [...]

Just drop the deprecated daemon command from these test cases,
and after that we get:

  [...]
  + cilium config DropNotification=false Debug=false
  + cilium endpoint config 63464 DropNotification=false Debug=false
  [...]

Fixes: c7d4002 ("Switch to spf13/cobra and spf13/viper to implement CLI & config")
Signed-off-by: Daniel Borkmann <daniel@cilium.io>
  • Loading branch information
borkmann committed Mar 17, 2017
1 parent cdb0af8 commit 5522569
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions tests/02-perf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fi
function cleanup {
docker rm -f server client 2> /dev/null || true

cilium daemon config DropNotification=true Debug=true
cilium config DropNotification=true Debug=true
}

trap cleanup EXIT
Expand Down Expand Up @@ -146,7 +146,7 @@ function perf_pktgen() {
done
}

cilium daemon config DropNotification=false Debug=false
cilium config DropNotification=false Debug=false
cilium endpoint config $SERVER_ID DropNotification=false Debug=false
cilium endpoint config $CLIENT_ID DropNotification=false Debug=false
perf_test
Expand Down
6 changes: 3 additions & 3 deletions tests/06-lb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ cleanup

set -x

#cilium daemon config Debug=true DropNotification=true
#cilium config Debug=true DropNotification=true

# Test the addition and removal of services with and without daemon

Expand Down Expand Up @@ -450,7 +450,7 @@ cilium service update --rev --frontend "$SVC_IP4:80" --id 2233 \
--backend "$SERVER2_IP4:80"


#cilium daemon config Debug=false DropNotification=false
#cilium config Debug=false DropNotification=false
#cilium endpoint config $SERVER1_ID Debug=false DropNotification=false
#cilium endpoint config $SERVER2_ID Debug=false DropNotification=false

Expand All @@ -475,7 +475,7 @@ docker exec -i ab ab -t 30 -c 20 -v 1 "http://$SVC_IP4/" || {
abort "Error: Unable to reach local IPv4 node via loadbalancer"
}

#cilium daemon config Debug=true DropNotification=true
#cilium config Debug=true DropNotification=true

cleanup
cilium -D policy delete root
6 changes: 3 additions & 3 deletions tests/09-perf-gce.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function cleanup_cilium {
cleanup_k8s

for line in ${server_cilium} ${client_cilium}; do
kubectl exec -i ${line} -- cilium daemon config DropNotification=true Debug=true
kubectl exec -i ${line} -- cilium config DropNotification=true Debug=true
done
}

Expand Down Expand Up @@ -193,8 +193,8 @@ function perf_test() {
fi
}

kubectl exec ${server_cilium} -- cilium daemon config DropNotification=false Debug=false
kubectl exec ${client_cilium} -- cilium daemon config DropNotification=false Debug=false
kubectl exec ${server_cilium} -- cilium config DropNotification=false Debug=false
kubectl exec ${client_cilium} -- cilium config DropNotification=false Debug=false
kubectl exec ${server_cilium} -- cilium endpoint config $SERVER_ID DropNotification=false Debug=false
kubectl exec ${client_cilium} -- cilium endpoint config $CLIENT_ID DropNotification=false Debug=false
perf_test
Expand Down

0 comments on commit 5522569

Please sign in to comment.