Skip to content

Commit aaaa83a

Browse files
committed
Added oidc env variables to deployment process.
1 parent 52e0845 commit aaaa83a

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@ ARG APP_DESCRIPTION="A web application for managing STAC catalogs"
77
ARG REACT_APP_STAC_API="https://earth-search.aws.element84.com/v0"
88
ARG REACT_APP_STAC_BROWSER="https://radiantearth.github.io/stac-browser"
99
ARG PUBLIC_URL="http://127.0.0.1:8080"
10+
ENV REACT_APP_KEYCLOAK_URL=
11+
ENV REACT_APP_KEYCLOAK_CLIENT_ID=
12+
ENV REACT_APP_KEYCLOAK_REALM=
1013

1114
ENV APP_TITLE=${APP_TITLE}
1215
ENV APP_DESCRIPTION=${APP_DESCRIPTION}
1316
ENV REACT_APP_STAC_API=${REACT_APP_STAC_API}
1417
ENV REACT_APP_STAC_BROWSER="${REACT_APP_STAC_BROWSER}/#/external/$(echo ${REACT_APP_STAC_API} | sed 's|^https://||')"
1518
ENV PUBLIC_URL=${PUBLIC_URL}
16-
ENV REACT_APP_KEYCLOAK_URL=
17-
ENV REACT_APP_KEYCLOAK_CLIENT_ID=
18-
ENV REACT_APP_KEYCLOAK_REALM=
19+
ENV REACT_APP_KEYCLOAK_URL=${REACT_APP_KEYCLOAK_URL}
20+
ENV REACT_APP_KEYCLOAK_CLIENT_ID=${REACT_APP_KEYCLOAK_CLIENT_ID}
21+
ENV REACT_APP_KEYCLOAK_REALM=${REACT_APP_KEYCLOAK_REALM}
1922

2023
# Set the working directory
2124
WORKDIR /app

charts/stac-manager/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ apiVersion: v2
88

99
name: stac-manager
1010
description: Helm chart deployment for web application to update collection and item meta data in STAC catalogs
11-
version: "0.0.7"
11+
version: "0.0.8"
1212
sources:
1313
- https://github.com/developmentseed/stac-manager
1414

1515
type: application
16-
appVersion: "0.0.7"
16+
appVersion: "0.0.8"
1717

1818
maintainers:
1919
- name: Development Seed. All Rights Reserved.

charts/stac-manager/templates/deployment.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,15 @@ spec:
4343
env:
4444
- name: REACT_APP_STAC_API
4545
value: {{ .Values.stacApi | required "Please provide a value for stacApi" }}
46-
{{ if .Values.publicUrl }}
4746
- name: PUBLIC_URL
4847
value: {{ .Values.publicUrl | required "Please provide a value for publicUrl" }}
48+
{{ if .Values.oidc }}
49+
- name: REACT_APP_KEYCLOAK_URL
50+
value: {{ .Values.oidc.providerUrl | required "Please provide a value for oidc.providerUrl" }}
51+
- name: REACT_APP_KEYCLOAK_CLIENT_ID
52+
value: {{ .Values.oidc.clientId | required "Please provide a value for oidc.clientId" }}
53+
- name: REACT_APP_KEYCLOAK_REALM
54+
value: {{ .Values.oidc.realm | required "Please provide a value for oidc.realm" }}
4955
{{ end }}
5056
livenessProbe:
5157
{{- toYaml .Values.livenessProbe | nindent 12 }}

charts/stac-manager/values.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@ livenessProbe:
4343
httpGet:
4444
path: /
4545
port: http
46-
initialDelaySeconds: 60
47-
timeoutSeconds: 10
48-
periodSeconds: 5
46+
initialDelaySeconds: 120
47+
timeoutSeconds: 15
48+
periodSeconds: 10
4949
failureThreshold: 3
5050

5151
readinessProbe:
5252
httpGet:
5353
path: /
5454
port: http
55-
initialDelaySeconds: 30
56-
timeoutSeconds: 10
57-
periodSeconds: 5
55+
initialDelaySeconds: 60
56+
timeoutSeconds: 15
57+
periodSeconds: 10
5858
failureThreshold: 3
5959

6060
autoscaling:

0 commit comments

Comments
 (0)