increase clinic merge API endpoint timeout

Bumping it up to 1 minute. This is an internal-only endpoint, so
making people wait up to a minute should be fine.

BACK-4216

Author: ewollesen

charts/tidepool/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Tidepool
 name: tidepool
-version: 0.23.0
+version: 0.24.0
 maintainers:
   - name: Todd Kazakov
     email: todd@tidepool.org

charts/tidepool/charts/clinic/templates/7-serviceprofile.yaml

@@ -286,6 +286,11 @@ spec:
               min: 400
               max: 599
           isFailure: true
+    - condition:
+        method: POST
+        pathRegex: /v1/clinics/[^/]*/merge
+      name: POST /v1/clinics/{clinicId}/merge
+      timeout: 1m
     - condition:
         method: POST
         pathRegex: /v1/clinics/[^/]*/migrate