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

ENG-14432: Unregisters disabled services from local registry #28

Merged
merged 11 commits into from
Oct 1, 2024
Merged

ENG-14432: Unregisters disabled services from local registry #28

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2020e1e
unregisters services
Sep 30, 2024
4826d6a
adds condition
Sep 30, 2024
18dbffe
other fixes
Oct 1, 2024
f0242af
removes unnecessary configuration
Oct 1, 2024
b8addeb
changes when to clean up registry
Oct 1, 2024
d7cf957
removes prefix
Oct 1, 2024
9240b10
adds redirection
Oct 1, 2024
5d8d998
removes storage manager as well
Oct 1, 2024
9fa63c9
adds warning instead of failing
Oct 1, 2024
47328f9
redirects stdout
Oct 1, 2024
b9742b2
ignore error
Oct 1, 2024
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
21 changes: 21 additions & 0 deletions install-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ CYRAL_CONTROL_PLANE_GRPC_PORT=443
CYRAL_STORAGE_MANAGER_PORT=8090
CYRAL_STORAGE_MANAGER_IGNORED_CONFIGS="storage-manager log-shipper"
CYRAL_STORAGE_MANAGER_PROXY_ENABLED="${CYRAL_STORAGE_MANAGER_PROXY_ENABLED:-true}"

CYRAL_REGISTRY_DATABASE="/etc/cyral/conf.d/sidecar.db"
CYRAL_REGISTRY_BUCKET="service-registry"
NL=$'\n'

get_os_type() {
Expand Down Expand Up @@ -373,6 +376,23 @@ disable_unsupported_services() {
fi
}

cleanup_local_registry() {
if command -v /opt/cyral/bin/cyral-local-discovery-cli &>/dev/null; then
echo "Cleaning up local registry"
readarray -t WIRES < <(find /etc/cyral/ -type d -name "*-wire" -printf "%f\n")
wires_to_disable=$(for wire in "${WIRES[@]}"; do if [[ ! "$CYRAL_REPOSITORIES_SUPPORTED" =~ $(echo "$wire" | cut -d- -f2) ]]; then echo -n "$wire "; fi; done)
for wire in "${WIRES[@]}"; do
if [[ -n "$wires_to_disable" ]] && [[ " ${wires_to_disable} " == *" ${wire} "* ]]; then
/opt/cyral/bin/cyral-local-discovery-cli unregister "${wire#cyral-}" --db "$CYRAL_REGISTRY_DATABASE" --bucket "$CYRAL_REGISTRY_BUCKET"
fi
done

if [[ "$CYRAL_STORAGE_MANAGER_PROXY_ENABLED" != "true" ]]; then
/opt/cyral/bin/cyral-local-discovery-cli unregister "storage-proxy" --db "$CYRAL_REGISTRY_DATABASE" --bucket "$CYRAL_REGISTRY_BUCKET" 2>/dev/null || true
fi
fi
}

# After performing everything we need to restart the cyral services
restart_services() {
# We need to reload any of our changes to the systemd files before restarting
Expand All @@ -390,6 +410,7 @@ do_post_install() {
update_config_files
sleep 3 # some os's (ubuntu) seem to have a problem if this is too quick
restart_services
cleanup_local_registry
}

get_argument_value() {
Expand Down
Loading