Skip to content

Commit

Permalink
Merge branch 'main' into fix/491-map-view-starting-point
Browse files Browse the repository at this point in the history
  • Loading branch information
Ricardo Campos authored Sep 25, 2024
2 parents f6ccc0e + 7db819d commit 90d29ff
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 29 deletions.
6 changes: 6 additions & 0 deletions backend/openshift.deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ parameters:
- name: WMS_LAYERS_WHITELIST_USERS
description: List of users that can see active layers on the map view
required: true
- name: RANDOM_EXPRESSION
description: Random expression to make sure deployments update
from: "[a-zA-Z0-9]{32}"
generate: expression
objects:
- apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -171,6 +175,8 @@ objects:
secretKeyRef:
name: ${NAME}-${ZONE}-database
key: database-user
- name: RANDOM_EXPRESSION
value: ${RANDOM_EXPRESSION}
resources:
requests:
cpu: "${CPU_REQUEST}"
Expand Down
2 changes: 1 addition & 1 deletion backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>9.40</version>
<version>9.41.1</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
6 changes: 6 additions & 0 deletions database/openshift.deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ parameters:
displayName: Database Volume Capacity
required: true
value: 256Mi
- name: RANDOM_EXPRESSION
description: Random expression to make sure deployments update
from: "[a-zA-Z0-9]{32}"
generate: expression
objects:
- kind: PersistentVolumeClaim
apiVersion: v1
Expand Down Expand Up @@ -134,6 +138,8 @@ objects:
secretKeyRef:
name: ${NAME}-${ZONE}-${COMPONENT}
key: database-user
- name: RANDOM_EXPRESSION
value: ${RANDOM_EXPRESSION}
volumeMounts:
- name: ${NAME}-${ZONE}-${COMPONENT}
mountPath: ${PVC_MOUNT_PATH}
Expand Down
6 changes: 6 additions & 0 deletions frontend/openshift.deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ parameters:
- name: VITE_USER_POOLS_WEB_CLIENT_ID
- name: VITE_ZONE
value: DEV
- name: RANDOM_EXPRESSION
description: Random expression to make sure deployments update
from: "[a-zA-Z0-9]{32}"
generate: expression
objects:
- apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -83,6 +87,8 @@ objects:
value: "${VITE_USER_POOLS_WEB_CLIENT_ID}"
- name: VITE_ZONE
value: "${ZONE}"
- name: RANDOM_EXPRESSION
value: ${RANDOM_EXPRESSION}
ports:
- containerPort: 3000
protocol: TCP
Expand Down
42 changes: 15 additions & 27 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"@types/leaflet": "^1.9.12",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/react-leaflet": "^3.0.0",
"@typescript-eslint/eslint-plugin": "^6.5.0",
"@typescript-eslint/parser": "^6.5.0",
"@vitest/coverage-v8": "^2.0.0",
Expand Down

0 comments on commit 90d29ff

Please sign in to comment.