Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix error 'unknown flag: --force-update' #3

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix error 'unknown flag: --force-update' #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6cbf31
adding the xapp json file to be used in the demo a1-ric.sh
Jul 5, 2021
75ea5dd
Revert "adding the xapp json file to be used in the demo a1-ric.sh"
soad666p Jul 6, 2021
00cb0ab
Fix error 'unknown flag: --force-update'
brneto Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions bin/deploy-nonrtric
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,16 @@ echo "** $ROOT_DIR"
rm $ROOT_DIR/../nonrtric/helm/*/charts/*.tgz


#Check for helm3
IS_HELM3=$(helm version -c --short|grep -e "^v3")
#Check for helm version
HELM_VERSION=$(helm version -c --short)
IS_HELM3=$(echo $HELM_VERSION | grep -e "^v3")
HELM_NUMBER=$(echo $HELM_VERSION | awk '{gsub(/\./,"",$1); print substr($1,2,3)}')

HELM_FORCE=""
if [[ HELM_NUMBER -ge 332 ]]
then
HELM_FORCE="--force-update"
fi

if [ $IS_HELM3 ]
then
Expand Down Expand Up @@ -120,7 +128,7 @@ helm dep up $ROOT_DIR/../nonrtric/helm/nonrtric
helm repo index ${HELM_LOCAL_REPO}

# Make sure that helm local repo is added
helm repo add local http://127.0.0.1:8879/charts --force-update
helm repo add local http://127.0.0.1:8879/charts ${HELM_FORCE}

echo "Finished Packaging NONRTRIC components [$COMPONENTS]"

Expand All @@ -144,7 +152,7 @@ echo "Install Kong- $INSTALL_KONG"

if [ "$INSTALL_KONG" = true ];then
echo "Installing Kong"
helm repo add kong https://charts.konghq.com --force-update
helm repo add kong https://charts.konghq.com ${HELM_FORCE}
helm repo update
helm install kong-nonrtric --namespace ${NONRTRIC_NAMESPACE:-nonrtric} kong/kong --set ingressController.installCRDs=false --set admin.enabled=true
fi
Expand Down