Merge pull request #332 from vidispine/release-1.30

Release 1.30
vidispine · Aug 22, 2024 · 394889e · 394889e
2 parents dd0e24d + b298362
commit 394889e
Show file tree

Hide file tree

Showing 9 changed files with 277 additions and 63 deletions.
diff --git a/azure-pipelines-gated.yml b/azure-pipelines-gated.yml
@@ -33,11 +33,11 @@ jobs:
       Helm_3_14_4_multi: 
         HelmVersion: "3.14.4"
         TestType: multi
-      Helm_3_15_1_single: 
-        HelmVersion: "3.15.1"
+      Helm_3_15_4_single: 
+        HelmVersion: "3.15.4"
         TestType: single
-      Helm_3_15_1_multi: 
-        HelmVersion: "3.15.1"
+      Helm_3_15_4_multi: 
+        HelmVersion: "3.15.4"
         TestType: multi
   steps:
   - template: azure-pipelines-test.yml  # Template reference

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -85,6 +85,24 @@ jobs:
       Helm_3_15_1_multi: 
         HelmVersion: "3.15.1"
         TestType: multi
+      Helm_3_15_2_single: 
+        HelmVersion: "3.15.2"
+        TestType: single
+      Helm_3_15_2_multi: 
+        HelmVersion: "3.15.2"
+        TestType: multi
+      Helm_3_15_3_single: 
+        HelmVersion: "3.15.3"
+        TestType: single
+      Helm_3_15_3_multi: 
+        HelmVersion: "3.15.3"
+        TestType: multi
+      Helm_3_15_4_single: 
+        HelmVersion: "3.15.4"
+        TestType: single
+      Helm_3_15_4_multi: 
+        HelmVersion: "3.15.4"
+        TestType: multi
   steps:
   - template: azure-pipelines-test.yml  # Template reference
     parameters:

diff --git a/hull/CHANGELOG.md b/hull/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 ------------------
-[1.30.4]
+[1.30.5]
 ------------------
 FIXES:
-- fixed unwanted fields being merged when using the `sources` feature. When adding multiple sources, the intermediate results were not only merged into the target object but were also added to the sources themselves permanently. If `_HULL_OBJECT_TYPE_DEFAULT_` is in the sources list, this could lead to unwanted fields merged back into object instances that did not have sources specified and only inherited from `_HULL_OBJECT_TYPE_DEFAULT_` implicitly.
+- fixed issue with using `_HT*` get transformation path syntax within `_HT!` tpl functions when there is an overlap in the paths of the `_HT*` expressions. Since expressions were resolved in order of appearance this could lead to unexpected results where parts of longer expressions were incorrectly overwritten. For example, having get expressions `_HT*hull.config.specific.path.api` and `_HT*hull.config.specific.path.api-user.password` could lead to `_HT*hull.config.specific.path.api` being resolved incorrectly in the latter expresison leaving `-user.password` as an invalid remainder. By sorting the found expressions by descending length instead of order of appearance, it is guaranteed that the longer paths are resolved correctly before any shorter paths that may have an overlap.
+- fixed rendering error in case a Secret or ConfigMap that was referred to via the `hashsumAnnotation` feature was set to `enabled: false`. Disabled ConfigMaps or Secrets are now ignored for the calculation of hashsums.
diff --git a/hull/Chart.yaml b/hull/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: hull
-version: "1.30.4"
+version: "1.30.5"
 description: HULL - Helm Uniform Layer Library
 type: library
 keywords:

diff --git a/hull/HISTORY.md b/hull/HISTORY.md
@@ -1,4 +1,11 @@
 # History
+------------------
+[1.30.5]
+------------------
+FIXES:
+- fixed issue with using `_HT*` get transformation path syntax within `_HT!` tpl functions when there is an overlap in the paths of the `_HT*` expressions. Since expressions were resolved in order of appearance this could lead to unexpected results where parts of longer expressions were incorrectly overwritten. For example, having get expressions `_HT*hull.config.specific.path.api` and `_HT*hull.config.specific.path.api-user.password` could lead to `_HT*hull.config.specific.path.api` being resolved incorrectly in the latter expresison leaving `-user.password` as an invalid remainder. By sorting the found expressions by descending length instead of order of appearance, it is guaranteed that the longer paths are resolved correctly before any shorter paths that may have an overlap.
+- fixed rendering error in case a Secret or ConfigMap that was referred to via the `hashsumAnnotation` feature was set to `enabled: false`. Disabled ConfigMaps or Secrets are now ignored for the calculation of hashsums.
+
 ------------------
 [1.30.4]
 ------------------

diff --git a/hull/files/test/HULL/sources/cases/pod/pod.values.hull.yaml b/hull/files/test/HULL/sources/cases/pod/pod.values.hull.yaml
@@ -6,6 +6,25 @@
 ### CONFIG
 hull:
   config:
+    general:
+      data:
+        endpoints:
+          opensearch-api-only:
+            uri:
+              api: "osendpoint"
+              apiInternal: ""
+          opensearch-none:
+            uri:
+              api: ""
+              apiInternal: ""
+          opensearch-internal-only:
+            uri:
+              api: ""
+              apiInternal: "osendpointintern"
+          solr:
+            uri:
+              api: solrendpoint
+              apiInternal: solrendpointintern
     specific:
       pullPolicy: IfNotPresent
       env_string: "this is some string used in testing"
@@ -139,7 +158,13 @@ hull:
             path: files/secret-three-path-two.txt
           secret-three-path-two.yaml:
             path: files/secret-three-path-two.yaml
-
+      secret-disabled:
+        enabled: false
+        data:
+          secret-disabled.json:
+            inline: |-
+              { "key": "json for hash sum calculation of this secret-disabled.json" }
+
     configmap:
       configmap-one:
         data:
@@ -237,6 +262,13 @@ hull:
             path: files/configmap-three-path-two.txt
           configmap-three-path-two.yaml:
             path: files/configmap-three-path-two.yaml
+      configmap-disabled:
+        enabled: false
+        data:
+          configmap-disabled.json:
+            inline: |-
+              { "key": "json for hash sum calculation of this configmap-disabled.json" }
+
     registry:
 
       example-registry:
@@ -1403,6 +1435,44 @@ hull:
                     (_HT*hull.config.specific.hundred.its-98 | int) 
                     (_HT*hull.config.specific.hundred.its-99 | int) 
                     -}}
+                tpl_overlapping_paths_1:
+                  value: |
+                    _HT!
+                       {{- $index :=  default (default "" _HT*hull.config.general.data.endpoints.opensearch-api-only.uri.api) _HT*hull.config.general.data.endpoints.opensearch-api-only.uri.apiInternal -}}
+                       {{- if (ne $index "") -}}
+                       {{ $index }}
+                       {{- else -}}
+                       {{- $index =  default (default "" _HT*hull.config.general.data.endpoints.solr.uri.api) _HT*hull.config.general.data.endpoints.solr.uri.apiInternal -}}
+                       {{- if (ne $index "") -}}
+                       {{ $index }}
+                       {{- end -}}
+                       {{- end -}}
+                tpl_overlapping_paths_2:
+                  value: |-
+                    _HT!
+                       {{- $index :=  default (default "" _HT*hull.config.general.data.endpoints.opensearch-none.uri.api) _HT*hull.config.general.data.endpoints.opensearch-none.uri.apiInternal -}}
+                       {{- if (ne $index "") -}}
+                       {{ $index }}
+                       {{- else -}}
+                       {{- $index =  default (default "" _HT*hull.config.general.data.endpoints.opensearch-api-only.uri.api) _HT*hull.config.general.data.endpoints.opensearch-internal-only.uri.apiInternal -}}
+                       {{- if (ne $index "") -}}
+                       {{ $index }}
+                       {{- end -}}
+                       {{- end -}}
+                tpl_overlapping_paths_3:
+                  value: |
+                    _HT!
+                       {{- $index :=  default (default "" _HT*hull.config.general.data.endpoints.opensearch-none.uri.api) _HT*hull.config.general.data.endpoints.opensearch-none.uri.apiInternal -}}
+                       {{- if (ne $index "") -}}
+                       {{ $index }}
+                       {{- else -}}
+                       {{- $index =  default (default "" _HT*hull.config.general.data.endpoints.opensearch-internal-only.uri.api) _HT*hull.config.general.data.endpoints.opensearch-api-only.uri.apiInternal -}}
+                       {{- if (ne $index "") -}}
+                       {{- else -}}
+                       {{- $index =  default (default "" _HT*hull.config.general.data.endpoints.solr.uri.api) _HT*hull.config.general.data.endpoints.solr.uri.apiInternal -}}
+                       {{- end -}}
+                       {{ $index }}
+                       {{- end -}}
               volumeMounts:
                 test-math-bool-transformation-false:
                   readOnly: _HT?lt (add _HT*hull.config.specific.hundred.its-99 _HT*hull.config.specific.hundred.its-52) 150
@@ -1660,6 +1730,16 @@ hull:
                   mountPath: /three/subpath.json
                   subPath: configmap-three-inline-two.json
                   hashsumAnnotation: false
+            disabled-configmap:
+              image:
+                repository: my/image/repo
+                tag: "99.9"
+              volumeMounts:
+                configmap-disabled.txt:
+                  name: configmap-disabled
+                  mountPath: /disabled/subpath.txt
+                  subPath: configmap-disabled.txt
+                  hashsumAnnotation: true
             one-secret:
               image:
                 repository: my/image/repo
@@ -1712,6 +1792,16 @@ hull:
                   mountPath: /three/subpath.json
                   subPath: secret-three-inline-two.json
                   hashsumAnnotation: false
+            disabled-secret:
+              image:
+                repository: my/image/repo
+                tag: "99.9"
+              volumeMounts:
+                secret-disabled.txt:
+                  name: secret-disabled
+                  mountPath: /disabled/subpath.txt
+                  subPath: secret-disabled.txt
+                  hashsumAnnotation: true
           volumes:
             configmap-one:
               configMap:
@@ -1722,6 +1812,9 @@ hull:
             configmap-three:
               configMap:
                 name: configmap-three
+            configmap-disabled:
+              configMap:
+                name: configmap-disabled
             secret-one:
               secret:
                 secretName: secret-one
@@ -1731,6 +1824,9 @@ hull:
             secret-three:
               secret:
                 secretName: secret-three
+            secret-disabled:
+              configMap:
+                name: secret-disabled
             other:
               hostPath: 
                 path: /the_path_one
@@ -1931,6 +2027,26 @@ hull:
                       name: configmap-three
                       key: configmap-three-inline-two.json
                       hashsumAnnotation: false
+            disabled-configmap-envfrom:
+              image:
+                repository: my/image/repo
+                tag: "99.9"
+              envFrom:
+                configmap-disabled:
+                  configMapRef:
+                    name: configmap-disabled
+                    hashsumAnnotation: true
+            disabled-configmap:
+              image:
+                repository: my/image/repo
+                tag: "99.9"
+              env:
+                configmap-disabled.json:
+                  valueFrom:
+                    configMapKeyRef:
+                      name: configmap-disabled
+                      key: configmap-disabled.json
+                      hashsumAnnotation: true
             one-secret:
               image:
                 repository: my/image/repo
@@ -1991,7 +2107,27 @@ hull:
                       name: secret-three
                       key: secret-three-inline-two.json
                       hashsumAnnotation: false
-
+            disabled-secret-envfrom:
+              image:
+                repository: my/image/repo
+                tag: "99.9"
+              envFrom:
+                secret-disabled:
+                  secretRef:
+                    name: secret-disabled
+                    hashsumAnnotation: true
+            disabled-secret:
+              image:
+                repository: my/image/repo
+                tag: "99.9"
+              env:
+                secret-disabled.json:
+                  valueFrom:
+                    secretKeyRef:
+                      name: secret-disabled
+                      key: secret-disabled.json
+                      hashsumAnnotation: true
+
       pod-partial-values:
         enabled: false
         pod: |-