From 951bbcc7fdea09cc5b7132a1775eb9c7b087decf Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Fri, 7 Jun 2024 13:18:56 +0100 Subject: [PATCH] Handle non-namespaced resouces Signed-off-by: Marcus Noble --- home/.bin/kube-all | 5 ++++- home/.bin/kube-force-delete | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/home/.bin/kube-all b/home/.bin/kube-all index 942c3f6..4fd7e2e 100755 --- a/home/.bin/kube-all +++ b/home/.bin/kube-all @@ -47,11 +47,14 @@ while test $# -gt 0; do esac done +NAMESPACED="--namespaced" + if [[ "${LABEL}" != "" ]]; then LABEL="-l ${LABEL}" + NAMESPACED="" fi -NAMES="$(kubectl api-resources --namespaced --verbs list -o name | tr '\n' ,)" +NAMES="$(kubectl api-resources ${NAMESPACED} --verbs list -o name | tr '\n' ,)" if [[ "$ALL_NAMESPACES" == "true" ]]; then kubectl get "${NAMES::${#NAMES}-1}" --show-kind --ignore-not-found ${LABEL} -A 2>/dev/null diff --git a/home/.bin/kube-force-delete b/home/.bin/kube-force-delete index 905ed38..d537587 100755 --- a/home/.bin/kube-force-delete +++ b/home/.bin/kube-force-delete @@ -69,7 +69,7 @@ if [[ "${SELECTOR}" == "" ]]; then else printf "Are you sure you want to delete all matching '${SELECTOR}'? (y/n): " SELECTOR="-l ${SELECTOR}" - NAMES="$(kubectl api-resources --namespaced --verbs list -o name 2>/dev/null | tr '\n' ,)" + NAMES="$(kubectl api-resources --verbs list -o name 2>/dev/null | tr '\n' ,)" RESOURCES=$(kubectl get "${NAMES::${#NAMES}-1}" --ignore-not-found ${SELECTOR} -n ${NAMESPACE} -o go-template='{{range.items}}{{.kind}}.{{.apiVersion}}/{{.metadata.name}}{{"\n"}}{{end}}' 2>/dev/null | tr '[:upper:]' '[:lower:]' | sed -r "s|/(v.+)/|/|g") fi read CONFIRM