Allow configmaps to read saml.useExistingSecret flag (#109)

* Allow configmaps to read saml.useExistingSecret flag There is currently a bug that requires the saml.secret value to be set regardless of the value of saml.useExistingSecret. This changes addresses this issue. fixes: #108 Signed-off-by: Adam Wallis <[email protected]> * Always pull saml secret from ENVIRONMENT Signed-off-by: Adam Wallis <[email protected]>
anchore · Jan 16, 2021 · 421b4d2 · 421b4d2
1 parent deeb382
commit 421b4d2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/stable/anchore-engine/Chart.yaml b/stable/anchore-engine/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: anchore-engine
-version: 1.11.2
+version: 1.11.3
 appVersion: 0.9.0
 description: Anchore container analysis and policy evaluation engine service
 keywords:

diff --git a/stable/anchore-engine/templates/engine_configmap.yaml b/stable/anchore-engine/templates/engine_configmap.yaml
@@ -99,7 +99,7 @@ data:
     # Locations for keys used for signing and encryption. Only one of 'secret' or 'public_key_path'/'private_key_path' needs to be set. If all are set then the keys take precedence over the secret value
     # Secret is for a shared secret and if set, all components in anchore should have the exact same value in their configs.
     keys:
-      {{- if .Values.anchoreGlobal.saml.secret }}
+      {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret }}
       secret: ${ANCHORE_SAML_SECRET}
       {{- end }}
       {{- with .Values.anchoreGlobal.saml.publicKeyName }}

diff --git a/stable/anchore-engine/templates/enterprise_configmap.yaml b/stable/anchore-engine/templates/enterprise_configmap.yaml
@@ -41,7 +41,7 @@ data:
     # Locations for keys used for signing and encryption. Only one of 'secret' or 'public_key_path'/'private_key_path' needs to be set. If all are set then the keys take precedence over the secret value
     # Secret is for a shared secret and if set, all components in anchore should have the exact same value in their configs.
     keys:
-      {{- if .Values.anchoreGlobal.saml.secret }}
+      {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret }}
       secret: ${ANCHORE_SAML_SECRET}
       {{- end }}
       {{- with .Values.anchoreGlobal.saml.publicKeyName }}

diff --git a/stable/anchore-engine/templates/enterprise_feeds_configmap.yaml b/stable/anchore-engine/templates/enterprise_feeds_configmap.yaml
@@ -33,7 +33,7 @@ data:
     # Locations for keys used for signing and encryption. Only one of 'secret' or 'public_key_path'/'private_key_path' needs to be set. If all are set then the keys take precedence over the secret value
     # Secret is for a shared secret and if set, all components in anchore should have the exact same value in their configs.
     keys:
-      {{- if .Values.anchoreGlobal.saml.secret }}
+      {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret }}
       secret: ${ANCHORE_SAML_SECRET}
       {{- end }}
       {{- with .Values.anchoreGlobal.saml.publicKeyName }}