From ae77c63af9fd38ca38477ed33a0bf085fab35445 Mon Sep 17 00:00:00 2001 From: bhearn7 Date: Mon, 23 Aug 2021 15:55:35 -0400 Subject: [PATCH] update configmap conditional --- chart/templates/engine_configmap.yaml | 2 +- chart/templates/enterprise_configmap.yaml | 2 +- chart/templates/enterprise_feeds_configmap.yaml | 2 +- docs/BBCHANGES.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chart/templates/engine_configmap.yaml b/chart/templates/engine_configmap.yaml index 7cd2edf..be0232e 100644 --- a/chart/templates/engine_configmap.yaml +++ b/chart/templates/engine_configmap.yaml @@ -61,7 +61,7 @@ data: keys: {{- $anchorefullname := include "anchore-engine.fullname" . -}} {{- $old_secret := lookup "v1" "Secret" .Release.Namespace $anchorefullname }} - {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret $old_secret }} + {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret .Values.anchoreGlobal.oauthEnabled $old_secret }} secret: ${ANCHORE_SAML_SECRET} {{- end }} {{- with .Values.anchoreGlobal.saml.publicKeyName }} diff --git a/chart/templates/enterprise_configmap.yaml b/chart/templates/enterprise_configmap.yaml index ba75b31..c793738 100644 --- a/chart/templates/enterprise_configmap.yaml +++ b/chart/templates/enterprise_configmap.yaml @@ -43,7 +43,7 @@ data: keys: {{- $anchorefullname := include "anchore-engine.fullname" . -}} {{- $old_secret := lookup "v1" "Secret" .Release.Namespace $anchorefullname }} - {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret $old_secret }} + {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret .Values.anchoreGlobal.oauthEnabled $old_secret }} secret: ${ANCHORE_SAML_SECRET} {{- end }} {{- with .Values.anchoreGlobal.saml.publicKeyName }} diff --git a/chart/templates/enterprise_feeds_configmap.yaml b/chart/templates/enterprise_feeds_configmap.yaml index 6b2e87e..130beff 100644 --- a/chart/templates/enterprise_feeds_configmap.yaml +++ b/chart/templates/enterprise_feeds_configmap.yaml @@ -37,7 +37,7 @@ data: keys: {{- $anchorefullname := include "anchore-engine.fullname" . -}} {{- $old_secret := lookup "v1" "Secret" .Release.Namespace $anchorefullname }} - {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret $old_secret }} + {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret .Values.anchoreGlobal.oauthEnabled $old_secret }} secret: ${ANCHORE_SAML_SECRET} {{- end }} {{- with .Values.anchoreGlobal.saml.publicKeyName }} diff --git a/docs/BBCHANGES.md b/docs/BBCHANGES.md index 5869b8c..74faeda 100644 --- a/docs/BBCHANGES.md +++ b/docs/BBCHANGES.md @@ -238,7 +238,7 @@ Additionally, `./chart/templates/engine_configmap.yaml`, `./chart/templates/ente keys: {{- $anchorefullname := include "anchore-engine.fullname" . -}} {{- $old_secret := lookup "v1" "Secret" .Release.Namespace $anchorefullname }} - {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret $old_secret }} + {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret .Values.anchoreGlobal.oauthEnabled $old_secret }} secret: ${ANCHORE_SAML_SECRET} {{- end }} ``` \ No newline at end of file -- GitLab