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

[ci] Use go env {GOOS,GOARCH} for os and arch detection #3661

Merged
merged 1 commit into from
Jan 27, 2025
Merged

[ci] Use go env {GOOS,GOARCH} for os and arch detection #3661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 7 additions & 11 deletions scripts/run_prometheus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,19 @@ if ! command -v "${CMD}" &> /dev/null; then
if ! command -v "${CMD}" &> /dev/null; then
echo "prometheus not found, attempting to install..."

# Determine the arch
if which sw_vers &> /dev/null; then
GOOS="$(go env GOOS)"
GOARCH="$(go env GOARCH)"
if [[ "${GOOS}" == "darwin" && "${GOARCH}" == "arm64" ]]; then
echo "On macos, only amd64 binaries are available so rosetta is required on apple silicon machines."
echo "To avoid using rosetta, install via homebrew: brew install prometheus"
DIST=darwin
else
ARCH="$(uname -i)"
if [[ "${ARCH}" != "x86_64" ]]; then
echo "On linux, only amd64 binaries are available. manual installation of prometheus is required."
fi
if [[ "${GOOS}" == "linux" && "${GOARCH}" != "amd64" ]]; then
echo "On linux, only amd64 binaries are available. Manual installation of prometheus is required."
exit 1
else
DIST="linux"
fi
fi

# Install the specified release
PROMETHEUS_FILE="prometheus-${VERSION}.${DIST}-amd64"
PROMETHEUS_FILE="prometheus-${VERSION}.${GOOS}-amd64"
URL="https://github.com/prometheus/prometheus/releases/download/v${VERSION}/${PROMETHEUS_FILE}.tar.gz"
curl -s -L "${URL}" | tar zxv -C /tmp > /dev/null
mkdir -p "$(dirname "${CMD}")"
Expand Down
17 changes: 5 additions & 12 deletions scripts/run_promtail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,11 @@ if ! command -v "${CMD}" &> /dev/null; then
CMD="${PWD}/bin/promtail"
if ! command -v "${CMD}" &> /dev/null; then
echo "promtail not found, attempting to install..."
# Determine the arch
if which sw_vers &> /dev/null; then
DIST="darwin-$(uname -m)"
else
ARCH="$(uname -i)"
if [[ "${ARCH}" == "aarch64" ]]; then
ARCH="arm64"
elif [[ "${ARCH}" == "x86_64" ]]; then
ARCH="amd64"
fi
DIST="linux-${ARCH}"
fi

# Determine the platform
GOOS="$(go env GOOS)"
GOARCH="$(go env GOARCH)"
DIST="${GOOS}-${GOARCH}"

# Install the specified release
PROMTAIL_FILE="promtail-${DIST}"
Expand Down
26 changes: 4 additions & 22 deletions scripts/tests.e2e.bootstrap_monitor.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,8 @@ if ! [[ "$0" =~ scripts/tests.e2e.bootstrap_monitor.sh ]]; then
exit 255
fi

# Determine DIST and ARCH in case installation is required for kubectl and kind
#
# TODO(marun) Factor this out for reuse
if which sw_vers &> /dev/null; then
OS="darwin"
ARCH="$(uname -m)"
else
# Assume linux (windows is not supported)
OS="linux"
RAW_ARCH="$(uname -i)"
# Convert the linux arch string to the string used for k8s releases
if [[ "${RAW_ARCH}" == "aarch64" ]]; then
ARCH="arm64"
elif [[ "${RAW_ARCH}" == "x86_64" ]]; then
ARCH="amd64"
else
echo "Unsupported architecture: ${RAW_ARCH}"
exit 1
fi
fi
GOOS="$(go env GOOS)"
GOARCH="$(go env GOARCH)"

function ensure_command {
local cmd=$1
Expand All @@ -49,11 +31,11 @@ function ensure_command {

# Ensure the kubectl command is available
KUBECTL_VERSION=v1.30.2
ensure_command kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/${OS}/${ARCH}/kubectl"
ensure_command kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/${GOOS}/${GOARCH}/kubectl"

# Ensure the kind command is available
KIND_VERSION=v0.23.0
ensure_command kind "https://kind.sigs.k8s.io/dl/${KIND_VERSION}/kind-${OS}-${ARCH}"
ensure_command kind "https://kind.sigs.k8s.io/dl/${KIND_VERSION}/kind-${GOOS}-${GOARCH}"

# Ensure the kind-with-registry command is available
ensure_command "kind-with-registry.sh" "https://raw.githubusercontent.com/kubernetes-sigs/kind/7cb9e6be25b48a0e248097eef29d496ab1a044d0/site/static/examples/kind-with-registry.sh"
Expand Down
Loading