Fix kube_apply_* and update deploy scripts

charts/config.sh

@@ -1,34 +1,45 @@
 #!/usr/bin/env bash
 
 vars=(
-    initca="@initca@"
-    apiserver="@apiserver@"
-    cluster="@cluster@"
-    ingress_nodes="@ingress_nodes@"
-    filseserver="@fileserver@"
-    acme_email="@acme_email@"
-    grafana_ldap_toml="@grafana_ldap_toml@"
-    grafana_smtp_user="@grafana_smtp_user@"
-    grafana_smtp_password="@grafana_smtp_password@"
+    initca="replace_me"
+    apiserver="replace_me"
+    cluster="replace_me"
+    ingress_nodes="[ replace_me"
+    ingress_replica_count="replace_me"
+    filseserver="replace_me"
+    acme_email="replace_me"
+    grafana_smtp_user="replace_me"
+    grafana_smtp_password="replace_me"
 )
 
-make_substitutions () {
+substitute_all () {
     read x
-    for i in "${vars[@]}"; do
+    subs=("$@")
+    for i in "${subs[@]}"; do
         k=$(echo "$i" | cut -d= -f1)
         v=$(echo "$i" | cut -d= -f2)
         echo "$x" | sed "s/@$k@/$v/g"
     done
 }
 
+substitute_defaults () {
+  substitute_all "${vars[@]}"
+}
+
 kubectl_apply () {
-    ns=$1; shift
+    read x
+    namespace=$1; shift
+    kubectl get ns $namespace  2>&1 >/dev/null || kubectl create ns $namespace
+    cat $x | substitute_defaults | kubectl -n $namespace apply -f -
+}
+
+kubectl_apply_files () {
+    namespace=$1; shift
     charts=("$@")
     for i in "${charts[@]}"; do
-        k=$(echo "$i" | cut -d= -f1)
-        v=$(echo "$i" | cut -d= -f2)
-        sed "s/@$k@/$v/g" $i | kubectl apply -n $ns -f -
+       cat $i | kubectl_apply $namespace
     done
 }
 
 # vim:ft=sh
+