Merge pull request #69 from vidispine/release-1.26

Release 1.26

Author: gre9ory

hull-vidispine-addon/Chart.yaml

@@ -3,4 +3,4 @@ apiVersion: v1
 appVersion: 1.26.0
 description: hull-vidispine-addon
 name: hull-vidispine-addon
-version: 1.26.8
+version: 1.26.9

hull-vidispine-addon/README.md

@@ -6,5 +6,5 @@ name: hull-test
 version: 1.26.0
 dependencies:
   - name: hull
-    version: "1.26.0"
+    version: "1.26.2"
     repository: "https://vidispine.github.io/hull"

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

@@ -346,8 +346,12 @@ AUTH_BASIC_DATABASE_USERNAME:
 AUTH_BASIC_DATABASE_PASSWORD:
   inline: {{ (index $parent.Values.hull.config.specific.components $component).database.password }}
 database-connectionString:
+{{ if (hasKey (index $parent.Values.hull.config.specific.components $component).database "connectionString") }}
+  inline: {{ (index $parent.Values.hull.config.specific.components $component).database.connectionString }}
+{{ else }}
   inline: {{ include "hull.vidispine.addon.library.get.endpoint.info" (dict "PARENT_CONTEXT" $parent "TYPE" "database" "INFO" "connectionString" "COMPONENT" $component) }}
 {{ end }}
+{{ end }}
 {{ if (eq (include "hull.vidispine.addon.library.get.endpoint.uri.exists" (dict "PARENT_CONTEXT" $parent "KEY" "rabbitmq" "URI" "amq")) "true") }}
 rabbitmq-connectionString:
   inline: {{ include "hull.vidispine.addon.library.get.endpoint.info" (dict "PARENT_CONTEXT" $parent "TYPE" "messagebus" "INFO" "connectionString" "COMPONENT" $component "KEY" "rabbitmq") }}

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

@@ -168,4 +168,131 @@
 {{- $iconFile := (index . "ICON_FILE") -}}
 Icon: |-
 {{ $parent.Files.Get (printf "%s" $iconFile) | indent 2}}
+{{- end -}}
+
+
+
+{{ define "hull.vidispine.addon.sources.folder.volumes" }}
+{{ $parent := (index . "PARENT_CONTEXT") }}
+{
+  "installation":
+  { 
+    "secret":{ "secretName": "hull-install" }
+  },
+  "custom-installation-files":
+  {
+    "secret": { "secretName": "custom-installation-files" }
+  },
+  "etcssl":
+  {
+    "enabled": {{ if $parent.Values.hull.config.general.data.installation.config.customCaCertificates }}true{{ else }}false{{ end }},
+    "emptyDir": { }
+  },
+  "certs":
+  {  "enabled": {{ if $parent.Values.hull.config.general.data.installation.config.customCaCertificates }}true{{ else }}false{{ end }},
+     "secret": { "secretName": "custom-ca-certificates" }
+  },
+  {{ $processedDict := dict }}
+  {{ $folderCount := 0 }}
+  {{ range $file, $_ := $parent.Files.Glob "files/hull-vidispine-addon/installation/sources/**/*" }}
+  {{- $folder := base (dir $file) }}
+  {{- if not (hasKey $processedDict $folder) -}}
+  {{ $folderCount = add $folderCount 1 }}
+  {{ $_ := set $processedDict $folder "true" }}
+  "custom-installation-files-{{ $folder }}":  
+  {
+      secret: 
+      {
+        secretName: "custom-installation-files-{{ $folderCount }}"
+      }
+  },
+  {{ end }}
+  {{ end }}
+}
+{{ end }}
+
+
+
+{{ define "hull.vidispine.addon.sources.folder.volumemounts" }}
+{{ $parent := (index . "PARENT_CONTEXT") }}
+{
+  "installation": 
+  {
+    "name": "installation",
+    "mountPath": "/script"
+  },
+  "custom-installation-files":
+  {
+    "name": "custom-installation-files",
+    "mountPath": "/custom-installation-files"
+  },
+  "etcssl": 
+  {
+    "enabled": {{ if $parent.Values.hull.config.general.data.installation.config.customCaCertificates }}true{{ else }}false{{ end }},
+    "name": "etcssl",
+    "mountPath": "/etc/ssl/certs"
+  },
+  {{ range $certkey, $certvalue := $parent.Values.hull.config.general.data.installation.config.customCaCertificates}}
+  "custom-ca-certificates-{{ $certkey }}": 
+  {
+    "enabled": true, 
+    "name": "certs",
+    "mountPath": "/usr/local/share/ca-certificates/custom-ca-certificates-{{ $certkey }}",
+    "subPath": "{{ $certkey }}"
+  },
+  {{ end }}
+  {{ $processedDict := dict }}
+  {{ range $file, $_ := $parent.Files.Glob "files/hull-vidispine-addon/installation/sources/**/*" }}
+  {{- $folder := base (dir $file) }}
+  {{- if not (hasKey $processedDict $folder) -}}
+  {{ $_ := set $processedDict $folder "true" }}
+  "custom-installation-files-{{ $folder }}":
+  {
+      "enabled": true, 
+      "name": "custom-installation-files-{{ $folder }}",
+      "mountPath": "/custom-installation-files-{{ $folder }}"
+  },
+  {{ end }}
+  {{ end }}
+}
+{{ end }}
+
+
+
+{{ define "hull.vidispine.addon.sources.folder.secret" }}
+{{ $parent := (index . "PARENT_CONTEXT") }}
+{{ $folderIndex := (index . "FOLDER_INDEX") }}
+{
+  {{ $processedDict := dict }}
+  {{ $folderCount := 0 }}
+  {{ range $file, $_ := $parent.Files.Glob "files/hull-vidispine-addon/installation/sources/**/*" }}
+  {{- $folder := base (dir $file) }}
+  {{- $fileName := base $file }}
+  {{- if not (hasKey $processedDict $folder) -}}
+  {{- $folderCount = add $folderCount 1 }}
+  {{ $_ := set $processedDict $folder $folderCount }}
+  {{- end -}}
+  {{ if (eq (index $processedDict $folder) $folderIndex) }}
+  {{ $fileName | base | quote }}: { path: {{ $file | quote }} },
+  {{ end }}
+  {{ end }}
+}
+{{ end }}
+
+
+
+{{- define "hull.vidispine.addon.sources.folder.secret.count" -}}
+{{- $parent := (index . "PARENT_CONTEXT") -}}
+{{- $folderIndex := (index . "FOLDER_INDEX") -}}
+{{- $processedDict := dict -}}
+{{- $folderCount := 0 -}}
+{{- $folderExists := false -}}
+{{- range $file, $_ := $parent.Files.Glob "files/hull-vidispine-addon/installation/sources/**/*" -}}
+{{- $folder := base (dir $file) -}}
+{{- if not (hasKey $processedDict $folder) -}}
+{{- $folderCount = add $folderCount 1 -}}
+{{- $_ := set $processedDict $folder $folderCount -}}
+{{- end -}}
+{{- end -}}
+{{- $folderCount -}}
 {{- end -}}