Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(gateway): handle versions per modules #1023

Merged
merged 3 commits into from
Dec 18, 2023
Merged

fix(gateway): handle versions per modules #1023

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
e780538
fix(operator): fix caddyfile to handle versions per modules
paul-nicolas Dec 18, 2023
c3a5a15
fix(gateway): handle versions per modules
paul-nicolas Dec 18, 2023
a32b9a7
only do it for gateway >= 0.1.8
paul-nicolas Dec 18, 2023
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
22 changes: 16 additions & 6 deletions ...rs/stack/testdata/monopod-disabled-one-service/results/configmaps--v1/gateway-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,22 @@ data:
region "us-west-1"
env "staging"
endpoints {
auth http://127.0.0.1:10004/_info http://127.0.0.1:10004/_healthcheck
payments-api http://127.0.0.1:10002/_info http://127.0.0.1:10002/_health
payments-connectors http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
search http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
wallets http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
webhooks http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
auth {
http://127.0.0.1:10004/_info http://127.0.0.1:10004/_healthcheck
}
payments {
http://127.0.0.1:10002/_info http://127.0.0.1:10002/_health
http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
}
search {
http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
}
wallets {
http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
}
webhooks {
http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
}
}
}
}
Expand Down
30 changes: 22 additions & 8 deletions ...rnal/controllers/stack/testdata/monopod-latest/results/configmaps--v1/gateway-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,28 @@ data:
region "us-west-1"
env "staging"
endpoints {
auth http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
ledger http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
orchestration http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
payments-api http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
payments-connectors http://127.0.0.1:10004/_info http://127.0.0.1:10004/_health
search http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
wallets http://127.0.0.1:10002/_info http://127.0.0.1:10002/_healthcheck
webhooks http://127.0.0.1:10007/_info http://127.0.0.1:10007/_healthcheck
auth {
http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
}
ledger {
http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
}
orchestration {
http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
}
payments {
http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
http://127.0.0.1:10004/_info http://127.0.0.1:10004/_health
}
search {
http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
}
wallets {
http://127.0.0.1:10002/_info http://127.0.0.1:10002/_healthcheck
}
webhooks {
http://127.0.0.1:10007/_info http://127.0.0.1:10007/_healthcheck
}
}
}
}
Expand Down
30 changes: 22 additions & 8 deletions ...al/controllers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/gateway-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,28 @@ data:
region "us-west-1"
env "staging"
endpoints {
auth http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
ledger http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
orchestration http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
payments-api http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
payments-connectors http://127.0.0.1:10004/_info http://127.0.0.1:10004/_health
search http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
wallets http://127.0.0.1:10002/_info http://127.0.0.1:10002/_healthcheck
webhooks http://127.0.0.1:10007/_info http://127.0.0.1:10007/_healthcheck
auth {
http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
}
ledger {
http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
}
orchestration {
http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
}
payments {
http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
http://127.0.0.1:10004/_info http://127.0.0.1:10004/_health
}
search {
http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
}
wallets {
http://127.0.0.1:10002/_info http://127.0.0.1:10002/_healthcheck
}
webhooks {
http://127.0.0.1:10007/_info http://127.0.0.1:10007/_healthcheck
}
}
}
}
Expand Down
30 changes: 22 additions & 8 deletions ...testdata/monopod-payments-after-v1.0.0-alpha.6/results/configmaps--v1/gateway-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,28 @@ data:
region "us-west-1"
env "staging"
endpoints {
auth http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
ledger http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
orchestration http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
payments-api http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
payments-connectors http://127.0.0.1:10004/_info http://127.0.0.1:10004/_health
search http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
wallets http://127.0.0.1:10002/_info http://127.0.0.1:10002/_healthcheck
webhooks http://127.0.0.1:10007/_info http://127.0.0.1:10007/_healthcheck
auth {
http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
}
ledger {
http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
}
orchestration {
http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
}
payments {
http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
http://127.0.0.1:10004/_info http://127.0.0.1:10004/_health
}
search {
http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
}
wallets {
http://127.0.0.1:10002/_info http://127.0.0.1:10002/_healthcheck
}
webhooks {
http://127.0.0.1:10007/_info http://127.0.0.1:10007/_healthcheck
}
}
}
}
Expand Down
28 changes: 21 additions & 7 deletions ...estdata/monopod-payments-before-v1.0.0-alpha.6/results/configmaps--v1/gateway-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,27 @@ data:
region "us-west-1"
env "staging"
endpoints {
auth http://127.0.0.1:10004/_info http://127.0.0.1:10004/_healthcheck
ledger http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
orchestration http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
payments http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
search http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
wallets http://127.0.0.1:10002/_info http://127.0.0.1:10002/_healthcheck
webhooks http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
auth {
http://127.0.0.1:10004/_info http://127.0.0.1:10004/_healthcheck
}
ledger {
http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
}
orchestration {
http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
}
payments {
http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
}
search {
http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
}
wallets {
http://127.0.0.1:10002/_info http://127.0.0.1:10002/_healthcheck
}
webhooks {
http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
}
}
}
}
Expand Down
30 changes: 22 additions & 8 deletions ...rs/stack/testdata/monopod-search-before-v0.7.0/results/configmaps--v1/gateway-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,28 @@ data:
region "us-west-1"
env "staging"
endpoints {
auth http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
ledger http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
orchestration http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
payments-api http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
payments-connectors http://127.0.0.1:10004/_info http://127.0.0.1:10004/_health
search http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
wallets http://127.0.0.1:10002/_info http://127.0.0.1:10002/_healthcheck
webhooks http://127.0.0.1:10007/_info http://127.0.0.1:10007/_healthcheck
auth {
http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
}
ledger {
http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
}
orchestration {
http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
}
payments {
http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
http://127.0.0.1:10004/_info http://127.0.0.1:10004/_health
}
search {
http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
}
wallets {
http://127.0.0.1:10002/_info http://127.0.0.1:10002/_healthcheck
}
webhooks {
http://127.0.0.1:10007/_info http://127.0.0.1:10007/_healthcheck
}
}
}
}
Expand Down
30 changes: 22 additions & 8 deletions ...rnal/controllers/stack/testdata/multipod-debug/results/configmaps--v1/gateway-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,14 +237,28 @@ data:
region "us-west-1"
env "staging"
endpoints {
auth http://auth:8080/_info http://auth:8080/_healthcheck
ledger http://ledger:8080/_info http://ledger:8080/_healthcheck
orchestration http://orchestration:8080/_info http://orchestration:8080/_healthcheck
payments-api http://payments-api:8080/_info http://payments-api:8080/_health
payments-connectors http://payments-connectors:8080/_info http://payments-connectors:8080/_health
search http://search:8080/_info http://search:8080/_healthcheck
wallets http://wallets:8080/_info http://wallets:8080/_healthcheck
webhooks http://webhooks:8080/_info http://webhooks:8080/_healthcheck
auth {
http://auth:8080/_info http://auth:8080/_healthcheck
}
ledger {
http://ledger:8080/_info http://ledger:8080/_healthcheck
}
orchestration {
http://orchestration:8080/_info http://orchestration:8080/_healthcheck
}
payments {
http://payments-api:8080/_info http://payments-api:8080/_health
http://payments-connectors:8080/_info http://payments-connectors:8080/_health
}
search {
http://search:8080/_info http://search:8080/_healthcheck
}
wallets {
http://wallets:8080/_info http://wallets:8080/_healthcheck
}
webhooks {
http://webhooks:8080/_info http://webhooks:8080/_healthcheck
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ternal/controllers/stack/testdata/multipod-debug/results/deployments-apps-v1/gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
stack.formance.cloud/volumes-hash: Q7NvcI6vScfjeoxdoeqyJuU8FPmESLvZheX7qHUTBrg=
stack.formance.cloud/volumes-hash: 9xebK6N2cZar3audOZIoMJuHUdlnw7W6Zktt5rewn5Y=
creationTimestamp: null
labels:
app.kubernetes.io/name: gateway
Expand Down
26 changes: 19 additions & 7 deletions ...s/stack/testdata/multipod-disabled-one-service/results/configmaps--v1/gateway-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,25 @@ data:
region "us-west-1"
env "staging"
endpoints {
auth http://auth:8080/_info http://auth:8080/_healthcheck
ledger http://ledger:8080/_info http://ledger:8080/_healthcheck
payments-api http://payments-api:8080/_info http://payments-api:8080/_health
payments-connectors http://payments-connectors:8080/_info http://payments-connectors:8080/_health
search http://search:8080/_info http://search:8080/_healthcheck
wallets http://wallets:8080/_info http://wallets:8080/_healthcheck
webhooks http://webhooks:8080/_info http://webhooks:8080/_healthcheck
auth {
http://auth:8080/_info http://auth:8080/_healthcheck
}
ledger {
http://ledger:8080/_info http://ledger:8080/_healthcheck
}
payments {
http://payments-api:8080/_info http://payments-api:8080/_health
http://payments-connectors:8080/_info http://payments-connectors:8080/_health
}
search {
http://search:8080/_info http://search:8080/_healthcheck
}
wallets {
http://wallets:8080/_info http://wallets:8080/_healthcheck
}
webhooks {
http://webhooks:8080/_info http://webhooks:8080/_healthcheck
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ers/stack/testdata/multipod-disabled-one-service/results/deployments-apps-v1/gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
stack.formance.cloud/volumes-hash: ewu4VkaeYQe8ylOOrA0ld396O3Y2ZkfotGuVE9HDwHw=
stack.formance.cloud/volumes-hash: O2wSHZvTjKpciRKExI9BiFy8Tg6kfU6YhrPgP4QTwTs=
creationTimestamp: null
labels:
app.kubernetes.io/name: gateway
Expand Down
30 changes: 22 additions & 8 deletions ...s/stack/testdata/multipod-latest-no-monitoring/results/configmaps--v1/gateway-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,28 @@ data:
region "us-west-1"
env "staging"
endpoints {
auth http://auth:8080/_info http://auth:8080/_healthcheck
ledger http://ledger:8080/_info http://ledger:8080/_healthcheck
orchestration http://orchestration:8080/_info http://orchestration:8080/_healthcheck
payments-api http://payments-api:8080/_info http://payments-api:8080/_health
payments-connectors http://payments-connectors:8080/_info http://payments-connectors:8080/_health
search http://search:8080/_info http://search:8080/_healthcheck
wallets http://wallets:8080/_info http://wallets:8080/_healthcheck
webhooks http://webhooks:8080/_info http://webhooks:8080/_healthcheck
auth {
http://auth:8080/_info http://auth:8080/_healthcheck
}
ledger {
http://ledger:8080/_info http://ledger:8080/_healthcheck
}
orchestration {
http://orchestration:8080/_info http://orchestration:8080/_healthcheck
}
payments {
http://payments-api:8080/_info http://payments-api:8080/_health
http://payments-connectors:8080/_info http://payments-connectors:8080/_health
}
search {
http://search:8080/_info http://search:8080/_healthcheck
}
wallets {
http://wallets:8080/_info http://wallets:8080/_healthcheck
}
webhooks {
http://webhooks:8080/_info http://webhooks:8080/_healthcheck
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ers/stack/testdata/multipod-latest-no-monitoring/results/deployments-apps-v1/gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
stack.formance.cloud/volumes-hash: vNn-AtBRv6W7kkL2YhIOCaglgZmzEX47juhrXy12OC4=
stack.formance.cloud/volumes-hash: a02vArrsq93-75hyQhELsvTZMzQ2y30-Eia8NlYPQDk=
creationTimestamp: null
labels:
app.kubernetes.io/name: gateway
Expand Down
30 changes: 22 additions & 8 deletions ...ack/testdata/multipod-latest-with-check-scopes/results/configmaps--v1/gateway-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,28 @@ data:
region "us-west-1"
env "staging"
endpoints {
auth http://auth:8080/_info http://auth:8080/_healthcheck
ledger http://ledger:8080/_info http://ledger:8080/_healthcheck
orchestration http://orchestration:8080/_info http://orchestration:8080/_healthcheck
payments-api http://payments-api:8080/_info http://payments-api:8080/_health
payments-connectors http://payments-connectors:8080/_info http://payments-connectors:8080/_health
search http://search:8080/_info http://search:8080/_healthcheck
wallets http://wallets:8080/_info http://wallets:8080/_healthcheck
webhooks http://webhooks:8080/_info http://webhooks:8080/_healthcheck
auth {
http://auth:8080/_info http://auth:8080/_healthcheck
}
ledger {
http://ledger:8080/_info http://ledger:8080/_healthcheck
}
orchestration {
http://orchestration:8080/_info http://orchestration:8080/_healthcheck
}
payments {
http://payments-api:8080/_info http://payments-api:8080/_health
http://payments-connectors:8080/_info http://payments-connectors:8080/_health
}
search {
http://search:8080/_info http://search:8080/_healthcheck
}
wallets {
http://wallets:8080/_info http://wallets:8080/_healthcheck
}
webhooks {
http://webhooks:8080/_info http://webhooks:8080/_healthcheck
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...stack/testdata/multipod-latest-with-check-scopes/results/deployments-apps-v1/gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
stack.formance.cloud/volumes-hash: RDMxfRXs1D0-3FGmRo5HN2f4uMIpozhhWfcRt_Z_OMU=
stack.formance.cloud/volumes-hash: 33PmJbU6BHSkDI-2cUBn7LL1WYvhbD0vE7qoYpAhbpM=
creationTimestamp: null
labels:
app.kubernetes.io/name: gateway
Expand Down
Loading