From 89e2ff39f13eb5165a9cad750a7058b1b286f81a Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Sun, 24 Apr 2022 09:35:41 +0200 Subject: [PATCH] ci: do not count `Warning:` matches in kubectl_retry() Depending on the Kubernetes version, the following warning is reported regulary: > Warning: policy/v1beta1 PodSecurityPolicy is deprecated in v1.21+, > unavailable in v1.25+ The warning is written to stderr, so skipping AlreadyExists or NotFound is not sufficient to trigger a retry. Ignoring '^Warning:' in the stderr output should prevent unneeded failures while deploying Rook or other components. Signed-off-by: Niels de Vos --- scripts/utils.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/utils.sh b/scripts/utils.sh index 3c215e8b2..6c210d9f6 100755 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -16,8 +16,8 @@ kubectl_retry() { # in case of a failure when running "create", ignore errors with "AlreadyExists" if [ "${action}" == 'create' ] then - # count lines in stderr that do not have "AlreadyExists" - ret=$(grep -cvw 'AlreadyExists' "${stderr}") + # count lines in stderr that do not have "AlreadyExists" or "Warning" + ret=$(grep -cvw -e 'AlreadyExists' -e '^Warning:' "${stderr}") if [ "${ret}" -eq 0 ] then # Success! stderr is empty after removing all "AlreadyExists" lines. @@ -28,8 +28,8 @@ kubectl_retry() { # in case of a failure when running "delete", ignore errors with "NotFound" if [ "${action}" == 'delete' ] then - # count lines in stderr that do not have "NotFound" - ret=$(grep -cvw 'NotFound' "${stderr}") + # count lines in stderr that do not have "NotFound" or "Warning" + ret=$(grep -cvw -e 'NotFound' -e '^Warning:' "${stderr}") if [ "${ret}" -eq 0 ] then # Success! stderr is empty after removing all "NotFound" lines.