From ec75fa608501f8b62d4fe70dc97126ade740ca86 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 13 Mar 2026 09:57:16 -0400 Subject: [PATCH 01/15] Microcks tests Signed-off-by: Mathieu Benoit --- samples/traderx/Makefile | 21 ++++++++++++++++++- samples/traderx/ingress/score.yaml | 12 +++++------ .../account-service-examples.yaml | 0 .../account-service-openapi.json | 0 .../people-service-examples.yaml | 0 .../people-service-metadata.yaml | 0 .../people-service-openapi.json | 0 .../position-service-examples.yaml | 0 .../position-service-openapi.json | 0 .../reference-data-examples.yaml | 0 .../reference-data-openapi.json | 0 .../s-and-p-500-companies.csv | 0 samples/traderx/trade-service/score.yaml | 12 +++++------ 13 files changed, 32 insertions(+), 13 deletions(-) rename samples/traderx/{api-mocks => resources}/account-service-examples.yaml (100%) rename samples/traderx/{api-mocks => resources}/account-service-openapi.json (100%) rename samples/traderx/{api-mocks => resources}/people-service-examples.yaml (100%) rename samples/traderx/{api-mocks => resources}/people-service-metadata.yaml (100%) rename samples/traderx/{api-mocks => resources}/people-service-openapi.json (100%) rename samples/traderx/{api-mocks => resources}/position-service-examples.yaml (100%) rename samples/traderx/{api-mocks => resources}/position-service-openapi.json (100%) rename samples/traderx/{api-mocks => resources}/reference-data-examples.yaml (100%) rename samples/traderx/{api-mocks => resources}/reference-data-openapi.json (100%) rename samples/traderx/{api-mocks => resources}/s-and-p-500-companies.csv (100%) diff --git a/samples/traderx/Makefile b/samples/traderx/Makefile index aaa9f98..cb9ab06 100644 --- a/samples/traderx/Makefile +++ b/samples/traderx/Makefile @@ -14,7 +14,9 @@ help: .score-compose/state.yaml: score-compose init \ --no-sample \ - --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/service/score-compose/10-service.provisioners.yaml + --patch-templates https://raw.githubusercontent.com/score-spec/community-patchers/refs/heads/main/score-compose/microcks.tpl \ + --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/service/score-compose/10-service.provisioners.yaml \ + --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/endpoint/score-compose/10-endpoint-with-microcks.provisioners.yaml compose.yaml: account-service/score.yaml database/score.yaml ingress/score.yaml people-service/score.yaml position-service/score.yaml reference-data/score.yaml trade-feed/score.yaml trade-processor/score.yaml trade-service/score.yaml web-frontend/score.yaml .score-compose/state.yaml Makefile score-compose generate \ @@ -42,6 +44,23 @@ compose-test: compose-up sleep 5 curl $$(score-compose resources get-outputs 'dns.default#ingress.dns' --format '{{ .host }}:8080') +compose-mock.yaml: database/score.yaml ingress/score.yaml position-service/score.yaml trade-feed/score.yaml trade-processor/score.yaml trade-service/score.yaml web-frontend/score.yaml .score-compose/state.yaml Makefile + score-compose generate \ + database/score.yaml \ + position-service/score.yaml \ + trade-feed/score.yaml \ + trade-processor/score.yaml \ + trade-service/score.yaml \ + web-frontend/score.yaml + score-compose generate \ + ingress/score.yaml \ + --build 'ingress={"context":"ingress/","tags":["ingress:local"]}' + +## Generate a compose.yaml file from the score specs and launch it. +.PHONY: compose-up +compose-mock-up: compose-mock.yaml + docker compose up --build -d --remove-orphans + ## Delete the containers running via compose down. .PHONY: compose-down compose-down: diff --git a/samples/traderx/ingress/score.yaml b/samples/traderx/ingress/score.yaml index 7b14fec..b3c6f53 100644 --- a/samples/traderx/ingress/score.yaml +++ b/samples/traderx/ingress/score.yaml @@ -14,14 +14,14 @@ service: port: 8080 targetPort: 8080 resources: - people-service: - type: service + #people-service: + # type: service trade-service: type: service - account-service: - type: service - reference-data: - type: service + #account-service: + # type: service + #reference-data: + # type: service trade-feed: type: service trade-processor: diff --git a/samples/traderx/api-mocks/account-service-examples.yaml b/samples/traderx/resources/account-service-examples.yaml similarity index 100% rename from samples/traderx/api-mocks/account-service-examples.yaml rename to samples/traderx/resources/account-service-examples.yaml diff --git a/samples/traderx/api-mocks/account-service-openapi.json b/samples/traderx/resources/account-service-openapi.json similarity index 100% rename from samples/traderx/api-mocks/account-service-openapi.json rename to samples/traderx/resources/account-service-openapi.json diff --git a/samples/traderx/api-mocks/people-service-examples.yaml b/samples/traderx/resources/people-service-examples.yaml similarity index 100% rename from samples/traderx/api-mocks/people-service-examples.yaml rename to samples/traderx/resources/people-service-examples.yaml diff --git a/samples/traderx/api-mocks/people-service-metadata.yaml b/samples/traderx/resources/people-service-metadata.yaml similarity index 100% rename from samples/traderx/api-mocks/people-service-metadata.yaml rename to samples/traderx/resources/people-service-metadata.yaml diff --git a/samples/traderx/api-mocks/people-service-openapi.json b/samples/traderx/resources/people-service-openapi.json similarity index 100% rename from samples/traderx/api-mocks/people-service-openapi.json rename to samples/traderx/resources/people-service-openapi.json diff --git a/samples/traderx/api-mocks/position-service-examples.yaml b/samples/traderx/resources/position-service-examples.yaml similarity index 100% rename from samples/traderx/api-mocks/position-service-examples.yaml rename to samples/traderx/resources/position-service-examples.yaml diff --git a/samples/traderx/api-mocks/position-service-openapi.json b/samples/traderx/resources/position-service-openapi.json similarity index 100% rename from samples/traderx/api-mocks/position-service-openapi.json rename to samples/traderx/resources/position-service-openapi.json diff --git a/samples/traderx/api-mocks/reference-data-examples.yaml b/samples/traderx/resources/reference-data-examples.yaml similarity index 100% rename from samples/traderx/api-mocks/reference-data-examples.yaml rename to samples/traderx/resources/reference-data-examples.yaml diff --git a/samples/traderx/api-mocks/reference-data-openapi.json b/samples/traderx/resources/reference-data-openapi.json similarity index 100% rename from samples/traderx/api-mocks/reference-data-openapi.json rename to samples/traderx/resources/reference-data-openapi.json diff --git a/samples/traderx/api-mocks/s-and-p-500-companies.csv b/samples/traderx/resources/s-and-p-500-companies.csv similarity index 100% rename from samples/traderx/api-mocks/s-and-p-500-companies.csv rename to samples/traderx/resources/s-and-p-500-companies.csv diff --git a/samples/traderx/trade-service/score.yaml b/samples/traderx/trade-service/score.yaml index a0eb2d7..7b7b7a4 100644 --- a/samples/traderx/trade-service/score.yaml +++ b/samples/traderx/trade-service/score.yaml @@ -8,9 +8,9 @@ containers: image: ghcr.io/finos/traderx/trade-service:latest variables: DATABASE_TCP_HOST: "${resources.database.name}" - PEOPLE_SERVICE_HOST: "${resources.people-service.name}" - ACCOUNT_SERVICE_HOST: "${resources.account-service.name}" - REFERENCE_DATA_HOST: "${resources.reference-data.name}" + PEOPLE_SERVICE_HOST: "people-service" # "${resources.people-service.name}" + ACCOUNT_SERVICE_HOST: "account-service" # "${resources.account-service.name}" + REFERENCE_DATA_HOST: "reference-data" # "${resources.reference-data.name}" TRADE_FEED_HOST: "${resources.trade-feed.name}" service: ports: @@ -22,7 +22,7 @@ resources: type: endpoint params: port: 8181 - openapi_file: ../api-mocks/people-service-openapi.json + openapi_file: resources/people-service-openapi.json openapi_title: FINOS TraderX People Service trade-feed: type: service @@ -30,13 +30,13 @@ resources: type: endpoint params: port: 8181 - openapi_file: ../api-mocks/account-service-openapi.json + openapi_file: resources/account-service-openapi.json openapi_title: FINOS TraderX Account Service reference-data: type: endpoint params: port: 8181 - openapi_file: ../api-mocks/reference-data-openapi.json + openapi_file: resources/reference-data-openapi.json openapi_title: FINOS TraderX Reference Data database: type: service \ No newline at end of file From acf942479c81e6ce4d6cca80998a2e2200b32838 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 13 Mar 2026 16:27:25 -0400 Subject: [PATCH 02/15] Add endpont provisioner for score-k8s Signed-off-by: Mathieu Benoit --- samples/traderx/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samples/traderx/Makefile b/samples/traderx/Makefile index cb9ab06..8962b9b 100644 --- a/samples/traderx/Makefile +++ b/samples/traderx/Makefile @@ -69,7 +69,8 @@ compose-down: .score-k8s/state.yaml: score-k8s init \ --no-sample \ - --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/service/score-k8s/10-service.provisioners.yaml + --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/service/score-k8s/10-service.provisioners.yaml \ + --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/endpoint/score-k8s/10-endpoint-with-microcks-cli.provisioners.yaml manifests.yaml: account-service/score.yaml database/score.yaml ingress/score.yaml people-service/score.yaml position-service/score.yaml reference-data/score.yaml trade-feed/score.yaml trade-processor/score.yaml trade-service/score.yaml web-frontend/score.yaml .score-k8s/state.yaml Makefile score-k8s generate \ From 273a6e11ca43259f5bffbce27a1b61fc1522a0c7 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 14 Mar 2026 09:37:44 -0400 Subject: [PATCH 03/15] resources --> api-mocks folder support + _URL in trade-service for endpoint dependencies + database actually not used in trade-service Signed-off-by: Mathieu Benoit --- samples/traderx/Makefile | 2 +- samples/traderx/README.md | 1 - .../account-service-examples.yaml | 0 .../account-service-openapi.json | 0 .../people-service-examples.yaml | 0 .../people-service-metadata.yaml | 0 .../people-service-openapi.json | 0 .../position-service-examples.yaml | 0 .../position-service-openapi.json | 0 .../reference-data-examples.yaml | 0 .../reference-data-openapi.json | 0 .../s-and-p-500-companies.csv | 0 ...0-endpoint-with-microcks.provisioners.yaml | 53 +++++++++++++++++++ samples/traderx/trade-service/score.yaml | 24 ++++----- 14 files changed, 65 insertions(+), 15 deletions(-) rename samples/traderx/{resources => api-mocks}/account-service-examples.yaml (100%) rename samples/traderx/{resources => api-mocks}/account-service-openapi.json (100%) rename samples/traderx/{resources => api-mocks}/people-service-examples.yaml (100%) rename samples/traderx/{resources => api-mocks}/people-service-metadata.yaml (100%) rename samples/traderx/{resources => api-mocks}/people-service-openapi.json (100%) rename samples/traderx/{resources => api-mocks}/position-service-examples.yaml (100%) rename samples/traderx/{resources => api-mocks}/position-service-openapi.json (100%) rename samples/traderx/{resources => api-mocks}/reference-data-examples.yaml (100%) rename samples/traderx/{resources => api-mocks}/reference-data-openapi.json (100%) rename samples/traderx/{resources => api-mocks}/s-and-p-500-companies.csv (100%) create mode 100644 samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml diff --git a/samples/traderx/Makefile b/samples/traderx/Makefile index 8962b9b..6b9b500 100644 --- a/samples/traderx/Makefile +++ b/samples/traderx/Makefile @@ -16,7 +16,7 @@ help: --no-sample \ --patch-templates https://raw.githubusercontent.com/score-spec/community-patchers/refs/heads/main/score-compose/microcks.tpl \ --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/service/score-compose/10-service.provisioners.yaml \ - --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/endpoint/score-compose/10-endpoint-with-microcks.provisioners.yaml + --provisioners ./score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml compose.yaml: account-service/score.yaml database/score.yaml ingress/score.yaml people-service/score.yaml position-service/score.yaml reference-data/score.yaml trade-feed/score.yaml trade-processor/score.yaml trade-service/score.yaml web-frontend/score.yaml .score-compose/state.yaml Makefile score-compose generate \ diff --git a/samples/traderx/README.md b/samples/traderx/README.md index 37e8ab3..01a02b3 100644 --- a/samples/traderx/README.md +++ b/samples/traderx/README.md @@ -21,7 +21,6 @@ flowchart TD trade-processor-->trade-feed trade-processor-->database trade-service-->account-service - trade-service-->database trade-service-->people-service trade-service-->reference-data trade-service-->trade-feed diff --git a/samples/traderx/resources/account-service-examples.yaml b/samples/traderx/api-mocks/account-service-examples.yaml similarity index 100% rename from samples/traderx/resources/account-service-examples.yaml rename to samples/traderx/api-mocks/account-service-examples.yaml diff --git a/samples/traderx/resources/account-service-openapi.json b/samples/traderx/api-mocks/account-service-openapi.json similarity index 100% rename from samples/traderx/resources/account-service-openapi.json rename to samples/traderx/api-mocks/account-service-openapi.json diff --git a/samples/traderx/resources/people-service-examples.yaml b/samples/traderx/api-mocks/people-service-examples.yaml similarity index 100% rename from samples/traderx/resources/people-service-examples.yaml rename to samples/traderx/api-mocks/people-service-examples.yaml diff --git a/samples/traderx/resources/people-service-metadata.yaml b/samples/traderx/api-mocks/people-service-metadata.yaml similarity index 100% rename from samples/traderx/resources/people-service-metadata.yaml rename to samples/traderx/api-mocks/people-service-metadata.yaml diff --git a/samples/traderx/resources/people-service-openapi.json b/samples/traderx/api-mocks/people-service-openapi.json similarity index 100% rename from samples/traderx/resources/people-service-openapi.json rename to samples/traderx/api-mocks/people-service-openapi.json diff --git a/samples/traderx/resources/position-service-examples.yaml b/samples/traderx/api-mocks/position-service-examples.yaml similarity index 100% rename from samples/traderx/resources/position-service-examples.yaml rename to samples/traderx/api-mocks/position-service-examples.yaml diff --git a/samples/traderx/resources/position-service-openapi.json b/samples/traderx/api-mocks/position-service-openapi.json similarity index 100% rename from samples/traderx/resources/position-service-openapi.json rename to samples/traderx/api-mocks/position-service-openapi.json diff --git a/samples/traderx/resources/reference-data-examples.yaml b/samples/traderx/api-mocks/reference-data-examples.yaml similarity index 100% rename from samples/traderx/resources/reference-data-examples.yaml rename to samples/traderx/api-mocks/reference-data-examples.yaml diff --git a/samples/traderx/resources/reference-data-openapi.json b/samples/traderx/api-mocks/reference-data-openapi.json similarity index 100% rename from samples/traderx/resources/reference-data-openapi.json rename to samples/traderx/api-mocks/reference-data-openapi.json diff --git a/samples/traderx/resources/s-and-p-500-companies.csv b/samples/traderx/api-mocks/s-and-p-500-companies.csv similarity index 100% rename from samples/traderx/resources/s-and-p-500-companies.csv rename to samples/traderx/api-mocks/s-and-p-500-companies.csv diff --git a/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml b/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml new file mode 100644 index 0000000..d85780e --- /dev/null +++ b/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml @@ -0,0 +1,53 @@ +# Downloaded from https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/endpoint/score-compose/10-endpoint-with-microcks.provisioners.yaml at 2026-03-13 09:23:29.346316456 -0400 EDT m=+0.235481812 +- uri: template://custom-provisioners/endpoint-with-microcks + type: endpoint + description: Outputs an endpoint URL for connecting to an other workload (a Microcks mock is generated if not found). + init: | + hostname: {{ splitList "." .Id | last }} + {{ $parsedPath := .Params.openapi_file | splitList "/" }} + {{ if eq (len $parsedPath) 0 }} + resourcesPath: "." + {{ else }} + resourcesPath: {{ trimSuffix (last $parsedPath) .Params.openapi_file | trimSuffix "/" }} + {{ end }} + supported_params: + - port + - openapi_file + - openapi_title + outputs: | + {{ $w := (index .WorkloadServices .Init.hostname) }} + {{ if or (not $w) (not $w.ServiceName) }} + url: http://localhost:9090/rest/{{ .Params.openapi_title | replace " " "+" }} + {{ else }} + url: http://{{ .Init.hostname }}:{{ .Params.port }} + {{ end }} + expected_outputs: + - url + services: | + {{ $w := (index .WorkloadServices .Init.hostname) }} + {{ if or (not $w) (not $w.ServiceName) }} + {{ .Init.hostname }}-mock: + image: quay.io/microcks/microcks-cli:latest + restart: always + entrypoint: + - "microcks" + - "import" + - "{{ .Params.openapi_file }}:true" + - "--microcksURL=http://microcks:8080/api" + - "--insecure-tls" + - "--keycloakClientId=foo" + - "--keycloakClientSecret=bar" + cap_drop: + - ALL + read_only: true + user: "65532" + volumes: + - type: bind + source: {{ .Init.resourcesPath }} + target: /{{ .Init.resourcesPath }} + read_only: true + depends_on: + microcks: + condition: service_started + required: true + {{ end }} \ No newline at end of file diff --git a/samples/traderx/trade-service/score.yaml b/samples/traderx/trade-service/score.yaml index 7b7b7a4..04de0e2 100644 --- a/samples/traderx/trade-service/score.yaml +++ b/samples/traderx/trade-service/score.yaml @@ -7,10 +7,10 @@ containers: trade-service: image: ghcr.io/finos/traderx/trade-service:latest variables: - DATABASE_TCP_HOST: "${resources.database.name}" - PEOPLE_SERVICE_HOST: "people-service" # "${resources.people-service.name}" - ACCOUNT_SERVICE_HOST: "account-service" # "${resources.account-service.name}" - REFERENCE_DATA_HOST: "reference-data" # "${resources.reference-data.name}" + TRADING_SERVICE_PORT: '18092' + PEOPLE_SERVICE_URL: "${resources.people-service.url}" + ACCOUNT_SERVICE_URL: "${resources.account-service.url}" + REFERENCE_DATA_SERVICE_URL: "${resources.reference-data.url}" TRADE_FEED_HOST: "${resources.trade-feed.name}" service: ports: @@ -21,22 +21,20 @@ resources: people-service: type: endpoint params: - port: 8181 - openapi_file: resources/people-service-openapi.json + port: 18090 + openapi_file: api-mocks/people-service-openapi.json openapi_title: FINOS TraderX People Service trade-feed: type: service account-service: type: endpoint params: - port: 8181 - openapi_file: resources/account-service-openapi.json + port: 18088 + openapi_file: api-mocks/account-service-openapi.json openapi_title: FINOS TraderX Account Service reference-data: type: endpoint params: - port: 8181 - openapi_file: resources/reference-data-openapi.json - openapi_title: FINOS TraderX Reference Data - database: - type: service \ No newline at end of file + port: 18085 + openapi_file: api-mocks/reference-data-openapi.json + openapi_title: FINOS TraderX Reference Data \ No newline at end of file From 1e9c225e12017f084a3c6265262fcce54b8e6c47 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 14 Mar 2026 09:45:57 -0400 Subject: [PATCH 04/15] doc Signed-off-by: Mathieu Benoit --- .../compose/10-endpoint-with-microcks.provisioners.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml b/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml index d85780e..cccf319 100644 --- a/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml +++ b/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml @@ -1,4 +1,4 @@ -# Downloaded from https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/endpoint/score-compose/10-endpoint-with-microcks.provisioners.yaml at 2026-03-13 09:23:29.346316456 -0400 EDT m=+0.235481812 +# Custom updates for now, will need to contribute back to the community provisioners repository later on. - uri: template://custom-provisioners/endpoint-with-microcks type: endpoint description: Outputs an endpoint URL for connecting to an other workload (a Microcks mock is generated if not found). From 7353ae3c9693fb7c91bdd55746f82c04f975708c Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 14 Mar 2026 13:25:11 -0400 Subject: [PATCH 05/15] artifacts, name and version params Signed-off-by: Mathieu Benoit --- samples/traderx/Makefile | 2 +- ...0-endpoint-with-microcks.provisioners.yaml | 14 +++++---- ...dpoint-with-microcks-cli.provisioners.yaml | 29 +++++++++++++++++++ samples/traderx/trade-service/score.yaml | 15 ++++++---- 4 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 samples/traderx/score-provisioners/k8s/10-endpoint-with-microcks-cli.provisioners.yaml diff --git a/samples/traderx/Makefile b/samples/traderx/Makefile index 6b9b500..4b7fcb1 100644 --- a/samples/traderx/Makefile +++ b/samples/traderx/Makefile @@ -70,7 +70,7 @@ compose-down: score-k8s init \ --no-sample \ --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/service/score-k8s/10-service.provisioners.yaml \ - --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/endpoint/score-k8s/10-endpoint-with-microcks-cli.provisioners.yaml + --provisioners ./score-provisioners/k8s/10-endpoint-with-microcks-cli.provisioners.yaml manifests.yaml: account-service/score.yaml database/score.yaml ingress/score.yaml people-service/score.yaml position-service/score.yaml reference-data/score.yaml trade-feed/score.yaml trade-processor/score.yaml trade-service/score.yaml web-frontend/score.yaml .score-k8s/state.yaml Makefile score-k8s generate \ diff --git a/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml b/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml index cccf319..64f9773 100644 --- a/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml +++ b/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml @@ -4,20 +4,22 @@ description: Outputs an endpoint URL for connecting to an other workload (a Microcks mock is generated if not found). init: | hostname: {{ splitList "." .Id | last }} - {{ $parsedPath := .Params.openapi_file | splitList "/" }} + {{ $artifacts := .Params.artifacts | splitList "," }} + {{ $parsedPath := $artifacts | first | splitList "/" }} {{ if eq (len $parsedPath) 0 }} resourcesPath: "." {{ else }} - resourcesPath: {{ trimSuffix (last $parsedPath) .Params.openapi_file | trimSuffix "/" }} + resourcesPath: {{ trimSuffix (last $parsedPath) (first $artifacts) | trimSuffix "/" }} {{ end }} supported_params: - port - - openapi_file - - openapi_title + - artifacts + - name + - version outputs: | {{ $w := (index .WorkloadServices .Init.hostname) }} {{ if or (not $w) (not $w.ServiceName) }} - url: http://localhost:9090/rest/{{ .Params.openapi_title | replace " " "+" }} + url: http://localhost:9090/rest/{{ .Params.name | replace " " "+" }}/{{ .Params.version }} {{ else }} url: http://{{ .Init.hostname }}:{{ .Params.port }} {{ end }} @@ -32,7 +34,7 @@ entrypoint: - "microcks" - "import" - - "{{ .Params.openapi_file }}:true" + - "{{ .Params.artifacts }}" - "--microcksURL=http://microcks:8080/api" - "--insecure-tls" - "--keycloakClientId=foo" diff --git a/samples/traderx/score-provisioners/k8s/10-endpoint-with-microcks-cli.provisioners.yaml b/samples/traderx/score-provisioners/k8s/10-endpoint-with-microcks-cli.provisioners.yaml new file mode 100644 index 0000000..cded45f --- /dev/null +++ b/samples/traderx/score-provisioners/k8s/10-endpoint-with-microcks-cli.provisioners.yaml @@ -0,0 +1,29 @@ +- uri: cmd://bash#endpoint-with-microcks-cli + type: endpoint + description: Outputs an endpoint URL for connecting to an other workload (a Microcks mock is generated if not found). + supported_params: + - port + - openapi_file + expected_outputs: + - url + args: + - -c + - | + STDIN=$(cat) + PARAM_PORT=$(echo $STDIN | yq eval -p json '.resource_params.port') + PARAM_OPENAPI_FILE=$(echo $STDIN | yq eval -p json '.resource_params.openapi_file') + WORKLOAD=$(echo $STDIN | yq eval -p json '.resource_id | split(".") | .[-1]') + WORKLOAD_EXISTS=$(echo $STDIN | WORKLOAD=${WORKLOAD} yq eval -p json '.workload_services | has(strenv(WORKLOAD))') + URL_HOSTNAME=${WORKLOAD}:${PARAM_PORT} + URL_SCHEME="http" + URL_PATH="" + if [ "$WORKLOAD_EXISTS" != "true" ]; then + URL_HOSTNAME="microcks.127.0.0.1.nip.io" + URL_SCHEME="https" + SPEC_FILE="${PARAM_OPENAPI_FILE}" + URL_PATH=/rest/$(cat $SPEC_FILE | yq eval '.info.title' | yq '. |= sub(" ", "+")') + set -eu -o pipefail + microcks import ${SPEC_FILE}:true --microcksURL=https://${URL_HOSTNAME} --insecure-tls --keycloakClientId=foo --keycloakClientSecret=bar >&2 + fi + OUTPUTS='{"resource_outputs":{"url":"%s://%s%s"},"manifests":[]}' + printf "$OUTPUTS" "$URL_SCHEME" "$URL_HOSTNAME" "$URL_PATH" \ No newline at end of file diff --git a/samples/traderx/trade-service/score.yaml b/samples/traderx/trade-service/score.yaml index 04de0e2..7f8b7ec 100644 --- a/samples/traderx/trade-service/score.yaml +++ b/samples/traderx/trade-service/score.yaml @@ -22,19 +22,22 @@ resources: type: endpoint params: port: 18090 - openapi_file: api-mocks/people-service-openapi.json - openapi_title: FINOS TraderX People Service + artifacts: api-mocks/people-service-openapi.json:true,api-mocks/people-service-metadata.yaml:false,api-mocks/people-service-examples.yaml:false + name: FINOS TraderX People Service + version: v1 trade-feed: type: service account-service: type: endpoint params: port: 18088 - openapi_file: api-mocks/account-service-openapi.json - openapi_title: FINOS TraderX Account Service + artifacts: api-mocks/account-service-openapi.json:true,api-mocks/account-service-examples.yaml:false + name: FINOS TraderX Account Service + version: 0.1.0 reference-data: type: endpoint params: port: 18085 - openapi_file: api-mocks/reference-data-openapi.json - openapi_title: FINOS TraderX Reference Data \ No newline at end of file + artifacts: api-mocks/reference-data-openapi.json:true,api-mocks/reference-data-examples.yaml:false + name: FINOS TraderX Reference Data + version: '1.0' \ No newline at end of file From 4473b20e19c447eefdcf0d8ba8010989206ba197 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 14 Mar 2026 13:25:43 -0400 Subject: [PATCH 06/15] fix new params in k8s provisioner Signed-off-by: Mathieu Benoit --- ...-endpoint-with-microcks-cli.provisioners.yaml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/samples/traderx/score-provisioners/k8s/10-endpoint-with-microcks-cli.provisioners.yaml b/samples/traderx/score-provisioners/k8s/10-endpoint-with-microcks-cli.provisioners.yaml index cded45f..e37c0d3 100644 --- a/samples/traderx/score-provisioners/k8s/10-endpoint-with-microcks-cli.provisioners.yaml +++ b/samples/traderx/score-provisioners/k8s/10-endpoint-with-microcks-cli.provisioners.yaml @@ -1,9 +1,12 @@ +# Custom updates for now, will need to contribute back to the community provisioners repository later on. - uri: cmd://bash#endpoint-with-microcks-cli type: endpoint description: Outputs an endpoint URL for connecting to an other workload (a Microcks mock is generated if not found). supported_params: - port - - openapi_file + - artifacts + - name + - version expected_outputs: - url args: @@ -11,7 +14,13 @@ - | STDIN=$(cat) PARAM_PORT=$(echo $STDIN | yq eval -p json '.resource_params.port') - PARAM_OPENAPI_FILE=$(echo $STDIN | yq eval -p json '.resource_params.openapi_file') + PARAM_NAME=$(echo $STDIN | yq eval -p json '.resource_params.name') + PARAM_VERSION=$(echo $STDIN | yq eval -p json '.resource_params.version') + PARAM_ARTIFACTS=$(echo $STDIN | yq eval -p json '.resource_params.artifacts') + SPEC_FILE="" + if [ "$PARAM_ARTIFACTS" != "" ]; then + SPEC_FILE=$(echo $STDIN | yq eval -p json '.resource_params.artifacts | split(",") | .[0]') + fi WORKLOAD=$(echo $STDIN | yq eval -p json '.resource_id | split(".") | .[-1]') WORKLOAD_EXISTS=$(echo $STDIN | WORKLOAD=${WORKLOAD} yq eval -p json '.workload_services | has(strenv(WORKLOAD))') URL_HOSTNAME=${WORKLOAD}:${PARAM_PORT} @@ -20,10 +29,9 @@ if [ "$WORKLOAD_EXISTS" != "true" ]; then URL_HOSTNAME="microcks.127.0.0.1.nip.io" URL_SCHEME="https" - SPEC_FILE="${PARAM_OPENAPI_FILE}" URL_PATH=/rest/$(cat $SPEC_FILE | yq eval '.info.title' | yq '. |= sub(" ", "+")') set -eu -o pipefail - microcks import ${SPEC_FILE}:true --microcksURL=https://${URL_HOSTNAME} --insecure-tls --keycloakClientId=foo --keycloakClientSecret=bar >&2 + microcks import ${PARAM_ARTIFACTS} --microcksURL=https://${URL_HOSTNAME} --insecure-tls --keycloakClientId=foo --keycloakClientSecret=bar >&2 fi OUTPUTS='{"resource_outputs":{"url":"%s://%s%s"},"manifests":[]}' printf "$OUTPUTS" "$URL_SCHEME" "$URL_HOSTNAME" "$URL_PATH" \ No newline at end of file From b7ae751a0cc6366e8e73bb5fb2648b68f0ee0c8e Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 14 Mar 2026 19:55:18 -0400 Subject: [PATCH 07/15] update ingress to use the mock endpoints Signed-off-by: Mathieu Benoit --- samples/traderx/Makefile | 2 +- samples/traderx/ingress/Dockerfile.mock | 13 ++++ .../ingress/nginx.traderx-mock.conf.template | 59 +++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 samples/traderx/ingress/Dockerfile.mock create mode 100644 samples/traderx/ingress/nginx.traderx-mock.conf.template diff --git a/samples/traderx/Makefile b/samples/traderx/Makefile index 4b7fcb1..62e07e4 100644 --- a/samples/traderx/Makefile +++ b/samples/traderx/Makefile @@ -54,7 +54,7 @@ compose-mock.yaml: database/score.yaml ingress/score.yaml position-service/score web-frontend/score.yaml score-compose generate \ ingress/score.yaml \ - --build 'ingress={"context":"ingress/","tags":["ingress:local"]}' + --build 'ingress={"context":"ingress/","dockerfile":"Dockerfile.mock","tags":["ingress:local"]}' ## Generate a compose.yaml file from the score specs and launch it. .PHONY: compose-up diff --git a/samples/traderx/ingress/Dockerfile.mock b/samples/traderx/ingress/Dockerfile.mock new file mode 100644 index 0000000..a97742d --- /dev/null +++ b/samples/traderx/ingress/Dockerfile.mock @@ -0,0 +1,13 @@ +FROM nginx:alpine-slim + +EXPOSE 8080 +ARG NGINX_HOST="localhost" +ENV NGINX_HOST=$NGINX_HOST + +# This is a workaround for the dollar sign in the envsubst command +ARG DOLLAR="$" +ENV DOLLAR=$DOLLAR + +COPY nginx.traderx-mock.conf.template /etc/nginx/conf.d/nginx.traderx.conf.template + +RUN envsubst < /etc/nginx/conf.d/nginx.traderx.conf.template > /etc/nginx/conf.d/default.conf \ No newline at end of file diff --git a/samples/traderx/ingress/nginx.traderx-mock.conf.template b/samples/traderx/ingress/nginx.traderx-mock.conf.template new file mode 100644 index 0000000..16a41fc --- /dev/null +++ b/samples/traderx/ingress/nginx.traderx-mock.conf.template @@ -0,0 +1,59 @@ +server { + listen 8080; + server_name $NGINX_HOST; + + location /db-web/ { + proxy_pass http://database-database:18084/; + } + location /reference-data/ { + proxy_pass http://localhost:9090/rest/FINOS+TraderX+Reference+Data/1.0/; + } + + location /ng-cli-ws { + proxy_pass http://web-frontend-web-frontend:18093/ng-cli-ws; + proxy_http_version 1.1; + proxy_set_header Upgrade ${DOLLAR}http_upgrade; + proxy_set_header Connection "upgrade"; + } + + location /trade-feed/ { + proxy_set_header X-Forwarded-For ${DOLLAR}proxy_add_x_forwarded_for; + proxy_set_header Host ${DOLLAR}http_host; + + proxy_pass http://trade-feed-trade-feed:18086/; + + proxy_http_version 1.1; + proxy_set_header Upgrade ${DOLLAR}http_upgrade; + proxy_set_header Connection "upgrade"; + } + + location /socket.io/ { + proxy_set_header X-Forwarded-For ${DOLLAR}proxy_add_x_forwarded_for; + proxy_set_header Host ${DOLLAR}http_host; + + proxy_pass http://trade-feed-trade-feed:18086/socket.io/; + + proxy_http_version 1.1; + proxy_set_header Upgrade ${DOLLAR}http_upgrade; + proxy_set_header Connection "upgrade"; + } + + location /people-service/ { + proxy_pass http://localhost:9090/rest/FINOS+TraderX+People+Service/v1/; + } + location /account-service/ { + proxy_pass http://localhost:9090/rest/FINOS+TraderX+Account+Service/0.1.0; + } + location /position-service/ { + proxy_pass http://position-service-position-service:18090/; + } + location /trade-service/ { + proxy_pass http://trade-service-trade-service:18092/; + } + location /trade-processor/ { + proxy_pass http://trade-processor-trade-processor:18091/; + } + location / { + proxy_pass http://web-frontend-web-frontend:18093/; + } + } \ No newline at end of file From c13990d4fbd8fbf596c8908fd597bf01635e07b2 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sun, 15 Mar 2026 12:45:50 -0400 Subject: [PATCH 08/15] Fix make doc Signed-off-by: Mathieu Benoit --- samples/traderx/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/traderx/Makefile b/samples/traderx/Makefile index 62e07e4..a738b34 100644 --- a/samples/traderx/Makefile +++ b/samples/traderx/Makefile @@ -57,7 +57,7 @@ compose-mock.yaml: database/score.yaml ingress/score.yaml position-service/score --build 'ingress={"context":"ingress/","dockerfile":"Dockerfile.mock","tags":["ingress:local"]}' ## Generate a compose.yaml file from the score specs and launch it. -.PHONY: compose-up +.PHONY: compose-mock-up compose-mock-up: compose-mock.yaml docker compose up --build -d --remove-orphans From 5ee21e586238de7a1dc531d6c89932bea9880862 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sun, 15 Mar 2026 18:04:16 -0400 Subject: [PATCH 09/15] microcks-uber - size: 65536 Signed-off-by: Mathieu Benoit --- samples/traderx/Makefile | 2 +- .../traderx/score-patchers/compose/microcks.tpl | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 samples/traderx/score-patchers/compose/microcks.tpl diff --git a/samples/traderx/Makefile b/samples/traderx/Makefile index a738b34..6f5ed6e 100644 --- a/samples/traderx/Makefile +++ b/samples/traderx/Makefile @@ -14,7 +14,7 @@ help: .score-compose/state.yaml: score-compose init \ --no-sample \ - --patch-templates https://raw.githubusercontent.com/score-spec/community-patchers/refs/heads/main/score-compose/microcks.tpl \ + --patch-templates ./score-patchers/compose/microcks.tpl \ --provisioners https://raw.githubusercontent.com/score-spec/community-provisioners/refs/heads/main/service/score-compose/10-service.provisioners.yaml \ --provisioners ./score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml diff --git a/samples/traderx/score-patchers/compose/microcks.tpl b/samples/traderx/score-patchers/compose/microcks.tpl new file mode 100644 index 0000000..c0f23b3 --- /dev/null +++ b/samples/traderx/score-patchers/compose/microcks.tpl @@ -0,0 +1,15 @@ +- op: set + path: services.microcks + value: + image: quay.io/microcks/microcks-uber:latest-native + read_only: true + user: "65532" + cap_drop: ["ALL"] + ports: + - target: 8080 + published: "9090" + volumes: + - type: tmpfs + target: /tmp + tmpfs: + size: 65536 \ No newline at end of file From 31c075d2cde51ad35ca4dcb61db82fa26c0a6fd8 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Mon, 16 Mar 2026 16:51:15 -0400 Subject: [PATCH 10/15] Fix accountId: 52335 Signed-off-by: Mathieu Benoit --- .../api-mocks/position-service-examples.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/samples/traderx/api-mocks/position-service-examples.yaml b/samples/traderx/api-mocks/position-service-examples.yaml index 26c114b..0aaf886 100644 --- a/samples/traderx/api-mocks/position-service-examples.yaml +++ b/samples/traderx/api-mocks/position-service-examples.yaml @@ -5,15 +5,15 @@ metadata: version: 0.1.0 operations: GET /trades/{accountId}: - '52355': + '52335': request: parameters: - accountId: 52355 + accountId: 52335 response: mediaType: application/json body: - - id: TRADE-52355-AABBCC - accountId: 52355 + - id: TRADE-52335-AABBCC + accountId: 52335 security: BAC side: Sell state: Settled @@ -21,14 +21,14 @@ operations: updated: 2026-03-11T08:57:54.758+00:00 created: 2026-03-11T08:57:54.758+00:00 GET /positions/{accountId}: - '52355': + '52335': request: parameters: - accountId: 52355 + accountId: 52335 response: mediaType: application/json body: - - accountId: 52355 + - accountId: 52335 security: BAC quantity: -2400 updated: 2026-03-11T08:57:54.763+00:00 From 1415889ae724b1825d1283b2ca3a8d2065ff2972 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Mon, 16 Mar 2026 16:52:23 -0400 Subject: [PATCH 11/15] Fix restart: on-failure for each mock Signed-off-by: Mathieu Benoit --- .../compose/10-endpoint-with-microcks.provisioners.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml b/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml index 64f9773..f5c02ca 100644 --- a/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml +++ b/samples/traderx/score-provisioners/compose/10-endpoint-with-microcks.provisioners.yaml @@ -30,7 +30,7 @@ {{ if or (not $w) (not $w.ServiceName) }} {{ .Init.hostname }}-mock: image: quay.io/microcks/microcks-cli:latest - restart: always + restart: on-failure entrypoint: - "microcks" - "import" From 46397d3b3cf2274f274fc4c4ae82b49e4de3deaa Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Mon, 16 Mar 2026 16:53:17 -0400 Subject: [PATCH 12/15] Add missing position-service Mock Signed-off-by: Mathieu Benoit --- samples/traderx/Makefile | 3 +-- samples/traderx/trade-service/score.yaml | 9 ++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/samples/traderx/Makefile b/samples/traderx/Makefile index 6f5ed6e..e9c0631 100644 --- a/samples/traderx/Makefile +++ b/samples/traderx/Makefile @@ -44,10 +44,9 @@ compose-test: compose-up sleep 5 curl $$(score-compose resources get-outputs 'dns.default#ingress.dns' --format '{{ .host }}:8080') -compose-mock.yaml: database/score.yaml ingress/score.yaml position-service/score.yaml trade-feed/score.yaml trade-processor/score.yaml trade-service/score.yaml web-frontend/score.yaml .score-compose/state.yaml Makefile +compose-mock.yaml: database/score.yaml ingress/score.yaml trade-feed/score.yaml trade-processor/score.yaml trade-service/score.yaml web-frontend/score.yaml .score-compose/state.yaml Makefile score-compose generate \ database/score.yaml \ - position-service/score.yaml \ trade-feed/score.yaml \ trade-processor/score.yaml \ trade-service/score.yaml \ diff --git a/samples/traderx/trade-service/score.yaml b/samples/traderx/trade-service/score.yaml index 7f8b7ec..cfc5f66 100644 --- a/samples/traderx/trade-service/score.yaml +++ b/samples/traderx/trade-service/score.yaml @@ -21,10 +21,17 @@ resources: people-service: type: endpoint params: - port: 18090 + port: 18089 artifacts: api-mocks/people-service-openapi.json:true,api-mocks/people-service-metadata.yaml:false,api-mocks/people-service-examples.yaml:false name: FINOS TraderX People Service version: v1 + position-service: + type: endpoint + params: + port: 18090 + artifacts: api-mocks/position-service-openapi.json:true,api-mocks/position-service-examples.yaml:false + name: FINOS TraderX Position Service + version: 0.1.0 trade-feed: type: service account-service: From 96c46f0549e48bcc8336403279705d0d859f9094 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Mon, 16 Mar 2026 16:55:52 -0400 Subject: [PATCH 13/15] Fix Mock endpoint in Ingress to http://microcks:8080 + add position-service Signed-off-by: Mathieu Benoit --- samples/traderx/ingress/nginx.traderx-mock.conf.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/traderx/ingress/nginx.traderx-mock.conf.template b/samples/traderx/ingress/nginx.traderx-mock.conf.template index 16a41fc..f972995 100644 --- a/samples/traderx/ingress/nginx.traderx-mock.conf.template +++ b/samples/traderx/ingress/nginx.traderx-mock.conf.template @@ -6,7 +6,7 @@ server { proxy_pass http://database-database:18084/; } location /reference-data/ { - proxy_pass http://localhost:9090/rest/FINOS+TraderX+Reference+Data/1.0/; + proxy_pass http://microcks:8080/rest/FINOS+TraderX+Reference+Data/1.0/; } location /ng-cli-ws { @@ -39,13 +39,13 @@ server { } location /people-service/ { - proxy_pass http://localhost:9090/rest/FINOS+TraderX+People+Service/v1/; + proxy_pass http://microcks:8080/rest/FINOS+TraderX+People+Service/v1/; } location /account-service/ { - proxy_pass http://localhost:9090/rest/FINOS+TraderX+Account+Service/0.1.0; + proxy_pass http://microcks:8080/rest/FINOS+TraderX+Account+Service/0.1.0/; } location /position-service/ { - proxy_pass http://position-service-position-service:18090/; + proxy_pass http://microcks:8080/rest/FINOS+TraderX+Position+Service/0.1.0/; } location /trade-service/ { proxy_pass http://trade-service-trade-service:18092/; From f56a9cea71dbdc3e9679a894c76d7bd38554df2c Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Wed, 18 Mar 2026 10:44:05 -0400 Subject: [PATCH 14/15] tmpfs.size: 655360, otherwise not able to import reference data Signed-off-by: Mathieu Benoit --- samples/traderx/score-patchers/compose/microcks.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/traderx/score-patchers/compose/microcks.tpl b/samples/traderx/score-patchers/compose/microcks.tpl index c0f23b3..0e6cf3f 100644 --- a/samples/traderx/score-patchers/compose/microcks.tpl +++ b/samples/traderx/score-patchers/compose/microcks.tpl @@ -1,7 +1,7 @@ - op: set path: services.microcks value: - image: quay.io/microcks/microcks-uber:latest-native + image: quay.io/microcks/microcks-uber:nightly-native read_only: true user: "65532" cap_drop: ["ALL"] @@ -12,4 +12,4 @@ - type: tmpfs target: /tmp tmpfs: - size: 65536 \ No newline at end of file + size: 655360 \ No newline at end of file From 3dba7208830e6aadf661ce5d8e8fd17fe30b7c2d Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Wed, 18 Mar 2026 11:25:05 -0400 Subject: [PATCH 15/15] ../../.scripts/setup-kind-cluster.sh Signed-off-by: Mathieu Benoit --- samples/aks-store-demo/Makefile | 2 +- samples/onlineboutique/Makefile | 2 +- samples/traderx/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/aks-store-demo/Makefile b/samples/aks-store-demo/Makefile index 225f945..98e9939 100644 --- a/samples/aks-store-demo/Makefile +++ b/samples/aks-store-demo/Makefile @@ -57,7 +57,7 @@ manifests.yaml: makeline/score.yaml order/score.yaml product/score.yaml store-ad ## Create a local Kind cluster. .PHONY: kind-create-cluster kind-create-cluster: - ./scripts/setup-kind-cluster.sh + ../../.scripts/setup-kind-cluster.sh NAMESPACE ?= default ## Generate a manifests.yaml file from the score spec and apply it in Kubernetes. diff --git a/samples/onlineboutique/Makefile b/samples/onlineboutique/Makefile index 03c3a4f..7032da5 100644 --- a/samples/onlineboutique/Makefile +++ b/samples/onlineboutique/Makefile @@ -76,7 +76,7 @@ manifests.yaml: ad/score.yaml cart/score.yaml currency/score.yaml email/score.ya ## Create a local Kind cluster. .PHONY: kind-create-cluster kind-create-cluster: - ./scripts/setup-kind-cluster.sh + ../../.scripts/setup-kind-cluster.sh ## Load the local container image in the current Kind cluster. .PHONY: kind-load-image diff --git a/samples/traderx/Makefile b/samples/traderx/Makefile index e9c0631..8e39bdf 100644 --- a/samples/traderx/Makefile +++ b/samples/traderx/Makefile @@ -89,7 +89,7 @@ manifests.yaml: account-service/score.yaml database/score.yaml ingress/score.yam ## Create a local Kind cluster. .PHONY: kind-create-cluster kind-create-cluster: - ./scripts/setup-kind-cluster.sh + ../../.scripts/setup-kind-cluster.sh ## Load the local container image in the current Kind cluster. .PHONY: kind-load-image