X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fsite%2Fcommon.sh;h=a6c4532beff33f77f9ed20c46d4c9d83eb7c912b;hb=8d442f5e6f8af2f792bdf81b48ff3ef8be78d0f9;hp=ffd810355b5af7153dd535df199222f242dd423d;hpb=24b64469cd68fe9ae5162b99eb7fb260bcc4e147;p=icn.git

diff --git a/deploy/site/common.sh b/deploy/site/common.sh
index ffd8103..a6c4532 100644
--- a/deploy/site/common.sh
+++ b/deploy/site/common.sh
@@ -6,7 +6,7 @@ FLUX_SOPS_PRIVATE_KEY="$(readlink -f $(dirname ${BASH_SOURCE[0]}))/secrets/sops.
 SITE_NAMESPACE="${SITE_NAMESPACE:-metal3}"
 
 function _gpg_key_fp {
-    gpg --with-colons --list-secret-keys $1 | awk -F: '/fpr/ {print $10;exit}'
+    gpg --with-colons --fingerprint $1 | awk -F: '/fpr/ {print $10;exit}'
 }
 
 function sops_encrypt {
@@ -128,8 +128,10 @@ function site_wait_for_all_ready {
     wait_for _is_cluster_ready
     for yaml in ${SCRIPTDIR}/deployment/*.yaml; do
 	name=$(awk '/clusterName:/ {print $2}' ${yaml})
-	clusterctl -n ${SITE_NAMESPACE} get kubeconfig ${name} >${BUILDDIR}/${name}-admin.conf
-	chmod 600 ${BUILDDIR}/${name}-admin.conf
+	if [[ ! -z ${name} ]]; then
+	    clusterctl -n ${SITE_NAMESPACE} get kubeconfig ${name} >${BUILDDIR}/${name}-admin.conf
+	    chmod 600 ${BUILDDIR}/${name}-admin.conf
+	fi
     done
     wait_for _is_control_plane_ready
 }
@@ -175,7 +177,11 @@ EOF
 function _is_cluster_deleted {
     for yaml in ${SCRIPTDIR}/deployment/*.yaml; do
 	name=$(awk '/clusterName:/ {print $2}' ${yaml})
-	! kubectl -n ${SITE_NAMESPACE} get cluster ${name}
+	if [[ ! -z ${name} ]]; then
+	    if kubectl -n ${SITE_NAMESPACE} get cluster ${name}; then
+		return 1
+	    fi
+	fi
     done
 }