Moves create_ns to its own func.

createLiiibre

@@ -16,26 +16,24 @@ cd /root/domains
 source ./common/scrips/functions.sh
 
 export DOMAIN=${1}
-export NUAGE_SUBDOMAIN=${NUAGE_SUBDOMAIN:-nuage}
-export CHAT_SUBDOMAIN=${CHAT_SUBDOMAIN:-chat}
 export NS=`echo ${1} | sed 's/\./-/g'`
 
-# Create NS
-mkdir -p ${NS}
-mkdir -p ${NS}/${NUAGE_SUBDOMAIN}
+create_ns
+
+# Create CHAT resources
+export CHAT_SUBDOMAIN=${CHAT_SUBDOMAIN:-chat}
 mkdir -p ${NS}/${CHAT_SUBDOMAIN}
 echo export APP=rocketchat > ${NS}/${CHAT_SUBDOMAIN}/.env
 echo export S3_ENDPOINT=https://hot-objects.liiib.re >> ${NS}/${CHAT_SUBDOMAIN}/.env
 echo export S3_ENDPOINT_COLD=https://cold-objects.liiib.re >> ${NS}/${CHAT_SUBDOMAIN}/.env
+cp ./common/rocketchat/config.yaml ${NS}/${CHAT_SUBDOMAIN}/
 
+# Create NUAGE resources
+export NUAGE_SUBDOMAIN=${NUAGE_SUBDOMAIN:-nuage}
+mkdir -p ${NS}/${NUAGE_SUBDOMAIN}
 echo export APP=nextcloud > ${NS}/${NUAGE_SUBDOMAIN}/.env
 echo export S3_ENDPOINT=https://hot-objects.liiib.re >> ${NS}/${NUAGE_SUBDOMAIN}/.env
 echo export S3_ENDPOINT_COLD=https://cold-objects.liiib.re >> ${NS}/${NUAGE_SUBDOMAIN}/.env
-cp ./common/rocketchat/config.yaml ${NS}/${CHAT_SUBDOMAIN}/
-
-kubectl create ns ${NS} || true
-kubens ${NS}
-kubectl -n ${NS} apply -f ./common/networkpolicies.yml
 cd ${NS}/${NUAGE_SUBDOMAIN}
 libre apply ../../common/nextcloud/other-manifests/saml-cert.yaml
 cd ../..

scripts/functions.sh

@@ -6,6 +6,12 @@ function create_bucket() {
   mc admin policy set ${STORAGE_CLASS} username-rw user=${AWS_ACCESS_KEY_ID}
 }
 
+function create_ns() {
+  mkdir -p /root/domains/${NS}
+  kubectl create ns ${NS} || true
+  kubectl -n ${NS} apply -f ./common/networkpolicies.yml
+}
+
 function pg_zero_lag() {
   cat /tmp/patronictl_list |tail -n2| cut -d$'\t' -f 7 | grep -q 0
 }