Merge pull request #375 from vidispine/release-1.34

gre9ory · web-flow · commit 74c439f15836 · 2025-11-07T09:43:37.000+01:00
Release 1.34
diff --git a/azure-pipelines-gated.yml b/azure-pipelines-gated.yml
@@ -39,6 +39,12 @@ jobs:
       Helm_3_18_6_multi: 
         HelmVersion: "3.18.6"
         TestType: multi
+      Helm_3_19_0_single: 
+        HelmVersion: "3.19.0"
+        TestType: single
+      Helm_3_19_0_multi: 
+        HelmVersion: "3.19.0"
+        TestType: multi
   steps:
   - template: azure-pipelines-test.yml  # Template reference
     parameters:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -121,6 +121,12 @@ jobs:
       Helm_3_18_6_multi: 
         HelmVersion: "3.18.6"
         TestType: multi
+      Helm_3_19_0_single: 
+        HelmVersion: "3.19.0"
+        TestType: single
+      Helm_3_19_0_multi: 
+        HelmVersion: "3.19.0"
+        TestType: multi
   steps:
   - template: azure-pipelines-test.yml  # Template reference
     parameters:
diff --git a/hull/CHANGELOG.md b/hull/CHANGELOG.md
@@ -1,11 +1,6 @@
 # Changelog
 ------------------
-[1.34.0]
+[1.34.1]
 ------------------
-FIXES:
-- fixed error thrown due to calculation of hashsums attempted on `secret` and `configmap` object content when the object instance is implicitly disabled. Setting `enabled: false` in the corresponding `_HULL_OBJECT_TYPE_DEFAULT_` instance will implicitly disable rendering for instances which in this case don't explicitly set `enabled: true`. Now, when a `volumeMount` has property `hashsumAnnotation` set to `true` and the targeted `configmap` or `secret` is either implicitly or explicitly disabled in the chart, the calculation of the hashsum is skipped and no errors are thrown.
-
 CHANGES:
-- initial K8S 1.34 release
-- deprecating 1.31 release
-- deprecating `endpoint` object type in accordance with [Kubernetes deprecation](https://kubernetes.io/blog/2025/04/24/endpoints-deprecation/). `endpoint` remains as a configurable object type for the time being but tests for `endpoint` are removed because they fail linting starting with Kubernetes JSON schema version 1.34.
+- added optional parameters `NOTEMPLATING` and `SERIALIZATION` to `hull.util.tools.virtualdata.data.glob` transformation. The parameters match the behavior of `noTemplating` and `serialization` which are available for processing individual ConfigMap or Secret values. Used with the `hull.util.tools.virtualdata.data.glob` transformation, templating can be skipped and/or serialization performed on all external files captured via the given glob. Thanks [ievgenii-shepeliuk](https://github.com/ievgenii-shepeliuk) for the feature request.
diff --git a/hull/Chart.yaml b/hull/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: hull
-version: "1.34.0"
+version: "1.34.1"
 description: HULL - Helm Uniform Layer Library
 type: library
 keywords:
diff --git a/hull/HISTORY.md b/hull/HISTORY.md
@@ -1,4 +1,10 @@
 # History
+------------------
+[1.34.1]
+------------------
+CHANGES:
+- added optional parameters `NOTEMPLATING` and `SERIALIZATION` to `hull.util.tools.virtualdata.data.glob` transformation. The parameters match the behavior of `noTemplating` and `serialization` which are available for processing individual ConfigMap or Secret `data` values. Used with the `hull.util.tools.virtualdata.data.glob` transformation, templating can be skipped and/or serialization performed on all external files captured via the given glob. Thanks [ievgenii-shepeliuk](https://github.com/ievgenii-shepeliuk) for the feature request.
+
 ------------------
 [1.34.0]
 ------------------
diff --git a/hull/files/test/HULL/requirements.txt b/hull/files/test/HULL/requirements.txt
@@ -2,4 +2,4 @@ getgauge
 pyyaml
 dotty-dict
 jsonschema
-protobuf==4.21
+protobuf==6.31.1
diff --git a/hull/files/test/HULL/sources/cases/virtualfolderdata/expected.yaml b/hull/files/test/HULL/sources/cases/virtualfolderdata/expected.yaml
@@ -435,6 +435,27 @@ code-java-simple.java: "class Main {\r\n\r\n  public static void main(String[] a
   {\r\n    \r\n    int first = 10;\r\n    int second = 20;\r\n\r\n    \r\n    int
   sum = first + second;\r\n    System.out.println(first + \" + \" + second + \"
   = \"  + sum);\r\n  }\r\n}"
+templated-code-template.java: "class Main {\n\n  public static void main(String[] args) {\n
+    \   \n    int first = 123;\n    int second = 456;\n\n    int sum = first + second;\n
+    \   System.out.println(first + \" + \" + second + \" = \"  + sum);\n  }\n}"
+templated-code-no-template.java: "class Main {\n\n  public static void main(String[] args) {\n
+    \   \n    int first = {{ .Values.hull.config.specific.insert_into_template_code_1 }};\n    int second = {{ .Values.hull.config.specific.insert_into_template_code_2 }};\n\n    int sum = first + second;\n
+    \   System.out.println(first + \" + \" + second + \" = \"  + sum);\n  }\n}"
+templated-json-template.json: '{ "b2": 77 , "a1": "jsonjson", "c3": true, "d4": {"dd": "i
+    am a templated value in json"} }'
+templated-json-no-template.json: '{ "b2": 77 , "a1": "jsonjson", "c3": true, "d4": {"dd": "{{ .Values.hull.config.specific.insert_into_template_json }}"} }'
+templated-json-template-serialize.yaml: |-
+    a1: jsonjson
+    b2: 77
+    c3: true
+    d4:
+      dd: i am a templated value in json
+templated-json-no-template-serialize.yaml: |-
+    a1: jsonjson
+    b2: 77
+    c3: true
+    d4:
+      dd: '{{ .Values.hull.config.specific.insert_into_template_json }}'
 multiline-string: "This could\nbe a \nSSH key\nor \na \ncertificate\nwith\ndata
   \nlike\nASDADWADAASDASDASDASDASDADASD\nBASDASDASDASDASDASD\nCASDECEACSADSADSDA"
 simple-string: This is a simple string to be written to a ConfigMap
diff --git a/hull/files/test/HULL/sources/cases/virtualfolderdata/files/templated-code.java b/hull/files/test/HULL/sources/cases/virtualfolderdata/files/templated-code.java
@@ -0,0 +1,11 @@
+class Main {
+
+  public static void main(String[] args) {
+    
+    int first = {{ .Values.hull.config.specific.insert_into_template_code_1 }};
+    int second = {{ .Values.hull.config.specific.insert_into_template_code_2 }};
+
+    int sum = first + second;
+    System.out.println(first + " + " + second + " = "  + sum);
+  }
+}
diff --git a/hull/files/test/HULL/sources/cases/virtualfolderdata/files/templated-json.json b/hull/files/test/HULL/sources/cases/virtualfolderdata/files/templated-json.json
@@ -0,0 +1 @@
+{ "b2": 77 , "a1": "jsonjson", "c3": true, "d4": {"dd": "{{ .Values.hull.config.specific.insert_into_template_json }}"} }
diff --git a/hull/files/test/HULL/sources/cases/virtualfolderdata/virtualfolderdata.values.hull.yaml b/hull/files/test/HULL/sources/cases/virtualfolderdata/virtualfolderdata.values.hull.yaml
@@ -10,6 +10,9 @@ subdict:
 hull:
   config:
     specific: # Here you can put all that is particular configuration for your app
+      insert_into_template_json: i am a templated value in json
+      insert_into_template_code_1: 123
+      insert_into_template_code_2: 456
       value_to_resolve_1: trans
       value_to_resolve_2: formation
       resolve_me: |- 
@@ -306,7 +309,7 @@ hull:
             inline: _HT/hull.include.test.dockerconfigjson.code
           test-inline-include-code-dict-quote-json: 
             inline: _HT/toJson|hull.include.test.dockerconfigjson.code.quote
-          test-inline-include-code-dict-quote-none: 
+          test-inline-include-code-dict-quote-none:
             inline: _HT/none|hull.include.test.dockerconfigjson.code.quote
           test-inline-include-code-dict-quote-prettyjson: 
             inline: _HT/toPrettyJson|hull.include.test.dockerconfigjson.code.quote
@@ -857,6 +860,18 @@ hull:
       test-glob-import:
         data: _HT/hull.util.tools.virtualdata.data.glob:GLOB:"files/code-java-*.java"
 
+      test-glob-import-no-template:
+        data: _HT/hull.util.tools.virtualdata.data.glob:GLOB:"files/templated-*.*":NOTEMPLATING:true
+
+      test-glob-import-template:
+        data: _HT/hull.util.tools.virtualdata.data.glob:GLOB:"files/templated-*.*":NOTEMPLATING:false
+
+      test-glob-import-no-template-serialize:
+        data: _HT/hull.util.tools.virtualdata.data.glob:GLOB:"files/templated-json*.*":NOTEMPLATING:true:SERIALIZATION:"toYaml"
+
+      test-glob-import-template-serialize:
+        data: _HT/hull.util.tools.virtualdata.data.glob:GLOB:"files/templated-json.*":NOTEMPLATING:false:SERIALIZATION:"toYaml"
+
       multiline-string-preserve-linebreaks:
         annotations:
           multiline-string: _HT*hull.config.specific.multiline-string
diff --git a/hull/files/test/HULL/specs/configmap.spec b/hull/files/test/HULL/specs/configmap.spec
@@ -7,7 +7,7 @@ Test creation of objects and features.
 
 ## Render and Validate
 * Lint and Render
-* Expected number of "18" objects were rendered on top of basic objects count
+* Expected number of "22" objects were rendered on top of basic objects count
 * Validate
 
 ## Metadata
@@ -360,6 +360,20 @@ Test creation of objects and features.
 * Test Object has key "data§code-java-medium.java" with value of key "code-java-medium.java" from expected.yaml of suite "virtualfolderdata"
 * Test Object has key "data§code-java-complex.java" with value of key "code-java-complex.java" from expected.yaml of suite "virtualfolderdata"
 
+* Set test object to "release-name-hull-test-test-glob-import-template"
+* Test Object has key "data§templated-code.java" with value of key "templated-code-template.java" from expected.yaml of suite "virtualfolderdata"
+* Test Object has key "data§templated-json.json" with value of key "templated-json-template.json" from expected.yaml of suite "virtualfolderdata"
+
+* Set test object to "release-name-hull-test-test-glob-import-no-template"
+* Test Object has key "data§templated-code.java" with value of key "templated-code-no-template.java" from expected.yaml of suite "virtualfolderdata"
+* Test Object has key "data§templated-json.json" with value of key "templated-json-no-template.json" from expected.yaml of suite "virtualfolderdata"
+
+* Set test object to "release-name-hull-test-test-glob-import-template-serialize"
+* Test Object has key "data§templated-json.json" with value of key "templated-json-template-serialize.yaml" from expected.yaml of suite "virtualfolderdata"
+
+* Set test object to "release-name-hull-test-test-glob-import-no-template-serialize"
+* Test Object has key "data§templated-json.json" with value of key "templated-json-no-template-serialize.yaml" from expected.yaml of suite "virtualfolderdata"
+
 ## String handling
 * Prepare default test case for this kind including suites "virtualfolderdata"
 * Lint and Render
diff --git a/hull/files/test/HULL/specs/secret.spec b/hull/files/test/HULL/specs/secret.spec
@@ -7,7 +7,7 @@ Test creation of objects and features.
 
 ## Render and Validate
 * Lint and Render
-* Expected number of "20" objects were rendered on top of basic objects count
+* Expected number of "24" objects were rendered on top of basic objects count
 * Validate
 
 ## Metadata
@@ -356,6 +356,21 @@ Test creation of objects and features.
 * Test Object has key "data§code-java-medium.java" with Base64 encoded value of key "code-java-medium.java" from expected.yaml of suite "virtualfolderdata"
 * Test Object has key "data§code-java-complex.java" with Base64 encoded value of key "code-java-complex.java" from expected.yaml of suite "virtualfolderdata"
 
+* Set test object to "release-name-hull-test-test-glob-import-template"
+* Test Object has key "data§templated-code.java" with Base64 encoded value of key "templated-code-template.java" from expected.yaml of suite "virtualfolderdata"
+* Test Object has key "data§templated-json.json" with Base64 encoded value of key "templated-json-template.json" from expected.yaml of suite "virtualfolderdata"
+
+* Set test object to "release-name-hull-test-test-glob-import-no-template"
+* Test Object has key "data§templated-code.java" with Base64 encoded value of key "templated-code-no-template.java" from expected.yaml of suite "virtualfolderdata"
+* Test Object has key "data§templated-json.json" with Base64 encoded value of key "templated-json-no-template.json" from expected.yaml of suite "virtualfolderdata"
+
+* Set test object to "release-name-hull-test-test-glob-import-template-serialize"
+* Test Object has key "data§templated-json.json" with Base64 encoded value of key "templated-json-template-serialize.yaml" from expected.yaml of suite "virtualfolderdata"
+
+* Set test object to "release-name-hull-test-test-glob-import-no-template-serialize"
+* Test Object has key "data§templated-json.json" with Base64 encoded value of key "templated-json-no-template-serialize.yaml" from expected.yaml of suite "virtualfolderdata"
+
+
 ## Verify sources are not muddled together
 * Prepare default test case for this kind including suites "virtualfolderdata"
 * Lint and Render values file "secret_sources_seperated.values.hull.yaml"
diff --git a/hull/templates/_util_tools.tpl b/hull/templates/_util_tools.tpl
@@ -26,14 +26,24 @@
 |
 |   PARENT_CONTEXT: The Parent charts context
 |   GLOB: The glob expression to select the files
+|   NOTEMPLATING: Don't template content of all imported files
+|   SERIALIZATION: Apply serialization instruction to all imported files
 |
 */ -}}
 {{- define "hull.util.tools.virtualdata.data.glob" -}}
 {{- $parent := (index . "PARENT_CONTEXT") -}}
 {{- $glob := (index . "GLOB") -}}
+{{- $noTemplating := default false (index . "NOTEMPLATING") -}}
+{{- $serialization := default "" (index . "SERIALIZATION") -}}
 {
   {{ range $path, $_ := (index . "PARENT_CONTEXT").Files.Glob $glob }}
-  {{ (base $path) }}: { 'path': {{ $path }} },
+  {{ (base $path) }}: {
+    'path': {{ $path }},
+    'noTemplating': {{ $noTemplating }},
+    {{ if (ne $serialization "") }}
+    'serialization': {{ $serialization }}
+    {{ end }}
+  },
   {{ end }}
 }
 {{- end -}}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{ "b2": 77 , "a1": "jsonjson", "c3": true, "d4": {"dd": "{{ .Values.hull.config.specific.insert_into_template_json }}"} }`