Skip to content

Remove ssh_scan Workaround #517

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

Merged
nigthknight merged 2 commits into from
Jun 22, 2021
Merged

Remove ssh_scan Workaround #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7120593
Remove ssh_scan Workaround
twwd Jun 22, 2021
8878d12
Rename demo-apps to demo-targets
twwd Jun 22, 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: 7 additions & 9 deletions bin/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ BASE_DIR=$(dirname "${SCRIPT_DIRECTORY}")

INSTALL_INTERACTIVE=''
INSTALL_SCANNERS=''
INSTALL_DEMO_APPS=''
INSTALL_DEMO_TARGETS=''
INSTALL_HOOKS=''

function print() {
Expand Down Expand Up @@ -142,8 +142,7 @@ function installResources() {

if [[ $unattended == True ]]; then
for resource in "${resources[@]}"; do
local resource_name="${resource//+([_])/-}" # Necessary because ssh_scan is called ssh-scan
helm upgrade --install -n "$namespace" "$resource_name" "$resource_directory"/"$resource"/ \
helm upgrade --install -n "$namespace" "$resource" "$resource_directory"/"$resource"/ \
|| print "$COLOR_ERROR" "Installation of '$resource' failed"
done

Expand All @@ -154,8 +153,7 @@ function installResources() {
read -r line

if [[ $line == *[Yy] ]]; then
local resource_name="${resource//+([_])/-}"
helm upgrade --install -n "$namespace" "$resource_name" "$resource_directory"/"$resource"/ \
helm upgrade --install -n "$namespace" "$resource" "$resource_directory"/"$resource"/ \
|| print "$COLOR_ERROR" "Installation of '$resource' failed"
fi
done
Expand Down Expand Up @@ -186,7 +184,7 @@ function interactiveInstall() {

print
print "Starting to install demo-targets..."
print "Do you want to install the demo apps in a separate namespace? Otherwise they will be installed into the [default] namespace [y/N]"
print "Do you want to install the demo targets in a separate namespace? Otherwise they will be installed into the [default] namespace [y/N]"
read -r line
NAMESPACE="default"
if [[ $line == *[Yy] ]]; then
Expand Down Expand Up @@ -219,7 +217,7 @@ function unattendedInstall() {
installResources "$BASE_DIR/scanners" "default" True
fi

if [[ -n "${INSTALL_DEMO_APPS}" ]]; then
if [[ -n "${INSTALL_DEMO_TARGETS}" ]]; then
print "Starting to install demo-targets..."
installResources "$BASE_DIR/demo-targets" "default" True
fi
Expand All @@ -245,7 +243,7 @@ function parseArguments() {
shift # Pop current argument from array
;;
--demo-targets)
INSTALL_DEMO_APPS='true'
INSTALL_DEMO_TARGETS='true'
shift
;;
--hooks)
Expand All @@ -254,7 +252,7 @@ function parseArguments() {
;;
--all)
INSTALL_SCANNERS='true'
INSTALL_DEMO_APPS='true'
INSTALL_DEMO_TARGETS='true'
INSTALL_HOOKS='true'
shift
;;
Expand Down
3 changes: 1 addition & 2 deletions bin/uninstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ function uninstallResources() {
done

for resource in "${resources[@]}"; do
local resource_name="${resource//+([_])/-}" # Necessary because ssh_scan is called ssh-scan
helm uninstall "$resource_name" || true
helm uninstall "$resource" || true
done
}

Expand Down