Merge branch 'master' into tk-jellyfish-hash

Author: darinkrauss

LICENSE

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

README.md

@@ -777,7 +777,7 @@ blip:
   hostPath: ../blip # Uncommented and path matches the cloned blip repo location
   containerPath: "/app"
   apiHost: "http://localhost:31500"
-  webpackDevTool: cheap-module-eval-source-map
+  webpackDevTool: eval-cheap-module-source-map
   webpackPublicPath: "http://localhost:31500"
   linkedPackages:
     - name: tideline
@@ -809,7 +809,7 @@ blip:
   hostPath: ../blip
   containerPath: "/app"
   apiHost: "http://localhost:31500"
-  webpackDevTool: cheap-module-eval-source-map
+  webpackDevTool: eval-cheap-module-source-map
   webpackPublicPath: "http://localhost:31500"
   linkedPackages:
     # ...

Tiltconfig.yaml

@@ -4,6 +4,8 @@
 
 ### Global Config Start ###
 global:
+  deployment:
+    imagePullSecrets:
   glooingress:
     enabled: true
     jwt:
@@ -222,6 +224,7 @@ auth:
   containerPath: '/go/src/github.com/tidepool-org/platform'
   dockerFile: 'Dockerfile.auth'
   rebuildCommand: 'SERVICE=auth make service-build'
+  buildTarget: production
 
 blip:
   deployment:
@@ -233,7 +236,7 @@ blip:
   rollbarPostServerToken: '' # Rollbar post_server_item access token for posting source maps on production builds
   reactAppGAID: '' # Google Analytics 4 ID
   launchDarklyClientToken: '' # LaunchDarkly client token
-  webpackDevTool: cheap-module-eval-source-map
+  webpackDevTool: eval-cheap-module-source-map
   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
   webpackPublicPath: 'http://localhost:31500/'
   linkedPackages:
@@ -272,14 +275,14 @@ blob:
   containerPath: '/go/src/github.com/tidepool-org/platform'
   dockerFile: 'Dockerfile.blob'
   rebuildCommand: 'SERVICE=blob make service-build'
+  buildTarget: production
 
 clinic:
   deployment:
     replicas: 1
     # image: tidepool-k8s-clinic # Uncomment to build and run local image or a specific remote image
   # hostPath: ~/go/src/github.com/tidepool-org/clinic      # Uncomment to build and run local image
   containerPath: '/go/src/github.com/tidepool-org/clinic'
-  dockerFile: 'Dockerfile'
   buildTarget: development
 
 clinic-worker:
@@ -288,7 +291,6 @@ clinic-worker:
     # image: tidepool-k8s-clinic-worker # Uncomment to build and run local image or a specific remote image
   # hostPath: ~/go/src/github.com/tidepool-org/clinic-worker      # Uncomment to build and run local image
   containerPath: '/go/src/github.com/tidepool-org/clinic-worker'
-  dockerFile: 'Dockerfile'
   rebuildCommand: 'make build'
   configmap:
     enabled: true
@@ -302,6 +304,7 @@ data:
   containerPath: '/go/src/github.com/tidepool-org/platform'
   dockerFile: 'Dockerfile.data'
   rebuildCommand: 'SERVICE=data make service-build'
+  buildTarget: production
 
 devices:
   deployment:
@@ -335,6 +338,9 @@ hydrophone:
     env:
       clinicServiceEnabled: true
       useMockNotifier: true
+      store:
+        s3:
+          bucket: tidepool-prd-asset
     # image: tidepool-k8s-hydrophone # Uncomment to build and run local image or a specific remote image
   # hostPath: ~/go/src/github.com/tidepool-org/hydrophone          # Uncomment to build and run local image
   containerPath: '/go/src/github.com/tidepool-org/hydrophone'
@@ -374,6 +380,7 @@ migrations:
   containerPath: '/go/src/github.com/tidepool-org/platform'
   dockerFile: 'Dockerfile.migrations'
   rebuildCommand: 'SERVICE=migrations make service-build'
+  buildTarget: production
 
 prescription:
   deployment:
@@ -383,6 +390,7 @@ prescription:
   containerPath: '/go/src/github.com/tidepool-org/platform'
   dockerFile: 'Dockerfile.prescription'
   rebuildCommand: 'SERVICE=prescription make service-build'
+  buildTarget: production
 
 seagull:
   deployment:
@@ -423,6 +431,7 @@ task:
   containerPath: '/go/src/github.com/tidepool-org/platform'
   dockerFile: 'Dockerfile.task'
   rebuildCommand: 'SERVICE=task make service-build'
+  buildTarget: production
 
 tidewhisperer:
   deployment:
@@ -438,6 +447,7 @@ tools:
   containerPath: '/go/src/github.com/tidepool-org/platform'
   dockerFile: 'Dockerfile.tools'
   rebuildCommand: 'SERVICE=tools make service-build'
+  buildTarget: production
 
 uploader:
   deployment:
@@ -451,7 +461,7 @@ uploader:
   blipUrl: 'http://localhost:31500'
   realmHost: 'http://localhost:32000'
   rollbarPostServerToken: '' # Rollbar post_server_item access token for posting source maps on production builds
-  webpackDevTool: cheap-module-eval-source-map
+  webpackDevTool: eval-cheap-module-source-map
   webpackPublicPath: 'http://localhost:31500/uploader/'
   securityContext:
     allowPrivilegeEscalation: false

charts/keycloak/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: keycloakx
   repository: https://codecentric.github.io/helm-charts
-  version: 1.6.1
-digest: sha256:0218751786a66789ce790d61ab6453afe9022ee963c9ef265a855a5bd68a0f85
-generated: "2024-03-19T16:11:06.262558-07:00"
+  version: 2.5.0
+digest: sha256:b9c003e73cc47375022a57a2856419d394d552911c3a27b085938372b4670f1d
+generated: "2025-01-15T09:11:39.641398757-07:00"

charts/keycloak/Chart.yaml

@@ -1,13 +1,13 @@
 apiVersion: v2
 description: A Helm chart to use Keycloak with Tidepool
 name: keycloak
-version: 0.4.3
+version: 0.4.7
 maintainers:
   - name: Todd Kazakov
     email: todd@tidepool.org
 icon: https://www.tidepool.org/static/media/tidepool-t-logo.41feef82.png
 home: https://github.com/tidepool-org/development/charts
 dependencies:
   - name: keycloakx
-    version: 1.6.1
+    version: 2.5.0
     repository: https://codecentric.github.io/helm-charts