avoid writing empty custom-installation-files secret

Author: gre9ory

hull-vidispine-addon/Chart.yaml

@@ -1,6 +1,6 @@
 # Basic chart description and version
 apiVersion: v1
-appVersion: 1.33.1
+appVersion: "1.34"
 description: hull-vidispine-addon
 name: hull-vidispine-addon
-version: 1.34.0
+version: 1.34.1

hull-vidispine-addon/files/test/HULL/env/default/python.properties

@@ -1,4 +1,4 @@
-GAUGE_PYTHON_COMMAND = python
+GAUGE_PYTHON_COMMAND = python3
 
 # Comma seperated list of dirs. path should be relative to project root.
 STEP_IMPL_DIR = step_impl

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

@@ -19,39 +19,34 @@ Test creation of objects and features.
 ## Installation Job
 * Render
 * Set test object to "release-name-hull-test-hull-install"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts" with array value that has "3" items
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§0§name" with value "custom-installation-files"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§1§name" with value "installation"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts" with array value that has "2" items
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§0§name" with value "installation"
 
-* Test Object has key "spec§template§spec§volumes" with array value that has "3" items
-* Test Object has key "spec§template§spec§volumes§0§name" with value "custom-installation-files"
-* Test Object has key "spec§template§spec§volumes§1§name" with value "installation"
+* Test Object has key "spec§template§spec§volumes" with array value that has "2" items
+* Test Object has key "spec§template§spec§volumes§0§name" with value "installation"
 
 ## Certificates
 * Prepare default test case for this kind including suites "pod,customcacertificates"
 * Render
 
 * Set test object to "release-name-hull-test-hull-install"
 
-* Test Object has key "spec§template§spec§containers§0§volumeMounts" with array value that has "6" items
+* Test Object has key "spec§template§spec§containers§0§volumeMounts" with array value that has "5" items
 * Test Object has key "spec§template§spec§containers§0§volumeMounts§0§name" with value "certs"
 * Test Object has key "spec§template§spec§containers§0§volumeMounts§0§mountPath" with value "/usr/local/share/ca-certificates/custom-ca-certificates-test_cert_1"
 * Test Object has key "spec§template§spec§containers§0§volumeMounts§1§name" with value "certs"
 * Test Object has key "spec§template§spec§containers§0§volumeMounts§1§mountPath" with value "/usr/local/share/ca-certificates/custom-ca-certificates-test_cert_2"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§2§name" with value "custom-installation-files"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§2§mountPath" with value "/custom-installation-files"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§name" with value "etcssl"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§mountPath" with value "/etc/ssl/certs"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§4§name" with value "installation"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§4§mountPath" with value "/script/installation.yaml"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§4§subPath" with value "installation.yaml"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§2§name" with value "etcssl"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§2§mountPath" with value "/etc/ssl/certs"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§name" with value "installation"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§mountPath" with value "/script/installation.yaml"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§subPath" with value "installation.yaml"
 
-* Test Object has key "spec§template§spec§volumes" with array value that has "5" items
+* Test Object has key "spec§template§spec§volumes" with array value that has "4" items
 * Test Object has key "spec§template§spec§volumes§0§name" with value "certs"
-* Test Object has key "spec§template§spec§volumes§1§name" with value "custom-installation-files"
-* Test Object has key "spec§template§spec§volumes§2§name" with value "etcssl"
-* Test Object has key "spec§template§spec§volumes§3§name" with value "installation"
-* Test Object has key "spec§template§spec§volumes§4§name" with value "oci-license"
+* Test Object has key "spec§template§spec§volumes§1§name" with value "etcssl"
+* Test Object has key "spec§template§spec§volumes§2§name" with value "installation"
+* Test Object has key "spec§template§spec§volumes§3§name" with value "oci-license"
 
 * Set test object to "release-name-hull-test-custom-ca-certificates" of kind "Secret"
 * Test Object has key "data§test_cert_1" with Base64 encoded value of "CERT-DATA-1"
@@ -62,38 +57,35 @@ Test creation of objects and features.
 
 * Set test object to "release-name-hull-test-hull-install"
 
-* Test Object has key "spec§template§spec§containers§0§volumeMounts" with array value that has "7" items
+* Test Object has key "spec§template§spec§containers§0§volumeMounts" with array value that has "6" items
 * Test Object has key "spec§template§spec§containers§0§volumeMounts§0§name" with value "certs-opensearch"
 * 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"
 * Test Object has key "spec§template§spec§containers§0§volumeMounts§1§name" with value "certs-opensearch"
 * 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"
 * Test Object has key "spec§template§spec§containers§0§volumeMounts§2§name" with value "certs-storage"
 * 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"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§name" with value "custom-installation-files"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§mountPath" with value "/custom-installation-files"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§4§name" with value "etcssl"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§4§mountPath" with value "/etc/ssl/certs"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§5§name" with value "installation"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§5§mountPath" with value "/script/installation.yaml"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§5§subPath" with value "installation.yaml"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§name" with value "etcssl"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§3§mountPath" with value "/etc/ssl/certs"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§4§name" with value "installation"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§4§mountPath" with value "/script/installation.yaml"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§4§subPath" with value "installation.yaml"
 
-* Test Object has key "spec§template§spec§volumes" with array value that has "6" items
+* Test Object has key "spec§template§spec§volumes" with array value that has "5" items
 * Test Object has key "spec§template§spec§volumes§0§name" with value "certs-opensearch"
 * Test Object has key "spec§template§spec§volumes§0§secret§secretName" with value "opensearch-node-certs"
 * Test Object has key "spec§template§spec§volumes§1§name" with value "certs-storage"
 * Test Object has key "spec§template§spec§volumes§1§secret§secretName" with value "storage-server-secret"
-* Test Object has key "spec§template§spec§volumes§2§name" with value "custom-installation-files"
-* Test Object has key "spec§template§spec§volumes§3§name" with value "etcssl"
-* Test Object has key "spec§template§spec§volumes§4§name" with value "installation"
-* Test Object has key "spec§template§spec§volumes§5§name" with value "oci-license"
+* Test Object has key "spec§template§spec§volumes§2§name" with value "etcssl"
+* Test Object has key "spec§template§spec§volumes§3§name" with value "installation"
+* Test Object has key "spec§template§spec§volumes§4§name" with value "oci-license"
 
 
 * Prepare default test case for this kind including suites "pod,certificatesecrets,customcacertificates"
 * Render
 
 * Set test object to "release-name-hull-test-hull-install"
 
-* Test Object has key "spec§template§spec§containers§0§volumeMounts" with array value that has "9" items
+* Test Object has key "spec§template§spec§containers§0§volumeMounts" with array value that has "8" items
 * Test Object has key "spec§template§spec§containers§0§volumeMounts§0§name" with value "certs-opensearch"
 * 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"
 * Test Object has key "spec§template§spec§containers§0§volumeMounts§1§name" with value "certs-opensearch"
@@ -104,24 +96,21 @@ Test creation of objects and features.
 * 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"
 * Test Object has key "spec§template§spec§containers§0§volumeMounts§4§name" with value "certs"
 * 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"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§5§name" with value "custom-installation-files"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§5§mountPath" with value "/custom-installation-files"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§6§name" with value "etcssl"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§6§mountPath" with value "/etc/ssl/certs"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§7§name" with value "installation"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§7§mountPath" with value "/script/installation.yaml"
-* Test Object has key "spec§template§spec§containers§0§volumeMounts§7§subPath" with value "installation.yaml"
-
-* Test Object has key "spec§template§spec§volumes" with array value that has "7" items
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§5§name" with value "etcssl"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§5§mountPath" with value "/etc/ssl/certs"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§6§name" with value "installation"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§6§mountPath" with value "/script/installation.yaml"
+* Test Object has key "spec§template§spec§containers§0§volumeMounts§6§subPath" with value "installation.yaml"
+
+* Test Object has key "spec§template§spec§volumes" with array value that has "6" items
 * Test Object has key "spec§template§spec§volumes§0§name" with value "certs"
 * Test Object has key "spec§template§spec§volumes§1§name" with value "certs-opensearch"
 * Test Object has key "spec§template§spec§volumes§1§secret§secretName" with value "opensearch-node-certs"
 * Test Object has key "spec§template§spec§volumes§2§name" with value "certs-storage"
 * Test Object has key "spec§template§spec§volumes§2§secret§secretName" with value "storage-server-secret"
-* Test Object has key "spec§template§spec§volumes§3§name" with value "custom-installation-files"
-* Test Object has key "spec§template§spec§volumes§4§name" with value "etcssl"
-* Test Object has key "spec§template§spec§volumes§5§name" with value "installation"
-* Test Object has key "spec§template§spec§volumes§6§name" with value "oci-license"
+* Test Object has key "spec§template§spec§volumes§3§name" with value "etcssl"
+* Test Object has key "spec§template§spec§volumes§4§name" with value "installation"
+* Test Object has key "spec§template§spec§volumes§5§name" with value "oci-license"
 
 ___
 

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

@@ -6,7 +6,7 @@ Test creation of objects and features.
 
 ## Render and Validate
 * Render
-* Expected number of "13" objects were rendered
+* Expected number of "12" objects were rendered
 * Validate
 
 ## Metadata

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

@@ -516,6 +516,7 @@ hull:
           helm.sh/hook-delete-policy: before-hook-creation
 
       'custom-installation-files':
+        enabled: _HT?gt (len ((index . "$").Files.Glob "files/hull-vidispine-addon/installation/sources/*")) 0
         sources:
         - custom-installation-files-setup
         - _HULL_OBJECT_TYPE_DEFAULT_

hull-vidispine-addon/templates/_transformations.tpl

@@ -112,10 +112,12 @@ Icon: |-
   { 
     "secret":{ "secretName": "hull-install" }
   },
+  {{ if (gt (len ($parent.Files.Glob "files/hull-vidispine-addon/installation/sources/*")) 0) }}  
   "custom-installation-files":
   {
     "secret": { "secretName": "custom-installation-files" }
   },
+  {{ end }}
   "etcssl":
   {
     "enabled": {{ if (or $parent.Values.hull.config.general.data.installation.config.customCaCertificates $parent.Values.hull.config.general.data.installation.config.certificateSecrets) }}true{{ else }}false{{ end }},
@@ -177,11 +179,13 @@ Icon: |-
     "subPath": "Installer.ps1"
   },
 {{ end }}
+{{ if (gt (len ($parent.Files.Glob "files/hull-vidispine-addon/installation/sources/*")) 0) }} 
   "custom-installation-files":
   {
     "name": "custom-installation-files",
     "mountPath": "/custom-installation-files"
   },
+{{ end }}
   "etcssl": 
   {
     "enabled": {{ if (or $parent.Values.hull.config.general.data.installation.config.customCaCertificates $parent.Values.hull.config.general.data.installation.config.certificateSecrets) }}true{{ else }}false{{ end }},