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

feat: don't use openidconnect discovery url #1081

Merged
merged 4 commits into from
Dec 26, 2023
Merged

feat: don't use openidconnect discovery url #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a07946b
feat(fctl): add reconciliation (#1077)
paul-nicolas Dec 22, 2023
735dfb6
feat: stack url
gfyrag Dec 22, 2023
9fc042f
fix: issuer
gfyrag Dec 22, 2023
c0f7b39
chore: upgrade ES version
flemzord Dec 22, 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
6 changes: 5 additions & 1 deletion components/operator/apis/stack/v1beta3/stack_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,14 @@ func (s *Stack) GetScheme() string {
return "https"
}

func (s *Stack) URL() string {
func (s *Stack) PublicURL() string {
return fmt.Sprintf("%s://%s", s.GetScheme(), s.Spec.Host)
}

func (s *Stack) URL() string {
return "http://gateway:8000"
}

func (in *Stack) GetServiceNamespacedName(service string) types.NamespacedName {
return types.NamespacedName{
Namespace: in.Name,
Expand Down
4 changes: 2 additions & 2 deletions ...llers/stack/testdata/monopod-disabled-one-service/results/configmaps--v1/auth-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ data:
- public: false
description: null
redirectUris:
- http://example.net/auth/login
- http://gateway:8000/auth/login
PostLogoutRedirectUris:
- http://example.net/auth/destroy
- http://gateway:8000/auth/destroy
scopes:
- openid
- profile
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -12,7 +12,7 @@ data:

(auth) {
auth {
issuer http://example.net/api/auth
issuer http://gateway:8000/api/auth

read_key_set_max_retries 10
}
Expand Down
26 changes: 24 additions & 2 deletions ...onopod-disabled-one-service/results/deployments-apps-v1/monopod-disabled-one-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: auth
Expand Down Expand Up @@ -137,13 +139,15 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: control
- name: STACK
value: monopod-disabled-one-service
- name: API_URL
value: http://example.net
value: http://gateway:8000
- name: ENCRYPTION_KEY
value: 9h44y2ZqrDuUy5R9NGLA9hca7uRUr932
- name: ENCRYPTION_IV
Expand All @@ -153,7 +157,7 @@ spec:
- name: CLIENT_SECRET
value: mocked-secret
- name: REDIRECT_URI
value: http://example.net
value: http://gateway:8000
- name: UNSECURE_COOKIES
value: "false"
image: ghcr.io/formancehq/control:latest
Expand Down Expand Up @@ -200,6 +204,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: gateway
Expand Down Expand Up @@ -270,6 +276,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: payments-api
Expand Down Expand Up @@ -351,6 +359,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: payments-connectors
Expand Down Expand Up @@ -415,6 +425,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: search
Expand Down Expand Up @@ -503,6 +515,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: search-benthos
Expand Down Expand Up @@ -592,6 +606,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: stargate
Expand Down Expand Up @@ -655,6 +671,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: wallets
Expand Down Expand Up @@ -728,6 +746,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: webhooks
Expand Down Expand Up @@ -805,6 +825,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: webhooks-worker
Expand Down
4 changes: 2 additions & 2 deletions ...nternal/controllers/stack/testdata/monopod-latest/results/configmaps--v1/auth-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ data:
- public: false
description: null
redirectUris:
- http://example.net/auth/login
- http://gateway:8000/auth/login
PostLogoutRedirectUris:
- http://example.net/auth/destroy
- http://gateway:8000/auth/destroy
scopes:
- openid
- profile
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -12,7 +12,7 @@ data:

(auth) {
auth {
issuer http://example.net/api/auth
issuer http://gateway:8000/api/auth

read_key_set_max_retries 10
}
Expand Down
32 changes: 30 additions & 2 deletions ...controllers/stack/testdata/monopod-latest/results/deployments-apps-v1/monopod-latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: auth
Expand Down Expand Up @@ -137,13 +139,15 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: control
- name: STACK
value: monopod-latest
- name: API_URL
value: http://example.net
value: http://gateway:8000
- name: ENCRYPTION_KEY
value: 9h44y2ZqrDuUy5R9NGLA9hca7uRUr932
- name: ENCRYPTION_IV
Expand All @@ -153,7 +157,7 @@ spec:
- name: CLIENT_SECRET
value: mocked-secret
- name: REDIRECT_URI
value: http://example.net
value: http://gateway:8000
- name: UNSECURE_COOKIES
value: "false"
image: ghcr.io/formancehq/control:latest
Expand Down Expand Up @@ -200,6 +204,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: gateway
Expand Down Expand Up @@ -267,6 +273,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: ledger
Expand Down Expand Up @@ -344,6 +352,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: orchestration
Expand Down Expand Up @@ -423,6 +433,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: orchestration-worker
Expand Down Expand Up @@ -499,6 +511,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: payments-api
Expand Down Expand Up @@ -580,6 +594,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: payments-connectors
Expand Down Expand Up @@ -644,6 +660,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: search
Expand Down Expand Up @@ -732,6 +750,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: search-benthos
Expand Down Expand Up @@ -821,6 +841,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: stargate
Expand Down Expand Up @@ -884,6 +906,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: wallets
Expand Down Expand Up @@ -957,6 +981,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: webhooks
Expand Down Expand Up @@ -1034,6 +1060,8 @@ spec:
- name: DEV
value: "false"
- name: STACK_URL
value: http://gateway:8000
- name: STACK_PUBLIC_URL
value: http://example.net
- name: OTEL_SERVICE_NAME
value: webhooks-worker
Expand Down
4 changes: 2 additions & 2 deletions ...ernal/controllers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/auth-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ data:
- public: false
description: null
redirectUris:
- http://example.net/auth/login
- http://gateway:8000/auth/login
PostLogoutRedirectUris:
- http://example.net/auth/destroy
- http://gateway:8000/auth/destroy
scopes:
- openid
- profile
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -12,7 +12,7 @@ data:

(auth) {
auth {
issuer http://example.net/api/auth
issuer http://gateway:8000/api/auth

read_key_set_max_retries 10
}
Expand Down
Loading