Merge pull request #136 from anchore/use_env_for_tokens

Use env for tokens
anchore · Apr 27, 2021 · 277717b · 277717b
2 parents 25d17d4 + b054c3a
commit 277717b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 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.12.10
+version: 1.12.11
 appVersion: 0.9.3
 description: Anchore container analysis and policy evaluation engine service
 keywords:

diff --git a/stable/anchore-engine/templates/enterprise_feeds_configmap.yaml b/stable/anchore-engine/templates/enterprise_feeds_configmap.yaml
@@ -128,14 +128,14 @@ data:
             enabled: {{ default "true" .Values.anchoreEnterpriseFeeds.vulndbDriverEnabled }}
           msrc:
             enabled: {{ .Values.anchoreEnterpriseFeeds.msrcDriverEnabled }}
-            api_key: {{ .Values.anchoreEnterpriseFeeds.msrcApiKey }}
+            api_key: ${ANCHORE_MSRC_KEY}
             {{- with .Values.anchoreEnterpriseFeeds.msrcWhitelist }}
             whitelist:
               - {{ . }}
             {{- end }}
           github:
             enabled: {{ .Values.anchoreEnterpriseFeeds.githubDriverEnabled }}
-            token: {{ .Values.anchoreEnterpriseFeeds.githubDriverToken }}
+            token: ${ANCHORE_GITHUB_TOKEN}
         {{- if .Values.anchoreGlobal.internalServicesSsl.enabled }}
         ssl_enable: {{ .Values.anchoreGlobal.internalServicesSsl.enabled }}
         ssl_cert: "/home/anchore/certs/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }}"

diff --git a/stable/anchore-engine/templates/enterprise_feeds_secret.yaml b/stable/anchore-engine/templates/enterprise_feeds_secret.yaml
@@ -18,5 +18,11 @@ stringData:
   {{- with .Values.anchoreGlobal.saml.secret }}
   ANCHORE_SAML_SECRET: {{ . }}
   {{- end }}
+  {{- with .Values.anchoreEnterpriseFeeds.msrcApiKey }}
+  ANCHORE_MSRC_KEY: {{ . | quote }}
+  {{- end }}
+  {{- with .Values.anchoreEnterpriseFeeds.githubDriverToken }}
+  ANCHORE_GITHUB_TOKEN: {{ . | quote }}
+  {{- end }}
 {{- end }}
 {{- end }}