Merge "Remove namespace from site YAML"

[icn.git] / deploy / site / vm / vm.sh

diff --git a/deploy/site/vm/vm.sh b/deploy/site/vm/vm.sh
old mode 100755 (executable)
new mode 100644 (file)
index 3f3b3fb..c533f27
--- a/deploy/site/vm/vm.sh
+++ b/deploy/site/vm/vm.sh
@@ -55,14 +55,14 @@ function clean {
 }
 
 function is_cluster_ready {
-    [[ $(kubectl -n metal3 get cluster icn -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}') == "True" ]]
+    [[ $(kubectl -n ${SITE_NAMESPACE} get cluster icn -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}') == "True" ]]
 }
 
 function is_control_plane_ready {
     # Checking the Cluster resource status is not sufficient, it
     # reports the control plane as ready before the nodes forming the
     # control plane are ready
-    local -r replicas=$(kubectl -n metal3 get kubeadmcontrolplane icn -o jsonpath='{.spec.replicas}')
+    local -r replicas=$(kubectl -n ${SITE_NAMESPACE} get kubeadmcontrolplane icn -o jsonpath='{.spec.replicas}')
     [[ $(kubectl --kubeconfig=${BUILDDIR}/icn-admin.conf get nodes -l node-role.kubernetes.io/control-plane -o jsonpath='{range .items[*]}{.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' | grep -c True) == ${replicas} ]]
 }
 
@@ -80,8 +80,8 @@ function insert_control_plane_network_identity_into_ssh_config {
     chmod 600 ${HOME}/.ssh/config
     # Add the entry for the control plane network, host value in ssh
     # config is a wildcard
-    endpoint=$(helm -n metal3 get values -a cluster-icn | awk '/controlPlaneEndpoint:/ {print $2}')
-    prefix=$(helm -n metal3 get values -a cluster-icn | awk '/controlPlanePrefix:/ {print $2}')
+    endpoint=$(helm -n ${SITE_NAMESPACE} get values -a cluster-icn | awk '/controlPlaneEndpoint:/ {print $2}')
+    prefix=$(helm -n ${SITE_NAMESPACE} get values -a cluster-icn | awk '/controlPlanePrefix:/ {print $2}')
     host=$(ipcalc ${endpoint}/${prefix} | awk '/Network:/ {sub(/\.0.*/,".*"); print $2}')
     if [[ $(grep -c "Host ${host}" ${HOME}/.ssh/config) != 0 ]]; then
        sed -i -e '/Host '"${host}"'/,+1 d' ${HOME}/.ssh/config
@@ -101,7 +101,7 @@ function wait_for_all_ready {
     WAIT_FOR_INTERVAL=60s
     WAIT_FOR_TRIES=30
     wait_for is_cluster_ready
-    clusterctl -n metal3 get kubeconfig icn >${BUILDDIR}/icn-admin.conf
+    clusterctl -n ${SITE_NAMESPACE} get kubeconfig icn >${BUILDDIR}/icn-admin.conf
     chmod 600 ${BUILDDIR}/icn-admin.conf
     wait_for is_control_plane_ready
     insert_control_plane_network_identity_into_ssh_config