Skip to content

Commit 5acc9ad

Browse files
authored
Merge pull request #93 from vidispine/release-1.28
Release 1.28
2 parents a9f2432 + b842f12 commit 5acc9ad

13 files changed

Lines changed: 243 additions & 202 deletions

File tree

hull-vidispine-addon/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Basic chart description and version
22
apiVersion: v1
3-
appVersion: 1.27.0
3+
appVersion: 1.28.0
44
description: hull-vidispine-addon
55
name: hull-vidispine-addon
6-
version: 1.27.8
6+
version: 1.28.5

hull-vidispine-addon/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,12 @@ To mimic this tree structure the configuration is built around this three-part w
4747
| `endpoints` | Dictionary of endpoints to communicate with.<br><br>Key: <br>Key for entry in dictionary `endpoints`<br><br>Value: <br>The endpoint definition in form of a `<endpointSpec>` | `10_vidicore:`<br>`20_authservice:`<br>`30_configportal:`
4848

4949
### ConfigSpec
50-
Describes configuration options. <br>Has exclusively the following sub-fields: <br><br>`customCaCertificates`<br>`preScript`<br>`postScript`<br>`productUris`<br>`debug`
50+
Describes configuration options. <br>Has exclusively the following sub-fields: <br><br>`customCaCertificates`<br>`certificateSecrets`<br>`preScript`<br>`postScript`<br>`productUris`<br>`debug`
5151

5252
| Parameter | Description | Defaults | Example |
5353
| ------------------------------- | ----------------------------------------------------------------| -----------------------------| -----------------------------------------|
5454
| `customCaCertificates` | An optional dictionary of custom ca certificates that are being mounted into the`hull-install` and `hull-configure` pods. Presence of certificates may be required for proper communication with the authentication service.
55+
| `certificateSecrets` | An optional dictionary of keys and secret configurations for certificates that should be included as custom CA certificates at runtime. The keys will be used to create the `volumeMount` name using the schema `cert-<KEY>-<FILENAME>`and the file name of the secrets entry that is mounted into the `/usr/local/share/ca-certificates` folder under the name `custom-ca-certificates-<KEY>-<FILENAME>`.<br><br>Each secret configuration under a key needs the following entries:<br>- `secretName`: the complete name of the secret<br>- `fileNames`: an array of filenames/`data` keys which are to be mounted | `certificateSecrets:`<br>&#160;&#160;`opensearch:`<br>&#160;&#160;&#160;&#160;`secretName:`&#160;`opensearch-node-certs`<br>&#160;&#160;&#160;&#160;`fileNames:`<br>&#160;&#160;&#160;&#160;-&#160;`cert.tls`
5556
| `preScript` | A Powershell script to be executed before the installation jobs endpoints are processed.
5657
| `postScript` | A Powershell script to be executed after the installation jobs endpoints are processed.
5758
| `productUris` | Product URIs that are can be used in conjunction with the transformations that populate authentication client data such as `hull.vidispine.addon.coruris` and `hull.vidispine.addon.producturis`. <br><br>When populated the entries here will be manipulated according to the transformation and are added to the fields where the transformation is applied. <br><br>Note that this can be automatically populated by a `hull.util.transformation.tpl` from the `hull.config.general.data.endpoints` fields like in the example. | `[]` | `productUris:`<br>`-`&#160;`https://myapp`<br>`-`&#160;`https://myappalternativehost`<br><br>or<br><br>`productUris:`<br>&#160;&#160;`_HULL_TRANSFORMATION_:`<br>&#160;&#160;&#160;&#160;`NAME:`&#160;`hull.util.transformation.tpl`<br>&#160;&#160;&#160;&#160;`CONTENT:`&#160;`"`<br>&#160;&#160;&#160;&#160;&#160;&#160;`[`<br>&#160;&#160;&#160;&#160;&#160;&#160;`{{-`&#160;`(index`&#160;`.`&#160;`\"PARENT\").Values.hull.config.general.data.endpoints.configportal.uri.api`&#160;`-}},`<br>&#160;&#160;&#160;&#160;&#160;&#160;`{{-`&#160;`(index`&#160;`.`&#160;`\"PARENT\").Values.hull.config.general.data.endpoints.configportal.uri.ui`&#160;`-}}`<br>&#160;&#160;&#160;&#160;&#160;&#160;`]"`
@@ -1018,6 +1019,8 @@ Parameters:
10181019
_PARENT_CONTEXT_: The Helm charts global context
10191020
_COMPONENT_: The `component` to create a volume section for
10201021
need to be lowercase seperated with '-' (kebapcase) and are converted to the URI keys by making them camelCase.
1022+
_HASH_CONFIGMAP_: Determines whether the `hashsumAnnotation` key is set on the ConfigMap volume if it is being created. This does not apply to the additional _CONFIGMAPS_, only to the one created if the component has at least one ConfigMap element. Defaults to true.
1023+
_HASH_SECRET_: Determines whether the `hashsumAnnotation` key is set on the Secret volume if it is being created. This does not apply to the additional _SECRETS_, only to the one created if the component has at least one Secret element. Defaults to true.
10211024
_SECRETS_: The additional Secrets to add to the volumes as comma-seperated list
10221025
_CONFIGMAPS_: The additional configMap volumes to add to the volumes as comma-seperated list
10231026
_EMPTYDIRS_: The additional emptyDir volumes to add to the volumes as comma-seperated list
@@ -1026,7 +1029,7 @@ _PVCS_: The additional persistentVolumeClaim volumes to add to the volumes as c
10261029
Usage:
10271030

10281031
This function renders a pods volumes section based on the arguments and rest of the charts configuration:
1029-
First it traverses the _COMPONENT_ in `hull.config.specific.components` and adds all `mounts.secret`'s and `mounts.configmap`'s names as references to the volumes secret and configMap volumes. It also adds all Secrets and ConfigMaps names as references for all defined physical files which are stored under the `files/_COMPONENT_/mounts/secret` and `files/_COMPONENT_/mounts/configmap` folders. Then it adds all addional secret's, configMap's, emptyDir's and persistentVolumeClaim's static reference names provided as additional arguments where the name of the reference is the full object name which is being referenced.
1032+
First it traverses the _COMPONENT_ in `hull.config.specific.components` and adds all `mounts.secret`'s and `mounts.configmap`'s names as references to the volumes secret and configMap volumes. It also adds all Secrets and ConfigMaps names as references for all defined physical files which are stored under the `files/_COMPONENT_/mounts/secret` and `files/_COMPONENT_/mounts/configmap` folders. Then it adds all additional secret's, configMap's, emptyDir's and persistentVolumeClaim's static reference names provided as additional arguments where the name of the reference is the full object name which is being referenced.
10301033

10311034
### hull.vidispine.addon.library.component.pod.env
10321035

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
getgauge
22
pyyaml
33
dotty-dict
4-
jsonschema
4+
jsonschema
5+
protobuf==4.21
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
################################
2+
### Example values.yaml with all features applied
3+
################################
4+
5+
###################################################
6+
### CONFIG
7+
hull:
8+
config:
9+
general:
10+
data:
11+
installation:
12+
config:
13+
certificateSecrets:
14+
opensearch:
15+
secretName: opensearch-node-certs
16+
fileNames:
17+
- os.tls
18+
- cert.tls
19+
storage:
20+
secretName: storage-server-secret
21+
fileNames:
22+
- storage.tls
23+
###################################################
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Basic chart description and version
22
apiVersion: v1
3-
appVersion: 1.27.0
3+
appVersion: 1.28.0
44
description: hull-test
55
name: hull-test
6-
version: 1.27.0
6+
version: 1.28.0
77
dependencies:
88
- name: hull
9-
version: "1.27.0"
9+
version: "1.28.3"
1010
repository: "https://vidispine.github.io/hull"
Binary file not shown.
Binary file not shown.
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.25.10
5-
digest: sha256:53db52a084e13c9f8f819ace340991795c3827aca7061c2e05cd57dcc11de6f0
6-
generated: "2022-11-18T14:55:39.9651356+01:00"
4+
version: 1.28.3
5+
digest: sha256:2944ac04ad063154826d067466244cf9dcfb1e873282ad8e89db594ccc315a5b
6+
generated: "2023-10-10T16:35:39.4319116+02:00"

hull-vidispine-addon/files/test/HULL/specs/concepts/metadata_basic.cpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ General label section must be populated with overriden names
99
* All test objects have key "metadata§labels§app.kubernetes.io/managed-by" with value "Helm"
1010
* All test objects have key "metadata§labels§app.kubernetes.io/name" with value "a-shorter-name"
1111
* All test objects have key "metadata§labels§app.kubernetes.io/part-of" with value "undefined"
12-
* All test objects have key "metadata§labels§app.kubernetes.io/version" with value "1.27.0"
12+
* All test objects have key "metadata§labels§app.kubernetes.io/version" with value "1.28.0"
1313

1414
Static names can be created
1515

@@ -66,7 +66,7 @@ General label section must be populated
6666
* All test objects have key "metadata§labels§app.kubernetes.io/managed-by" with value "Helm"
6767
* All test objects have key "metadata§labels§app.kubernetes.io/name" with value of key "chart" from scenario data_store
6868
* All test objects have key "metadata§labels§app.kubernetes.io/part-of" with value "undefined"
69-
* All test objects have key "metadata§labels§app.kubernetes.io/version" with value "1.27.0"
69+
* All test objects have key "metadata§labels§app.kubernetes.io/version" with value "1.28.0"
7070

7171
Static names can be created
7272

hull-vidispine-addon/files/test/HULL/specs/job.spec

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,76 @@ Test creation of objects and features.
5050
* Test Object has key "spec§template§spec§volumes§1§name" with value "custom-installation-files"
5151
* Test Object has key "spec§template§spec§volumes§2§name" with value "etcssl"
5252
* Test Object has key "spec§template§spec§volumes§3§name" with value "installation"
53+
* Test Object has key "spec§template§spec§volumes§4§name" with value "oci-license"
5354

5455
* Set test object to "release-name-hull-test-custom-ca-certificates" of kind "Secret"
5556
* Test Object has key "data§test_cert_1" with Base64 encoded value of "CERT-DATA-1"
5657
* Test Object has key "data§test_cert_2" with Base64 encoded value of "CERT-DATA-2"
58+
59+
* Prepare default test case for this kind including suites "pod,certificatesecrets"
60+
* Render
61+
62+
* Set test object to "release-name-hull-test-hull-install"
63+
64+
* Test Object has key "spec§template§spec§containers§0§volumeMounts" with array value that has "7" items
65+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§0§name" with value "certs-opensearch"
66+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§0§mountPath" with value "/usr/local/share/ca-certificates/custom-ca-certificates-opensearch-cert.tls"
67+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§1§name" with value "certs-opensearch"
68+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§1§mountPath" with value "/usr/local/share/ca-certificates/custom-ca-certificates-opensearch-os.tls"
69+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§2§name" with value "certs-storage"
70+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§2§mountPath" with value "/usr/local/share/ca-certificates/custom-ca-certificates-storage-storage.tls"
71+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§name" with value "custom-installation-files"
72+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§mountPath" with value "/custom-installation-files"
73+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§4§name" with value "etcssl"
74+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§4§mountPath" with value "/etc/ssl/certs"
75+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§5§name" with value "installation"
76+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§5§mountPath" with value "/script"
77+
78+
* Test Object has key "spec§template§spec§volumes" with array value that has "6" items
79+
* Test Object has key "spec§template§spec§volumes§0§name" with value "certs-opensearch"
80+
* Test Object has key "spec§template§spec§volumes§0§secret§secretName" with value "opensearch-node-certs"
81+
* Test Object has key "spec§template§spec§volumes§1§name" with value "certs-storage"
82+
* Test Object has key "spec§template§spec§volumes§1§secret§secretName" with value "storage-server-secret"
83+
* Test Object has key "spec§template§spec§volumes§2§name" with value "custom-installation-files"
84+
* Test Object has key "spec§template§spec§volumes§3§name" with value "etcssl"
85+
* Test Object has key "spec§template§spec§volumes§4§name" with value "installation"
86+
* Test Object has key "spec§template§spec§volumes§5§name" with value "oci-license"
87+
88+
89+
* Prepare default test case for this kind including suites "pod,certificatesecrets,customcacertificates"
90+
* Render
91+
92+
* Set test object to "release-name-hull-test-hull-install"
93+
94+
* Test Object has key "spec§template§spec§containers§0§volumeMounts" with array value that has "9" items
95+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§0§name" with value "certs-opensearch"
96+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§0§mountPath" with value "/usr/local/share/ca-certificates/custom-ca-certificates-opensearch-cert.tls"
97+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§1§name" with value "certs-opensearch"
98+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§1§mountPath" with value "/usr/local/share/ca-certificates/custom-ca-certificates-opensearch-os.tls"
99+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§2§name" with value "certs-storage"
100+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§2§mountPath" with value "/usr/local/share/ca-certificates/custom-ca-certificates-storage-storage.tls"
101+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§name" with value "certs"
102+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§mountPath" with value "/usr/local/share/ca-certificates/custom-ca-certificates-test_cert_1"
103+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§4§name" with value "certs"
104+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§4§mountPath" with value "/usr/local/share/ca-certificates/custom-ca-certificates-test_cert_2"
105+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§5§name" with value "custom-installation-files"
106+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§5§mountPath" with value "/custom-installation-files"
107+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§6§name" with value "etcssl"
108+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§6§mountPath" with value "/etc/ssl/certs"
109+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§7§name" with value "installation"
110+
* Test Object has key "spec§template§spec§containers§0§volumeMounts§7§mountPath" with value "/script"
111+
112+
* Test Object has key "spec§template§spec§volumes" with array value that has "7" items
113+
* Test Object has key "spec§template§spec§volumes§0§name" with value "certs"
114+
* Test Object has key "spec§template§spec§volumes§1§name" with value "certs-opensearch"
115+
* Test Object has key "spec§template§spec§volumes§1§secret§secretName" with value "opensearch-node-certs"
116+
* Test Object has key "spec§template§spec§volumes§2§name" with value "certs-storage"
117+
* Test Object has key "spec§template§spec§volumes§2§secret§secretName" with value "storage-server-secret"
118+
* Test Object has key "spec§template§spec§volumes§3§name" with value "custom-installation-files"
119+
* Test Object has key "spec§template§spec§volumes§4§name" with value "etcssl"
120+
* Test Object has key "spec§template§spec§volumes§5§name" with value "installation"
121+
* Test Object has key "spec§template§spec§volumes§6§name" with value "oci-license"
122+
57123
___
58124

59125

0 commit comments

Comments
 (0)