fix remaining installation.yaml tasks

Author: Georg Martin Weber

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

@@ -19,21 +19,19 @@ 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" with array value that has "2" 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§volumes" with array value that has "3" items
+* 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 "custom-installation-files"
-* Test Object has key "spec§template§spec§volumes§1§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"
@@ -42,16 +40,12 @@ Test creation of objects and features.
 * 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§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§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,7 +56,7 @@ 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"
@@ -74,23 +68,22 @@ Test creation of objects and features.
 * 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§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§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"
@@ -106,16 +99,15 @@ Test creation of objects and features.
 * 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§volumes" with array value that has "7" items
+* 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§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

@@ -640,12 +640,12 @@ hull:
           helm.sh/hook-weight: "-15"
           helm.sh/hook-delete-policy: before-hook-creation
       'hull-install':
+        enabled: _HT*hull.config.general.data.installation.config.debug.debugInstallerScript
         sources:
         - custom-installation-files-setup
         - _HULL_OBJECT_TYPE_DEFAULT_
         data:
           Installer.ps1:
-            enabled: _HT*hull.config.general.data.installation.config.debug.debugInstallerScript
             inline: |-
               *** ENABLE hull.config.general.data.installation.config.debug.debugInstallerScript
               *** AND COPY SCRIPT CODE FROM 

hull-vidispine-addon/templates/_transformations.tpl

@@ -108,10 +108,12 @@ Icon: |-
 {{ define "hull.vidispine.addon.sources.folder.volumes" }}
 {{ $parent := (index . "PARENT_CONTEXT") }}
 {
+{{ if $parent.Values.hull.config.general.data.installation.config.debug.debugInstallerScript }}
   "installation":
   { 
     "secret":{ "secretName": "hull-install" }
   },
+{{ end }}
   "custom-installation-files":
   {
     "secret": { "secretName": "custom-installation-files" }
@@ -163,12 +165,6 @@ Icon: |-
 {{ define "hull.vidispine.addon.sources.folder.volumemounts" }}
 {{ $parent := (index . "PARENT_CONTEXT") }}
 {
-  "installation": 
-  {
-    "name": "installation",
-    "mountPath": "/script/installation.yaml",
-    "subPath": "installation.yaml"
-  },
 {{ if $parent.Values.hull.config.general.data.installation.config.debug.debugInstallerScript }}
   "installer": 
   {