From 584350623b74ae6706e95ad1e33e741df98ed787 Mon Sep 17 00:00:00 2001 From: Rajat Vig <rvig@etsy.com> Date: Mon, 29 Nov 2021 11:07:04 +0000 Subject: [PATCH 1/3] Update libraries included in the load tester to newer versions Signed-off-by: Rajat Vig <rvig@etsy.com> --- Dockerfile.loadtester | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.loadtester b/Dockerfile.loadtester index bdb758f85..278e16c0a 100644 --- a/Dockerfile.loadtester +++ b/Dockerfile.loadtester @@ -1,4 +1,4 @@ -FROM alpine:3.14.2 as build +FROM alpine:3.15.0 as build RUN apk --no-cache add alpine-sdk perl curl @@ -14,11 +14,11 @@ RUN HELM3_VERSION=3.7.1 && \ curl -sSL "https://get.helm.sh/helm-v${HELM3_VERSION}-linux-amd64.tar.gz" | tar xvz && \ chmod +x linux-amd64/helm && mv linux-amd64/helm /usr/local/bin/helmv3 -RUN GRPC_HEALTH_PROBE_VERSION=v0.3.1 && \ +RUN GRPC_HEALTH_PROBE_VERSION=v0.4.6 && \ wget -qO /usr/local/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \ chmod +x /usr/local/bin/grpc_health_probe -RUN GHZ_VERSION=0.39.0 && \ +RUN GHZ_VERSION=0.105.0 && \ curl -sSL "https://github.com/bojand/ghz/releases/download/v${GHZ_VERSION}/ghz_${GHZ_VERSION}_Linux_x86_64.tar.gz" | tar xz -C /tmp && \ mv /tmp/ghz /usr/local/bin && chmod +x /usr/local/bin/ghz @@ -26,7 +26,7 @@ RUN HELM_TILLER_VERSION=0.9.3 && \ curl -sSL "https://github.com/rimusz/helm-tiller/archive/v${HELM_TILLER_VERSION}.tar.gz" | tar xz -C /tmp && \ mv /tmp/helm-tiller-${HELM_TILLER_VERSION} /tmp/helm-tiller -RUN WRK_VERSION=4.0.2 && \ +RUN WRK_VERSION=4.1.0 && \ cd /tmp && git clone -b ${WRK_VERSION} https://github.com/wg/wrk RUN cd /tmp/wrk && make From 9fa6e775c0680158964e83dfff73155e75bd6058 Mon Sep 17 00:00:00 2001 From: Rajat Vig <rvig@etsy.com> Date: Wed, 1 Dec 2021 00:08:47 +0000 Subject: [PATCH 2/3] Fix ghz URI and install wrk from alpine vs compiling it Signed-off-by: Rajat Vig <rvig@etsy.com> --- Dockerfile.loadtester | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Dockerfile.loadtester b/Dockerfile.loadtester index 278e16c0a..b646db3ec 100644 --- a/Dockerfile.loadtester +++ b/Dockerfile.loadtester @@ -19,22 +19,18 @@ wget -qO /usr/local/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc chmod +x /usr/local/bin/grpc_health_probe RUN GHZ_VERSION=0.105.0 && \ -curl -sSL "https://github.com/bojand/ghz/releases/download/v${GHZ_VERSION}/ghz_${GHZ_VERSION}_Linux_x86_64.tar.gz" | tar xz -C /tmp && \ +curl -sSL "https://github.com/bojand/ghz/releases/download/v${GHZ_VERSION}/ghz-linux-x86_64.tar.gz" | tar xz -C /tmp && \ mv /tmp/ghz /usr/local/bin && chmod +x /usr/local/bin/ghz RUN HELM_TILLER_VERSION=0.9.3 && \ curl -sSL "https://github.com/rimusz/helm-tiller/archive/v${HELM_TILLER_VERSION}.tar.gz" | tar xz -C /tmp && \ mv /tmp/helm-tiller-${HELM_TILLER_VERSION} /tmp/helm-tiller -RUN WRK_VERSION=4.1.0 && \ -cd /tmp && git clone -b ${WRK_VERSION} https://github.com/wg/wrk -RUN cd /tmp/wrk && make - FROM bash:5.0 RUN addgroup -S app && \ adduser -S -g app app && \ -apk --no-cache add ca-certificates curl jq libgcc +apk --no-cache add ca-certificates curl jq libgcc wrk WORKDIR /home/app @@ -42,7 +38,6 @@ COPY --from=bats/bats:v1.1.0 /opt/bats/ /opt/bats/ RUN ln -s /opt/bats/bin/bats /usr/local/bin/ COPY --from=build /usr/local/bin/hey /usr/local/bin/ -COPY --from=build /tmp/wrk/wrk /usr/local/bin/ COPY --from=build /usr/local/bin/helm /usr/local/bin/ COPY --from=build /usr/local/bin/tiller /usr/local/bin/ COPY --from=build /usr/local/bin/ghz /usr/local/bin/ From dc478188c1de50f012b4e15b1303d7137b37d9d8 Mon Sep 17 00:00:00 2001 From: Rajat Vig <rvig@etsy.com> Date: Wed, 1 Dec 2021 00:13:29 +0000 Subject: [PATCH 3/3] Update loadtester version Signed-off-by: Rajat Vig <rvig@etsy.com> --- cmd/loadtester/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/loadtester/main.go b/cmd/loadtester/main.go index 858403b1d..c95a94141 100644 --- a/cmd/loadtester/main.go +++ b/cmd/loadtester/main.go @@ -27,7 +27,7 @@ import ( "go.uber.org/zap" ) -var VERSION = "0.19.0" +var VERSION = "0.20.0" var ( logLevel string port string