Skip to content

Commit 22d0e09

Browse files
committed
Looked into internal and external uris.
1 parent f1cb51c commit 22d0e09

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

charts/eoapi/profiles/experimental.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ browser:
206206
enabled: true
207207
settings:
208208
resources: {}
209+
# STAC Browser needs external OIDC URL (accessible from user's browser)
210+
oidcDiscoveryUrl: "http://localhost/mock-oidc/.well-known/openid-configuration"
209211

210212
docServer:
211213
enabled: true
@@ -385,6 +387,9 @@ mockOidcServer:
385387
port: 8888
386388
clientId: "test-client"
387389
clientSecret: "test-secret"
390+
extraEnv:
391+
- name: ISSUER
392+
value: "http://localhost/mock-oidc"
388393
service:
389394
type: ClusterIP
390395
port: 8080
@@ -402,7 +407,6 @@ mockOidcServer:
402407
tolerations: []
403408
affinity: {}
404409
imagePullSecrets: []
405-
extraEnv: []
406410

407411
######################
408412
# SERVICE

charts/eoapi/templates/networking/ingress-no-prefix.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ spec:
4949

5050
{{- if and $.Values.browser.enabled (or (not (hasKey $.Values.browser "ingress")) $.Values.browser.ingress.enabled) }}
5151
- pathType: {{ if eq $.Values.ingress.className "nginx" }}ImplementationSpecific{{ else }}Prefix{{ end }}
52-
path: "/browser{{ if eq $.Values.ingress.className "nginx" }}(/|$)(.*){{ end }}"
52+
path: "{{ $.Values.browser.ingress.path | default "/browser" }}{{ if eq $.Values.ingress.className "nginx" }}(/|$)(.*){{ end }}"
5353
backend:
5454
service:
5555
name: {{ $.Release.Name }}-browser
@@ -79,7 +79,7 @@ spec:
7979

8080
{{- if and .Values.browser.enabled (or (not (hasKey .Values.browser "ingress")) .Values.browser.ingress.enabled) }}
8181
- pathType: {{ if eq .Values.ingress.className "nginx" }}ImplementationSpecific{{ else }}Prefix{{ end }}
82-
path: "/browser{{ if eq .Values.ingress.className "nginx" }}(/|$)(.*){{ end }}"
82+
path: "{{ .Values.browser.ingress.path | default "/browser" }}{{ if eq .Values.ingress.className "nginx" }}(/|$)(.*){{ end }}"
8383
backend:
8484
service:
8585
name: {{ .Release.Name }}-browser

charts/eoapi/templates/services/browser/deployment.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ spec:
3232
value: |
3333
{
3434
"type": "openIdConnect",
35-
"openIdConnectUrl": "{{ index .Values "stac-auth-proxy" "env" "OIDC_DISCOVERY_URL" }}",
35+
"openIdConnectUrl": "{{ .Values.browser.oidcDiscoveryUrl }}",
3636
"oidcOptions": {
37-
"client_id": "{{ .Values.browser.oidcClientId | default "test-client" }}"
37+
"client_id": "{{ .Values.browser.oidcClientId | default "test-client" }}",
38+
"redirect_uri": "http://{{ .Values.ingress.host }}{{ .Values.browser.ingress.path | default "/browser" | trimSuffix "/" }}/auth"
3839
}
3940
}
4041
{{- end }}

charts/eoapi/values.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,8 +496,12 @@ browser:
496496
tag: 3.3.4
497497
ingress:
498498
enabled: true # Control ingress specifically for browser service
499-
# OAuth2 client ID for browser (frontend app). Reads OIDC_DISCOVERY_URL from stac-auth-proxy.env
500-
oidcClientId: "some-client-id"
499+
path: "/browser"
500+
# OAuth2 client ID for browser (frontend app)
501+
oidcClientId: "stac-browser"
502+
# OIDC discovery URL for browser (must be externally accessible URL)
503+
# Required when stac-auth-proxy is enabled
504+
oidcDiscoveryUrl: ""
501505

502506
docServer:
503507
enabled: true

0 commit comments

Comments
 (0)