aserto-lib.MergeGlobal correctly hanldes optional values

aserto-dev · Jan 8, 2025 · d7d8669 · d7d8669
1 parent a03b552
commit d7d8669
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/charts/aserto-lib/templates/_global.tpl b/charts/aserto-lib/templates/_global.tpl
@@ -12,6 +12,6 @@ Local values take precedence over global values.
 {{- $scope := first . }}
 {{- $key := index . 1}}
 {{- $global := (($scope.Values).global).aserto | default dict | dig $key dict }}
-{{- $chart := $scope.Values.AsMap | dig  $key dict }}
+{{- $chart := ($scope.Values).AsMap | default dict | dig  $key dict }}
 {{- merge $chart $global | toYaml }}
 {{- end }}
diff --git a/charts/aserto/Chart.lock b/charts/aserto/Chart.lock
@@ -10,7 +10,7 @@ dependencies:
   version: 0.1.9
 - name: discovery
   repository: file://../discovery
-  version: 0.1.8
+  version: 0.1.9
 - name: console
   repository: file://../console
   version: 0.1.8
@@ -20,5 +20,5 @@ dependencies:
 - name: registry-proxy
   repository: file://../registry-proxy
   version: 0.1.6
-digest: sha256:cff6d0558b7b5a592e221357863372cddc36b825e965786da73c022222060bf4
-generated: "2025-01-08T17:32:53.371635-05:00"
+digest: sha256:aa36828e3a9be09c32aca35e76785be6fea7a9cce866cf929effed6c38216635
+generated: "2025-01-08T18:26:30.831721-05:00"
diff --git a/charts/aserto/Chart.yaml b/charts/aserto/Chart.yaml
@@ -42,7 +42,7 @@ dependencies:
     repository: file://../authorizer
     condition: authorizer.enabled
   - name: discovery
-    version: 0.1.8
+    version: 0.1.9
     repository: file://../discovery
     condition: discovery.enabled
   - name: console

diff --git a/charts/discovery/Chart.yaml b/charts/discovery/Chart.yaml
@@ -21,7 +21,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.8
+version: 0.1.9
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/discovery/templates/config.yaml b/charts/discovery/templates/config.yaml
@@ -47,14 +47,15 @@ stringData:
     authentication:
       authenticators_enabled:
         root_key: true
-        {{- with .Values.oidc }}
+      {{- with .Values.oidc }}
         oidc: true
-        {{- end }}
+      {{- end }}
 
-      {{- with .Values.oidc -}}
+    {{- with .Values.oidc -}}
+      foobar: no
       oidc:
         {{- include "aserto-lib.oidcConfig" . | nindent 8 }}
-      {{- end }}
+    {{- end }}
 
       root_keys:
         keys: