Merge pull request #74 from Onlim/bugfix/setup-timeouts

[graphdb]: use clusterCreationTimeout also in patchCluster
Ontotext-AD · Feb 2, 2024 · d6f0afe · d6f0afe
2 parents b97f015 + accf7d7
commit d6f0afe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/files/scripts/update-cluster.sh b/files/scripts/update-cluster.sh
@@ -4,9 +4,10 @@ set -eu
 function patchCluster {
   local configLocation=$1
   local authToken=$PROVISION_USER_AUTH_TOKEN
+  local timeout=$2
   echo "Patching cluster"
   waitService "http://graphdb-cluster-proxy:7200/proxy/ready"
-  curl -o patchResponse.json -isSL -m 15 -X PATCH  --header "Authorization: Basic ${authToken}" --header 'Content-Type: application/json' --header 'Accept: application/json' -d @"$configLocation" 'http://graphdb-cluster-proxy:7200/rest/cluster/config'
+  curl -o patchResponse.json -isSL -m "$timeout" -X PATCH  --header "Authorization: Basic ${authToken}" --header 'Content-Type: application/json' --header 'Accept: application/json' -d @"$configLocation" 'http://graphdb-cluster-proxy:7200/rest/cluster/config'
     if grep -q 'HTTP/1.1 200' "patchResponse.json"; then
       echo "Patch successful"
     elif grep -q 'Cluster does not exist.\|HTTP/1.1 412' "patchResponse.json" ; then

diff --git a/templates/jobs/patch-cluster-job.yaml b/templates/jobs/patch-cluster-job.yaml
@@ -41,6 +41,7 @@ spec:
             - "/tmp/utils/update-cluster.sh"
             - "patchCluster"
             - "/tmp/cluster-config/cluster-config.json"
+            - "{{ .Values.graphdb.clusterConfig.clusterCreationTimeout }}"
       volumes:
         - name: job-temp
           emptyDir: