Skip to content

Commit a9c9088

Browse files
gre9orygre9ory
authored
Merge pull request #134 from vidispine/release-1.30
Release 1.30
2 parents 9f9be6e + 2c7dce4 commit a9c9088

File tree

8 files changed

+42
-29
lines changed

8 files changed

+42
-29
lines changed

‎hull-vidispine-addon/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ apiVersion: v1
33
appVersion: 1.30.0
44
description: hull-vidispine-addon
55
name: hull-vidispine-addon
6-
version: 1.30.4
6+
version: 1.30.6

‎hull-vidispine-addon/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ By default the `hull-install` job is enabled but already pre-configured so that
202202
- automatically loads the configuration section from `hull.config.general.data.installation`
203203
- loads all certificates provided under `hull.config.general.data.installation.config.customCaCertificates`
204204
- typical endpoints and subresources are predefined so that only entities need to be specified. The predefined subresources for the endpoints are skipped in case the endpoint is not defined.
205-
- endpoint with key `10_vidicore` is set up to do basic authentication on the vidispine endpoint defined in `hull.config.general.data.endpoints.vidicore.uri.api` using the `usernanme` and `password` credentials from VidiCore service admin user secret `<SYSTEMNAME>-vidispine-admin-user`
205+
- endpoint with key `10_vidicore` is set up to do basic authentication on the vidispine endpoint defined in `hull.config.general.data.endpoints.vidicore.uri.api` using the `usernanme` and `password` credentials from VidiCore service admin user secret. The actual name of the VidiCore service admin user secret must be provided in the field `hull.config.general.data.endpoints.vidicore.auth.basic.adminUserSecretName` for authentication to be successful.
206206
- subresources are configured so that creating specific entities works out of the box for them
207207
- key `10_metadatafields` for inserting metadatafields into Vidispine
208208
- key `20_metadatafieldgroups` for inserting metadatafieldgroups into Vidispine

‎hull-vidispine-addon/files/test/HULL/sources/charts/hull-test/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ name: hull-test
66
version: 1.30.0
77
dependencies:
88
- name: hull
9-
version: "1.30.0"
9+
version: "1.30.4"
1010
repository: "https://vidispine.github.io/hull"

‎hull-vidispine-addon/files/test/HULL/sources/charts/hull-test/charts/hull-1.30.0.tgz‎

-283 KB
Binary file not shown.

‎hull-vidispine-addon/files/test/HULL/sources/charts/hull-test/charts/hull-1.30.4.tgz‎

288 KB
Binary file not shown.

‎hull-vidispine-addon/files/test/HULL/sources/charts/hull-test/requirements.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: hull
33
repository: https://vidispine.github.io/hull
4-
version: 1.30.0
5-
digest: sha256:739a279e0298924aaf32edd3a8a4f95bf76465fee35d3b9580fb46b7363e2bdb
6-
generated: "2024-05-17T21:05:38.2263525+02:00"
4+
version: 1.30.4
5+
digest: sha256:334b440f70f4179f176fa61b0e71b2f62c1d80573dbd22d1e89cf6813246b7e0
6+
generated: "2024-07-31T18:53:19.1473599+02:00"

‎hull-vidispine-addon/hull-vidispine-addon.yaml‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ hull:
33
config:
44
general:
55
data:
6-
endpoints: {}
6+
endpoints:
7+
vidicore:
8+
auth:
9+
basic:
10+
adminUserSecretName: "_HT/hull.vidispine.addon.library.secret.name.vidispine.admin.user"
711
installation:
812
config:
913
customCaCertificates: {}
@@ -29,8 +33,8 @@ hull:
2933
auth:
3034
basic:
3135
env:
32-
username: _HT!{{ printf "%s_%s" (include "hull.vidispine.addon.library.secret.name.vidispine.admin.user" (dict "PARENT_CONTEXT" (index . "$")) | replace "-" "_" | upper) "username" }}
33-
password: _HT!{{ printf "%s_%s" (include "hull.vidispine.addon.library.secret.name.vidispine.admin.user" (dict "PARENT_CONTEXT" (index . "$")) | replace "-" "_" | upper) "password" }}
36+
username: _HT!{{ printf "%s_%s" (_HT*hull.config.general.data.endpoints.vidicore.auth.basic.adminUserSecretName | replace "-" "_" | upper) "username" }}
37+
password: _HT!{{ printf "%s_%s" (_HT*hull.config.general.data.endpoints.vidicore.auth.basic.adminUserSecretName | replace "-" "_" | upper) "password" }}
3438
endpoint: _HT/hull.vidispine.addon.library.get.endpoint.uri.info:ENDPOINT:"vidicore":URI:"api"
3539
subresources:
3640
10_metadatafields:
@@ -270,9 +274,9 @@ hull:
270274
registry:
271275
_HULL_OBJECT_TYPE_DEFAULT_:
272276
annotations:
273-
"helm.sh/hook": pre-install,pre-upgrade
274-
"helm.sh/hook-weight": "-90"
275-
"helm.sh/hook-delete-policy": before-hook-creation
277+
helm.sh/hook: pre-install,pre-upgrade
278+
helm.sh/hook-weight: "-90"
279+
helm.sh/hook-delete-policy: before-hook-creation
276280

277281
serviceaccount:
278282
default:
@@ -302,7 +306,7 @@ hull:
302306
enabled: false
303307
annotations:
304308
helm.sh/hook: pre-install,pre-upgrade
305-
helm.sh/hook-weight: "-10"
309+
helm.sh/hook-weight: "-15"
306310
helm.sh/hook-delete-policy: before-hook-creation
307311

308312
clusterrolebinding:
@@ -382,9 +386,9 @@ hull:
382386
secretRef:
383387
name: auth
384388
vidicore:
385-
prefix: _HT!{{ printf "%s_" (include "hull.vidispine.addon.library.secret.name.vidispine.admin.user" (dict "PARENT_CONTEXT" (index . "$"))) | replace "-" "_" | upper }}
389+
prefix: _HT!{{ printf "%s_" (_HT*hull.config.general.data.endpoints.vidicore.auth.basic.adminUserSecretName | replace "-" "_" | upper) }}
386390
secretRef:
387-
name: _HT/hull.vidispine.addon.library.secret.name.vidispine.admin.user
391+
name: _HT*hull.config.general.data.endpoints.vidicore.auth.basic.adminUserSecretName
388392
staticName: true
389393
optional: true
390394
env:
@@ -404,8 +408,8 @@ hull:
404408
- _HULL_OBJECT_TYPE_DEFAULT_
405409
- hull-install-setup
406410
annotations:
407-
"helm.sh/hook": pre-install,pre-upgrade
408-
"helm.sh/hook-weight": '-10'
411+
helm.sh/hook: pre-install,pre-upgrade
412+
helm.sh/hook-weight: '-10'
409413
parallelism: 1
410414
completions: 1
411415
backoffLimit: 6
@@ -432,8 +436,8 @@ hull:
432436
- hull-install-setup
433437
enabled: false
434438
annotations:
435-
"helm.sh/hook": post-install,post-upgrade
436-
"helm.sh/hook-weight": '50'
439+
helm.sh/hook: post-install,post-upgrade
440+
helm.sh/hook-weight: '50'
437441
parallelism: 1
438442
completions: 1
439443
backoffLimit: 6
@@ -461,21 +465,30 @@ hull:
461465
helm.sh/hook-weight: "-10"
462466
helm.sh/hook-delete-policy: before-hook-creation
463467

468+
configmap:
469+
470+
hull-database:
471+
enabled: false
472+
annotations:
473+
helm.sh/hook: pre-install,pre-upgrade
474+
helm.sh/hook-weight: "-15"
475+
helm.sh/hook-delete-policy: before-hook-creation
476+
464477
secret:
465478

466479
auth:
467480
annotations:
468-
"helm.sh/hook": pre-install,pre-upgrade
469-
"helm.sh/hook-weight": "-100"
470-
"helm.sh/hook-delete-policy": before-hook-creation
481+
helm.sh/hook: pre-install,pre-upgrade
482+
helm.sh/hook-weight: "-100"
483+
helm.sh/hook-delete-policy: before-hook-creation
471484
data: _HT/hull.vidispine.addon.library.auth.secret.data
472485

473486
'custom-ca-certificates':
474487
enabled: _HT?(index . "$").Values.hull.config.general.data.installation.config.customCaCertificates
475488
annotations:
476-
"helm.sh/hook": pre-install,pre-upgrade
477-
"helm.sh/hook-weight": "-100"
478-
"helm.sh/hook-delete-policy": before-hook-creation
489+
helm.sh/hook: pre-install,pre-upgrade
490+
helm.sh/hook-weight: "-100"
491+
helm.sh/hook-delete-policy: before-hook-creation
479492
data: |-
480493
_HT!{
481494
{{ range $key,$value := (index . "$").Values.hull.config.general.data.installation.config.customCaCertificates }}
@@ -624,7 +637,7 @@ hull:
624637
enabled: false
625638
annotations:
626639
helm.sh/hook: pre-install,pre-upgrade
627-
helm.sh/hook-weight: "-10"
640+
helm.sh/hook-weight: "-15"
628641
helm.sh/hook-delete-policy: before-hook-creation
629642
'hull-install':
630643
sources:

‎images/hull-integration/Installer.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,14 +1347,14 @@ Class Installer
13471347
if ([string]::IsNullOrWhitespace($entity.readConfigFromFile.key))
13481348
{
13491349
$this.WriteLog("**** No 'key' property provided, mapping full contents of '$($filePath)' to Config")
1350-
$entity.config = $fileContent
1350+
$entity.config = $fileContent
13511351
}
13521352
else
13531353
{
13541354
$this.WriteLog("**** Value '$($entity.readConfigFromFile.key)' provided for 'key' property, mapping content of key from JSON file '$($filePath)' to Config")
13551355
$fileContentJson = $fileContent | ConvertFrom-Json
1356-
$this.WriteLog("**** JSON file content: " + $fileContentJson)
1357-
$entity.config = $fileContentJson.$($entity.readConfigFromFile.key)
1356+
$entity.config = $fileContentJson.$($entity.readConfigFromFile.key) | ConvertTo-Json -Depth 100
1357+
$this.WriteLog("**** JSON file content extracted from key '$($entity.readConfigFromFile.key)': " + $entity.config)
13581358
}
13591359
}
13601360
}

0 commit comments

Comments
 (0)