From a46b8e3b6495eef897ac949c3b34961c30b5a1f6 Mon Sep 17 00:00:00 2001
From: ange <ange@yw5n.com>
Date: Sat, 3 May 2025 04:06:14 +0000
Subject: [PATCH] fix: deploy scripts

---
 manifests/bin/deploy.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/manifests/bin/deploy.sh b/manifests/bin/deploy.sh
index 2b49f47..e8b4783 100755
--- a/manifests/bin/deploy.sh
+++ b/manifests/bin/deploy.sh
@@ -3,34 +3,33 @@ set -o pipefail
 
 function kapply() {
     for f in "$@"; do
-        kubectl apply -f <(envsubst < "manifests/$f")
+        kubectl apply --server-side \
+            -f<(envsubst "$(env | sed 's/^/$/')" < "manifests/$f")
     done
 }; export -f kapply
 
 function kcreatesec() {
-    kubectl create secret generic --dry-run=client -oyaml "$@" | kubectl replace -f-
+    kubectl apply --server-side \
+        -f<(kubectl create secret generic --dry-run=client -oyaml "$@")
 }; export -f kcreatesec
 
 function kcreatecm() {
-    kubectl create configmap --dry-run=client -oyaml "$@" | kubectl replace -f-
+    kubectl apply --server-side \
+        -f<(kubectl create configmap --dry-run=client -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