From 1b4336f4dbc42265347822bbc5d71eaf1177c017 Mon Sep 17 00:00:00 2001 From: Brady Todhunter Date: Fri, 29 Jan 2021 02:52:38 -0800 Subject: [PATCH] fix missing logic for mounting an existing secret for reports, notifications & feeds services (#114) Signed-off-by: Brady Todhunter --- stable/anchore-engine/Chart.yaml | 2 +- stable/anchore-engine/templates/api_deployment.yaml | 4 ++-- .../templates/enterprise_feeds_upgrade_job.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stable/anchore-engine/Chart.yaml b/stable/anchore-engine/Chart.yaml index 5445ed0e..e4264277 100644 --- a/stable/anchore-engine/Chart.yaml +++ b/stable/anchore-engine/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: anchore-engine -version: 1.11.5 +version: 1.11.6 appVersion: 0.9.0 description: Anchore container analysis and policy evaluation engine service keywords: diff --git a/stable/anchore-engine/templates/api_deployment.yaml b/stable/anchore-engine/templates/api_deployment.yaml index b45f8ec9..32e7ea4f 100644 --- a/stable/anchore-engine/templates/api_deployment.yaml +++ b/stable/anchore-engine/templates/api_deployment.yaml @@ -317,7 +317,7 @@ spec: envFrom: {{- if not .Values.inject_secrets_via_env }} - secretRef: - name: {{ template "anchore-engine.fullname" . }} + name: {{ default (include "anchore-engine.fullname" .) .Values.anchoreGlobal.existingSecret }} {{- end }} - configMapRef: name: {{ template "anchore-engine.fullname" . }}-env @@ -391,7 +391,7 @@ spec: envFrom: {{- if not .Values.inject_secrets_via_env }} - secretRef: - name: {{ template "anchore-engine.fullname" . }} + name: {{ default (include "anchore-engine.fullname" .) .Values.anchoreGlobal.existingSecret }} {{- end }} - configMapRef: name: {{ template "anchore-engine.fullname" . }}-env diff --git a/stable/anchore-engine/templates/enterprise_feeds_upgrade_job.yaml b/stable/anchore-engine/templates/enterprise_feeds_upgrade_job.yaml index fefa054e..0c1af30c 100644 --- a/stable/anchore-engine/templates/enterprise_feeds_upgrade_job.yaml +++ b/stable/anchore-engine/templates/enterprise_feeds_upgrade_job.yaml @@ -46,7 +46,7 @@ spec: envFrom: {{- if not .Values.inject_secrets_via_env }} - secretRef: - name: {{ default (include "anchore-engine.fullname" .) .Values.anchoreGlobal.existingSecret }} + name: {{ default (include "anchore-engine.enterprise-feeds.fullname" .) .Values.anchoreEnterpriseFeeds.existingSecret }} {{- end }} - configMapRef: name: {{ template "anchore-engine.enterprise-feeds.fullname" . }}-env