From fc8e048c8170465dd3e1358560c66321c8029187 Mon Sep 17 00:00:00 2001 From: Brad Beam Date: Mon, 20 Sep 2021 17:26:02 +0000 Subject: [PATCH 1/3] fix: Use correct path for results exporter Signed-off-by: Brad Beam --- .github/workflows/results_exporter.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/results_exporter.yaml b/.github/workflows/results_exporter.yaml index a2c085e..d7912b7 100644 --- a/.github/workflows/results_exporter.yaml +++ b/.github/workflows/results_exporter.yaml @@ -6,7 +6,7 @@ on: branches: - main paths: - - 'voting-webapp/results-exporter/**' + - 'webserver/voting-webapp/results-exporter/**' jobs: main: @@ -40,7 +40,7 @@ jobs: id: docker_build uses: docker/build-push-action@v2 with: - context: ./voting-webapp/results-exporter + context: ./webserver/voting-webapp/results-exporter push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From c3d452fd43d3c4900117b1c9d35d7a5478f42e2b Mon Sep 17 00:00:00 2001 From: Brad Beam Date: Mon, 20 Sep 2021 17:41:25 +0000 Subject: [PATCH 2/3] fix: Add additional kustomize path fixes for webserver Signed-off-by: Brad Beam --- hpa/locust/kustomization.yaml | 2 +- hpa/sf-perftest/application/kustomization.yaml | 2 +- webserver/sf-perftest-metrics/application/kustomization.yaml | 2 +- webserver/vhs-sf-perftest/application/kustomization.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hpa/locust/kustomization.yaml b/hpa/locust/kustomization.yaml index 3bce7f5..74352a0 100644 --- a/hpa/locust/kustomization.yaml +++ b/hpa/locust/kustomization.yaml @@ -4,7 +4,7 @@ kind: Kustomization namespace: recipe resources: - - github.com/thestormforge/examples/voting-webapp/application + - github.com/thestormforge/examples/webserver/voting-webapp/application - hpa.yaml - experiment.yaml diff --git a/hpa/sf-perftest/application/kustomization.yaml b/hpa/sf-perftest/application/kustomization.yaml index 32efec9..9456dd2 100644 --- a/hpa/sf-perftest/application/kustomization.yaml +++ b/hpa/sf-perftest/application/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/thestormforge/examples/voting-webapp/application +- github.com/thestormforge/examples/webserver/voting-webapp/application - ingress.yaml - hpa.yaml diff --git a/webserver/sf-perftest-metrics/application/kustomization.yaml b/webserver/sf-perftest-metrics/application/kustomization.yaml index ccf69c4..7dcaeb1 100644 --- a/webserver/sf-perftest-metrics/application/kustomization.yaml +++ b/webserver/sf-perftest-metrics/application/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../voting-webapp/application +- github.com/thestormforge/examples/webserver/voting-webapp/application - ingress.yaml patchesStrategicMerge: diff --git a/webserver/vhs-sf-perftest/application/kustomization.yaml b/webserver/vhs-sf-perftest/application/kustomization.yaml index 2ac0a94..0744180 100644 --- a/webserver/vhs-sf-perftest/application/kustomization.yaml +++ b/webserver/vhs-sf-perftest/application/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/thestormforge/examples/voting-webapp/application +- github.com/thestormforge/examples/webserver/voting-webapp/application - ingress-alb.yaml patchesStrategicMerge: From 8133dc5c14a0cee0e790f529b0fe614d20cc0bc9 Mon Sep 17 00:00:00 2001 From: Brad Beam Date: Mon, 20 Sep 2021 17:48:11 +0000 Subject: [PATCH 3/3] feat: Update pr workflow to build results image Signed-off-by: Brad Beam --- .github/workflows/pr.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 5a3126e..341d129 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -12,6 +12,9 @@ jobs: - name: Checkout code uses: actions/checkout@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Install kustomize run: | wget -q "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.2.0/kustomize_v4.2.0_linux_amd64.tar.gz" -O - | tar xz @@ -23,3 +26,11 @@ jobs: find . -type f -maxdepth 6 -name kustomization.yaml \ | xargs -n1 dirname \ | xargs -I{} sh -c 'echo "Building {}..."; kustomize build {} 1> /dev/null' + + - name: Build results exporter + id: docker_build + uses: docker/build-push-action@v2 + with: + context: ./webserver/voting-webapp/results-exporter + push: false + tags: prtest