Skip to content

Commit 09f90ff

Browse files
authored
Merge pull request #533 from vishnoianil/update-installer
Fix following issues in the installer:
2 parents 762b49c + a37a46c commit 09f90ff

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

api-server/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ dist/packages: $(TARGET_PACKAGES)
7373

7474
dist/packages/%: apiserver
7575
$(CMD_PREFIX) mkdir -p $(basename $(basename $@))
76-
$(CMD_PREFIX) cp dist/apiserver-$(subst apiserver-,,$(basename $(basename $(@F)))) $(basename $(basename $@))/ilab-apiserver$
76+
$(CMD_PREFIX) cp dist/apiserver-$(subst apiserver-,,$(basename $(basename $(@F)))) $(basename $(basename $@))/ilab-apiserver
7777
$(CMD_PREFIX) printf " %-12s dist/packages/$(@F)\n" "[TAR]" ;
7878
$(CMD_PREFIX) cd dist/packages && tar -czf $(@F) $(basename $(basename $(@F)));
7979

installers/podman/ilab-ui-native-installer.sh

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ if [[ "$COMMAND" == "install" ]]; then
270270
verify_user_pyenv
271271
else
272272
discover_ilab
273-
echo -e "\n${blue}NOTE: To skip the virtual environment discovery, you can use --python-venv-dir option to provide the python virtual environment path.${reset}\n"
273+
echo -e "\n${blue}NOTE: If you are using python virtual environment for InstructLab setup, you can use --python-venv-dir option to skip the discovery.${reset}\n"
274274
fi
275275

276276
# ilab is not set up and the user didn't provide that taxonomy info as well. Exit with warning info.
@@ -468,15 +468,23 @@ elif [[ "$COMMAND" == "uninstall" ]]; then
468468
else
469469
# Run Podman commands to uninstall UI containers
470470
echo -e "${green}Deleting the UI stack containers from Podman...${reset}\n"
471-
podman kube down instructlab-ui.yaml
471+
if [ -f "instructlab-ui.yaml" ]; then
472+
podman kube down instructlab-ui.yaml
473+
else
474+
echo -e "${red}instructlab-ui.yaml file does not exist, can't stop the relevant containers (if running). Continuing with cleanup...${reset}\n"
475+
fi
472476
echo -e "${green}Deleting the UI stack secrets from Podman...${reset}\n"
473-
podman kube down secret.yaml
477+
if [ -f "secret.yaml" ]; then
478+
podman kube down secret.yaml
479+
else
480+
echo -e "${red}secret.yaml file does not exist, can't unload the podman secrets. Continuing with cleanup...${reset}\n"
481+
fi
474482
fi
475483

476484
echo -e "${green}Stopping API server (if installed)...${reset}\n"
477485
pkill -f ilab-apiserver || true
478486
echo -e "${green}Cleaning up all the downloaded and temporary files${reset}\n"
479-
rm -f secret.yaml instructlab-ui.yaml apiserver.tar.gz ilab-apiserver
487+
rm -f secret.yaml instructlab-ui.yaml apiserver.tar.gz ilab-apiserver*
480488
echo -e "${green}Uninstallation successfully completed.${reset}\n"
481489
else
482490
usage

0 commit comments

Comments
 (0)