fix: set default values on parsing yq

ulagbulag · Aug 17, 2024 · 5a5bc08 · 5a5bc08
1 parent 9798fee
commit 5a5bc08
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/templates/csi/s3/install.sh b/templates/csi/s3/install.sh
@@ -23,22 +23,22 @@ NAMESPACE="${NAMESPACE:-$NAMESPACE_DEFAULT}"
 # Parse from kiss-config
 STORAGE_CLASS_NAME="$(
     kubectl -n kiss get secret kiss-config -o yaml |
-        yq -r '.data.object_storage_class_name' |
+        yq -r '.data.object_storage_class_name // ""' |
         base64 --decode
 )"
 STORAGE_ENDPOINT="$(
     kubectl -n kiss get secret kiss-config -o yaml |
-        yq -r '.data.object_storage_endpoint' |
+        yq -r '.data.object_storage_endpoint // ""' |
         base64 --decode
 )"
 STORAGE_KEY_ACCESS="$(
     kubectl -n kiss get secret kiss-config -o yaml |
-        yq -r '.data.object_storage_key_access' |
+        yq -r '.data.object_storage_key_access // ""' |
         base64 --decode
 )"
 STORAGE_KEY_SECRET="$(
     kubectl -n kiss get secret kiss-config -o yaml |
-        yq -r '.data.object_storage_key_secret' |
+        yq -r '.data.object_storage_key_secret // ""' |
         base64 --decode
 )"
 

diff --git a/templates/gpu/nvidia/install.sh b/templates/gpu/nvidia/install.sh
@@ -23,7 +23,7 @@ NAMESPACE="${NAMESPACE:-$NAMESPACE_DEFAULT}"
 # Parse from kiss-config
 export OS_DEFAULT="$(
     kubectl -n kiss get configmap kiss-config -o yaml |
-        yq -r '.data.os_default'
+        yq -r '.data.os_default // ""'
 )"
 
 ###########################################################

diff --git a/templates/ingress/install.sh b/templates/ingress/install.sh
@@ -15,19 +15,19 @@ set -x
 # Parse from kiss-config
 export DNS_SERVER_1="$(
     kubectl -n kiss get configmap kiss-config -o yaml |
-        yq -r '.data.domain_dns_server_ns1'
+        yq -r '.data.domain_dns_server_ns1 // ""'
 )"
 export DNS_SERVER_2="$(
     kubectl -n kiss get configmap kiss-config -o yaml |
-        yq -r '.data.domain_dns_server_ns2'
+        yq -r '.data.domain_dns_server_ns2 // ""'
 )"
 export DOMAIN_NAME="$(
     kubectl -n kiss get configmap kiss-config -o yaml |
-        yq -r '.data.domain_name'
+        yq -r '.data.domain_name // ""'
 )"
 export LOADBALANCER_IP="$(
     kubectl -n kiss get configmap kiss-config -o yaml |
-        yq -r '.data.domain_ingress_server'
+        yq -r '.data.domain_ingress_server // ""'
 )"
 
 ###########################################################

diff --git a/templates/ingress/nginx-ingress/install.sh b/templates/ingress/nginx-ingress/install.sh
@@ -23,7 +23,7 @@ NAMESPACE="${NAMESPACE:-$NAMESPACE_DEFAULT}"
 # Parse from kiss-config
 export AUTH_DOMAIN_NAME="$(
     kubectl -n kiss get configmap kiss-config -o yaml |
-        yq -r '.data.auth_domain_name'
+        yq -r '.data.auth_domain_name // ""'
 )"
 
 ###########################################################

diff --git a/templates/monitoring/install.sh b/templates/monitoring/install.sh
@@ -15,7 +15,7 @@ set -x
 # Parse from CoreDNS
 export CLUSTER_NAME="$(
     kubectl -n kube-system get configmap coredns -o yaml |
-        yq -r '.data.Corefile' |
+        yq -r '.data.Corefile // ""' |
         grep -Po ' +kubernetes \K[\w\.\_\-]+'
 )"
 export DOMAIN_NAME="ingress-nginx-controller.vine.svc.${CLUSTER_NAME}"

diff --git a/templates/vine/keycloak/install.sh b/templates/vine/keycloak/install.sh
@@ -26,7 +26,7 @@ NAMESPACE="${NAMESPACE:-$NAMESPACE_DEFAULT}"
 
 export DOMAIN_NAME="$(
     kubectl -n kiss get configmap kiss-config -o yaml |
-        yq -r '.data.domain_name'
+        yq -r '.data.domain_name // ""'
 )"
 
 ###########################################################