Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.

fix: Use correct path for results exporter #63

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: Use correct path for results exporter #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc8e048
fix: Use correct path for results exporter
bradbeam Sep 20, 2021
c3d452f
fix: Add additional kustomize path fixes for webserver
bradbeam Sep 20, 2021
8133dc5
feat: Update pr workflow to build results image
bradbeam Sep 20, 2021
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
11 changes: 11 additions & 0 deletions .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/results_exporter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
branches:
- main
paths:
- 'voting-webapp/results-exporter/**'
- 'webserver/voting-webapp/results-exporter/**'

jobs:
main:
Expand Down Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion hpa/locust/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: Kustomization
namespace: recipe

resources:
- github.com/thestormforge/examples/voting-webapp/application
- github.com/thestormforge/examples/webserver/voting-webapp/application
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, we decided to use relative paths as a convention when in the same repo, unless there is reason to fully qualify in this case?

- hpa.yaml
- experiment.yaml

Expand Down
2 changes: 1 addition & 1 deletion hpa/sf-perftest/application/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as the other one.

- ingress.yaml
- hpa.yaml

Expand Down
2 changes: 1 addition & 1 deletion webserver/sf-perftest-metrics/application/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- ../../voting-webapp/application
- github.com/thestormforge/examples/webserver/voting-webapp/application
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha! Looks like you are going the other way. On the last PR from Tibo, we assumed people will clone the whole repo before running any of these examples.

But I do realize now, that integration tests would be one thing happening outside of this repo; is that where kustomize would break when using relative paths; I am not sure and would need to check.

- ingress.yaml

patchesStrategicMerge:
Expand Down
2 changes: 1 addition & 1 deletion webserver/vhs-sf-perftest/application/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down