Skip to content

Commit 9b97004

Browse files
committed
Merge remote-tracking branch 'origin/master' into jimmy/BACK-2784-proxy-user-profile-requests
2 parents e003f38 + 6f611dd commit 9b97004

File tree

73 files changed

+1903
-708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1903
-708
lines changed

LICENSE

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
BSD 2-Clause License
2+
3+
Copyright (c) 2018, Tidepool Project
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are met:
7+
8+
1. Redistributions of source code must retain the above copyright notice, this
9+
list of conditions and the following disclaimer.
10+
11+
2. Redistributions in binary form must reproduce the above copyright notice,
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
14+
15+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
16+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
19+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
21+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
22+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
23+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ blip:
777777
hostPath: ../blip # Uncommented and path matches the cloned blip repo location
778778
containerPath: "/app"
779779
apiHost: "http://localhost:31500"
780-
webpackDevTool: cheap-module-eval-source-map
780+
webpackDevTool: eval-cheap-module-source-map
781781
webpackPublicPath: "http://localhost:31500"
782782
linkedPackages:
783783
- name: tideline
@@ -809,7 +809,7 @@ blip:
809809
hostPath: ../blip
810810
containerPath: "/app"
811811
apiHost: "http://localhost:31500"
812-
webpackDevTool: cheap-module-eval-source-map
812+
webpackDevTool: eval-cheap-module-source-map
813813
webpackPublicPath: "http://localhost:31500"
814814
linkedPackages:
815815
# ...

Tiltconfig.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
### Global Config Start ###
66
global:
7+
deployment:
8+
imagePullSecrets:
79
glooingress:
810
enabled: true
911
jwt:
@@ -222,6 +224,7 @@ auth:
222224
containerPath: '/go/src/github.com/tidepool-org/platform'
223225
dockerFile: 'Dockerfile.auth'
224226
rebuildCommand: 'SERVICE=auth make service-build'
227+
buildTarget: production
225228

226229
blip:
227230
deployment:
@@ -233,7 +236,7 @@ blip:
233236
rollbarPostServerToken: '' # Rollbar post_server_item access token for posting source maps on production builds
234237
reactAppGAID: '' # Google Analytics 4 ID
235238
launchDarklyClientToken: '' # LaunchDarkly client token
236-
webpackDevTool: cheap-module-eval-source-map
239+
webpackDevTool: eval-cheap-module-source-map
237240
webpackDevToolViz: cheap-source-map # Suggest changing `cheap-source-map` to the slower, but far more helpful `source-map` if debugging errors in viz package files
238241
webpackPublicPath: 'http://localhost:31500/'
239242
linkedPackages:
@@ -272,14 +275,14 @@ blob:
272275
containerPath: '/go/src/github.com/tidepool-org/platform'
273276
dockerFile: 'Dockerfile.blob'
274277
rebuildCommand: 'SERVICE=blob make service-build'
278+
buildTarget: production
275279

276280
clinic:
277281
deployment:
278282
replicas: 1
279283
# image: tidepool-k8s-clinic # Uncomment to build and run local image or a specific remote image
280284
# hostPath: ~/go/src/github.com/tidepool-org/clinic # Uncomment to build and run local image
281285
containerPath: '/go/src/github.com/tidepool-org/clinic'
282-
dockerFile: 'Dockerfile'
283286
buildTarget: development
284287

285288
clinic-worker:
@@ -288,7 +291,6 @@ clinic-worker:
288291
# image: tidepool-k8s-clinic-worker # Uncomment to build and run local image or a specific remote image
289292
# hostPath: ~/go/src/github.com/tidepool-org/clinic-worker # Uncomment to build and run local image
290293
containerPath: '/go/src/github.com/tidepool-org/clinic-worker'
291-
dockerFile: 'Dockerfile'
292294
rebuildCommand: 'make build'
293295
configmap:
294296
enabled: true
@@ -302,6 +304,7 @@ data:
302304
containerPath: '/go/src/github.com/tidepool-org/platform'
303305
dockerFile: 'Dockerfile.data'
304306
rebuildCommand: 'SERVICE=data make service-build'
307+
buildTarget: production
305308

306309
devices:
307310
deployment:
@@ -335,6 +338,9 @@ hydrophone:
335338
env:
336339
clinicServiceEnabled: true
337340
useMockNotifier: true
341+
store:
342+
s3:
343+
bucket: tidepool-prd-asset
338344
# image: tidepool-k8s-hydrophone # Uncomment to build and run local image or a specific remote image
339345
# hostPath: ~/go/src/github.com/tidepool-org/hydrophone # Uncomment to build and run local image
340346
containerPath: '/go/src/github.com/tidepool-org/hydrophone'
@@ -374,6 +380,7 @@ migrations:
374380
containerPath: '/go/src/github.com/tidepool-org/platform'
375381
dockerFile: 'Dockerfile.migrations'
376382
rebuildCommand: 'SERVICE=migrations make service-build'
383+
buildTarget: production
377384

378385
prescription:
379386
deployment:
@@ -383,6 +390,7 @@ prescription:
383390
containerPath: '/go/src/github.com/tidepool-org/platform'
384391
dockerFile: 'Dockerfile.prescription'
385392
rebuildCommand: 'SERVICE=prescription make service-build'
393+
buildTarget: production
386394

387395
seagull:
388396
deployment:
@@ -423,6 +431,7 @@ task:
423431
containerPath: '/go/src/github.com/tidepool-org/platform'
424432
dockerFile: 'Dockerfile.task'
425433
rebuildCommand: 'SERVICE=task make service-build'
434+
buildTarget: production
426435

427436
tidewhisperer:
428437
deployment:
@@ -438,6 +447,7 @@ tools:
438447
containerPath: '/go/src/github.com/tidepool-org/platform'
439448
dockerFile: 'Dockerfile.tools'
440449
rebuildCommand: 'SERVICE=tools make service-build'
450+
buildTarget: production
441451

442452
uploader:
443453
deployment:
@@ -451,7 +461,7 @@ uploader:
451461
blipUrl: 'http://localhost:31500'
452462
realmHost: 'http://localhost:32000'
453463
rollbarPostServerToken: '' # Rollbar post_server_item access token for posting source maps on production builds
454-
webpackDevTool: cheap-module-eval-source-map
464+
webpackDevTool: eval-cheap-module-source-map
455465
webpackPublicPath: 'http://localhost:31500/uploader/'
456466
securityContext:
457467
allowPrivilegeEscalation: false

charts/keycloak/Chart.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: keycloakx
33
repository: https://codecentric.github.io/helm-charts
4-
version: 1.6.1
5-
digest: sha256:0218751786a66789ce790d61ab6453afe9022ee963c9ef265a855a5bd68a0f85
6-
generated: "2024-03-19T16:11:06.262558-07:00"
4+
version: 2.5.0
5+
digest: sha256:b9c003e73cc47375022a57a2856419d394d552911c3a27b085938372b4670f1d
6+
generated: "2025-01-15T09:11:39.641398757-07:00"

charts/keycloak/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apiVersion: v2
22
description: A Helm chart to use Keycloak with Tidepool
33
name: keycloak
4-
version: 0.4.3
4+
version: 0.4.7
55
maintainers:
66
- name: Todd Kazakov
77
email: todd@tidepool.org
88
icon: https://www.tidepool.org/static/media/tidepool-t-logo.41feef82.png
99
home: https://github.com/tidepool-org/development/charts
1010
dependencies:
1111
- name: keycloakx
12-
version: 1.6.1
12+
version: 2.5.0
1313
repository: https://codecentric.github.io/helm-charts

0 commit comments

Comments
 (0)