From c457cda5836061568fdd2520f94370427aa66e19 Mon Sep 17 00:00:00 2001 From: ange Date: Thu, 27 Feb 2025 01:21:31 +0000 Subject: [PATCH] fix: kubectl replace fails if not exists --- manifests/bin/deploy.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/manifests/bin/deploy.sh b/manifests/bin/deploy.sh index 557fd73..c0c4f86 100755 --- a/manifests/bin/deploy.sh +++ b/manifests/bin/deploy.sh @@ -3,34 +3,30 @@ set -o pipefail function kapply() { for f in "$@"; do - kubectl apply -f <(envsubst < "manifests/$f") + kubectl apply --server-side -f<(envsubst < "manifests/$f") done }; export -f kapply function kcreatesec() { - kubectl create secret generic --dry-run=client -oyaml "$@" | kubectl replace -f- + kapply <(kubectl create secret generic --dry-run=server -oyaml "$@") }; export -f kcreatesec function kcreatecm() { - kubectl create configmap --dry-run=client -oyaml "$@" | kubectl replace -f- + kapply <(kubectl create secret configmap --dry-run=server -oyaml "$@") }; export -f kcreatecm function kgseckey() { local sec="$1"; shift local key="$1"; shift - if ! kubectl get secret "$sec" -ojson | jq -re ".data.\"$key\" // empty" | base64 -d; then - return 1 - fi + kubectl get secret "$sec" -ojson | jq -re ".data.\"$key\"" | base64 -d }; export -f kgseckey function kgcmkey() { local cm="$1"; shift local key="$1"; shift - if ! kubectl get configmap "$cm" -ojson | jq -re ".data.\"$key\" // empty"; then - return 1 - fi + kubectl get configmap "$cm" -ojson | jq -re ".data.\"$key\"" }; export -f kgcmkey