Skip to content

refactor(): remove elements to simplify maintenance #4

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
davinkevin merged 2 commits into from
Apr 14, 2025
Merged

refactor(): remove elements to simplify maintenance #4

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
ac2ca5e
refactor(version): remove version parameter
davinkevin Apr 14, 2025
4c2757b
feat(k3s): use default/stable version offered by default
davinkevin Apr 14, 2025
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
23 changes: 1 addition & 22 deletions AWS/EC2/ec2-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ set -e
trap cleanup SIGINT SIGTERM ERR EXIT

# --- Variables ---
INSTALL_K3S_VERSION=${INSTALL_K3S_VERSION:-"v1.32.3+k3s1"}
DV_CHART_REGISTRY_URL=${DV_CHART_REGISTRY_URL:-"https://helm.gradle.com/"}
DV_VERSION=${DV_VERSION:-"2025.1.0"}
Script_Version="0.1"
SCRIPT_VERSION="0.1"

# Log File
LOGFILE="$(pwd)/install_$(date +'%Y%m%d_%H%M%S').log"
Expand Down Expand Up @@ -108,23 +106,6 @@ echo -e "${YELLOW}-u, --uninstall${NOFORMAT} Uninstall Develocity Platform"
exit
}

# --- Validation functions ---
# Check if the script is running as root
# This is not used at the moment.
#validateSudo () {
# local OS_TYPE=$(uname)
# if [ "$OS_TYPE" == "Linux" ] && [ $EUID -ne 0 ]; then
# exitError "This script must be run as root or with sudo."
# elif [ "$OS_TYPE" != "Linux" ]; then
# exitError "This script is only supported on Linux."
# fi

# local ARCHITECTURE=$(uname -m)
# if [ "$ARCHITECTURE" != "x86_64" ]; then
# exitError "This script is only supported on x86_64 architecture."
# fi
#}

# Check if the OS is Linux and x86_64
validateOS () {
local OS_TYPE
Expand Down Expand Up @@ -230,7 +211,6 @@ installK3s(){
checkUrl "${baseUrl}"

logInfo "Installing K3s..."
export INSTALL_K3S_VERSION="${INSTALL_K3S_VERSION}"
curl -s -fL ${baseUrl} | sh - || exitError "Failed to install k3s"
}

Expand Down Expand Up @@ -270,7 +250,6 @@ installPlatformChart(){
helm repo add gradle "${baseUrl}" && \
helm repo update && \
helm install \
--version "${DV_VERSION}" \
--create-namespace --namespace develocity \
ge-standalone \
gradle/gradle-enterprise-standalone \
Expand Down
2 changes: 1 addition & 1 deletion AWS/EC2/ec2-install.sh.sha256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ae5a646c78d3de90c29018b2153a5660d2410a991f724434337902cbcd7f251a ec2-install.sh
e194a237d36b92b90f7661e57fac2047dc74c769a0b4c837002794d24c0645c8 ec2-install.sh