starlingx/tools
Code Issues Proposed changes

Merge "import-stx: namespace validation after KUBECONFIG export"

Browse Source
This commit is contained in:
Zuul 2022-03-01 00:13:29 +00:00 committed by Gerrit Code Review
commit 47e246ecce
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
import-stx
View File

@ -139,11 +139,6 @@ elif [ "$STX_PLATFORM" = "kubernetes" ]; then
return 1 return 1
fi fi
if ! kubectl get namespace 2>/dev/null | grep -q $STX_K8S_NAMESPACE; then
notice_warn "namespace $STX_K8S_NAMESPACE not found"
return 1
fi
if [ -z "$KUBECONFIG" ]; then if [ -z "$KUBECONFIG" ]; then
# Kubeconfig default location inside STX_BUILD_HOME # Kubeconfig default location inside STX_BUILD_HOME
export KUBECONFIG=$STX_BUILD_HOME/.kube/config export KUBECONFIG=$STX_BUILD_HOME/.kube/config
@ -155,6 +150,11 @@ elif [ "$STX_PLATFORM" = "kubernetes" ]; then
return 1 return 1
fi fi
if ! kubectl get namespace 2>/dev/null | grep -q $STX_K8S_NAMESPACE; then
notice_warn "namespace $STX_K8S_NAMESPACE not found"
return 1
fi
else else
notice_warn "\$STX_PLATFORM not specified, valid options are: 'minikube' or 'kubernetes'" notice_warn "\$STX_PLATFORM not specified, valid options are: 'minikube' or 'kubernetes'"
return 1 return 1