From 07d8355363e947788bcedadc376717a5b534e45c Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sun, 20 Jan 2019 14:28:45 +0200 Subject: [PATCH] Rename load testing service to flagger-loadtester --- Dockerfile.loadtest => Dockerfile.loadtester | 8 ++++---- Makefile | 4 ++++ cmd/{loadtest => loadtester}/main.go | 6 +++--- pkg/{loadtest => loadtester}/runner.go | 2 +- pkg/{loadtest => loadtester}/runner_test.go | 2 +- pkg/{loadtest => loadtester}/server.go | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) rename Dockerfile.loadtest => Dockerfile.loadtester (89%) rename cmd/{loadtest => loadtester}/main.go (80%) rename pkg/{loadtest => loadtester}/runner.go (99%) rename pkg/{loadtest => loadtester}/runner_test.go (97%) rename pkg/{loadtest => loadtester}/server.go (99%) diff --git a/Dockerfile.loadtest b/Dockerfile.loadtester similarity index 89% rename from Dockerfile.loadtest rename to Dockerfile.loadtester index ab233d3d..6e98ae91 100644 --- a/Dockerfile.loadtest +++ b/Dockerfile.loadtester @@ -22,9 +22,9 @@ WORKDIR /go/src/github.com/stefanprodan/flagger COPY . . -RUN go test -race ./pkg/loadtest/ +RUN go test -race ./pkg/loadtester/ -RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o loadtest ./cmd/loadtest/* +RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o loadtester ./cmd/loadtester/* FROM alpine:3.8 @@ -35,10 +35,10 @@ RUN addgroup -S app \ WORKDIR /home/app COPY --from=hey-builder /go/bin/hey /usr/local/bin/hey -COPY --from=builder /go/src/github.com/stefanprodan/flagger/loadtest . +COPY --from=builder /go/src/github.com/stefanprodan/flagger/loadtester . RUN chown -R app:app ./ USER app -ENTRYPOINT ["./loadtest"] \ No newline at end of file +ENTRYPOINT ["./loadtester"] \ No newline at end of file diff --git a/Makefile b/Makefile index 332987d6..2303befa 100644 --- a/Makefile +++ b/Makefile @@ -77,3 +77,7 @@ reset-test: kubectl delete -f ./artifacts/namespaces kubectl apply -f ./artifacts/namespaces kubectl apply -f ./artifacts/canaries + +loadtester-push: + docker build -t quay.io/stefanprodan/flagger-loadtester:$(TAG) . -f Dockerfile.loadtester + docker push quay.io/stefanprodan/flagger-loadtester:$(TAG) \ No newline at end of file diff --git a/cmd/loadtest/main.go b/cmd/loadtester/main.go similarity index 80% rename from cmd/loadtest/main.go rename to cmd/loadtester/main.go index 3a453d4d..4270d6d9 100644 --- a/cmd/loadtest/main.go +++ b/cmd/loadtester/main.go @@ -3,7 +3,7 @@ package main import ( "flag" "github.com/knative/pkg/signals" - "github.com/stefanprodan/flagger/pkg/loadtest" + "github.com/stefanprodan/flagger/pkg/loadtester" "github.com/stefanprodan/flagger/pkg/logging" "log" "time" @@ -32,10 +32,10 @@ func main() { stopCh := signals.SetupSignalHandler() - taskRunner := loadtest.NewTaskRunner(logger, timeout) + taskRunner := loadtester.NewTaskRunner(logger, timeout) go taskRunner.Start(100*time.Millisecond, stopCh) logger.Infof("Starting HTTP server on port %s", port) - loadtest.ListenAndServe(port, time.Minute, logger, taskRunner, stopCh) + loadtester.ListenAndServe(port, time.Minute, logger, taskRunner, stopCh) } diff --git a/pkg/loadtest/runner.go b/pkg/loadtester/runner.go similarity index 99% rename from pkg/loadtest/runner.go rename to pkg/loadtester/runner.go index 5f24b0e7..2d1cf721 100644 --- a/pkg/loadtest/runner.go +++ b/pkg/loadtester/runner.go @@ -1,4 +1,4 @@ -package loadtest +package loadtester import ( "context" diff --git a/pkg/loadtest/runner_test.go b/pkg/loadtester/runner_test.go similarity index 97% rename from pkg/loadtest/runner_test.go rename to pkg/loadtester/runner_test.go index 8194a9b0..cc4b0f58 100644 --- a/pkg/loadtest/runner_test.go +++ b/pkg/loadtester/runner_test.go @@ -1,4 +1,4 @@ -package loadtest +package loadtester import ( "github.com/stefanprodan/flagger/pkg/logging" diff --git a/pkg/loadtest/server.go b/pkg/loadtester/server.go similarity index 99% rename from pkg/loadtest/server.go rename to pkg/loadtester/server.go index b9801276..58a50ed4 100644 --- a/pkg/loadtest/server.go +++ b/pkg/loadtester/server.go @@ -1,4 +1,4 @@ -package loadtest +package loadtester import ( "context"