Skip to content

Commit fdea689

Browse files
author
Georg Martin Weber
committed
Merge branch 'fixes-1.30' of https://github.com/vidispine/hull-vidispine-addon into fixes-1.30
2 parents 9782b77 + 508774e commit fdea689

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

hull-vidispine-addon/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,7 @@ _CREATE_SCRIPT_CONFIGMAP: Name of an existing ConfigMap which contains a custom
11651165

11661166
Usage:
11671167

1168-
This function full renders job objects that either create or reset a database defined for _COMPONENT_. The container used for these database operations is found in the `hull.config.specific.images.dbTools.repository` field (default is 'vpms/dbtools') and the tag to use is given in the `hull.config.specific.images.dbTools.tag` field (default "1.8"). In order to work correctly, the following environment variables are provided to each 'vpms/dbtools' instance executed:
1168+
This function full renders job objects that either create or reset a database defined for _COMPONENT_. The container used for these database operations is found in the `hull.config.specific.images.dbTools.repository` field (default is 'vpms/dbtools') and the tag to use is given in the `hull.config.specific.images.dbTools.tag` field (default "1.9-1"). In order to work correctly, the following environment variables are provided to each 'vpms/dbtools' instance executed:
11691169
- DBHOST: retrieved from the database endpoints (`postgres` or `mssql`) `uri.address` field. Alternatively if the _COMPONENT_ specifies a `database.endpoint` entry the `host` is retrieved for this explicit _ENDPOINT_ instead
11701170
- DBPORT: retrieved from the database endpoints (`postgres` or `mssql`) `uri.address` field. Alternatively if the _COMPONENT_ specifies a `database.endpoint` entry the `port` is retrieved for this explicit _ENDPOINT_ instead
11711171
- DBTYPE: `postgres` or `mssql`, determined by `hull.vidispine.addon.library.get.endpoint.application` function

hull-vidispine-addon/templates/_library.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ initContainers:
505505
copy-custom-scripts:
506506
image:
507507
repository: {{ dig "images" "dbTools" "repository" "vpms/dbtools" $parent.Values.hull.config.specific }}
508-
tag: {{ (dig "images" "dbTools" "tag" (dig "tags" "dbTools" "1.8" $parent.Values.hull.config.specific) $parent.Values.hull.config.specific) | toString | quote }}
508+
tag: {{ (dig "images" "dbTools" "tag" (dig "tags" "dbTools" "1.9-1" $parent.Values.hull.config.specific) $parent.Values.hull.config.specific) | toString | quote }}
509509
args:
510510
- "/bin/sh"
511511
- "-c"
@@ -520,7 +520,7 @@ initContainers:
520520
set-custom-script-permissions:
521521
image:
522522
repository: {{ dig "images" "dbTools" "repository" "vpms/dbtools" $parent.Values.hull.config.specific }}
523-
tag: {{ (dig "images" "dbTools" "tag" (dig "tags" "dbTools" "1.8" $parent.Values.hull.config.specific) $parent.Values.hull.config.specific) | toString | quote }}
523+
tag: {{ (dig "images" "dbTools" "tag" (dig "tags" "dbTools" "1.9-1" $parent.Values.hull.config.specific) $parent.Values.hull.config.specific) | toString | quote }}
524524
args:
525525
- "/bin/sh"
526526
- "-c"
@@ -533,7 +533,7 @@ initContainers:
533533
check-database-ready:
534534
image:
535535
repository: {{ dig "images" "dbTools" "repository" "vpms/dbtools" $parent.Values.hull.config.specific }}
536-
tag: {{ (dig "images" "dbTools" "tag" (dig "tags" "dbTools" "1.8" $parent.Values.hull.config.specific) $parent.Values.hull.config.specific) | toString | quote }}
536+
tag: {{ (dig "images" "dbTools" "tag" (dig "tags" "dbTools" "1.9-1" $parent.Values.hull.config.specific) $parent.Values.hull.config.specific) | toString | quote }}
537537
env:
538538
DBHOST:
539539
value: {{ $databaseHost }}
@@ -603,7 +603,7 @@ containers:
603603
{{ end }}
604604
image:
605605
repository: {{ dig "images" "dbTools" "repository" "vpms/dbtools" $parent.Values.hull.config.specific }}
606-
tag: {{ (dig "images" "dbTools" "tag" (dig "tags" "dbTools" "1.8" $parent.Values.hull.config.specific) $parent.Values.hull.config.specific) | toString | quote }}
606+
tag: {{ (dig "images" "dbTools" "tag" (dig "tags" "dbTools" "1.9-1" $parent.Values.hull.config.specific) $parent.Values.hull.config.specific) | toString | quote }}
607607
env:
608608
DBHOST:
609609
value: {{ $databaseHost }}

0 commit comments

Comments
 (0)