Merge pull request #140 from anchore/fix-missing-github-token

Don't use unset ENV vars in config file
anchore · Apr 28, 2021 · d37a441 · d37a441
2 parents 277717b + 9010b3e
commit d37a441
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 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.11
+version: 1.12.12
 appVersion: 0.9.3
 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
@@ -45,7 +45,9 @@ data:
         # If enabled only sync specific feeds instead of all that are found.
         enabled: true
         feeds:
-          {{- if not .Values.anchoreEnterpriseGlobal.enabled }}
+          {{- if .Values.anchoreEnterpriseGlobal.enabled }}
+          github: {{ .Values.anchoreEnterpriseFeeds.githubDriverEnabled }}
+          {{- else }}
           github: {{ default "true" .Values.anchoreGlobal.syncGithub }}
           {{- end }}
           # Vulnerabilities feed is the feed for distro cve sources (redhat, debian, ubuntu, oracle, alpine....)
@@ -70,8 +72,6 @@ data:
           vulndb: false
           microsoft: false
           {{- end }}
-          # Sync github data if available for GHSA matches
-          github: {{ default "true" .Values.anchoreGlobal.syncGithub }}
     {{- if .Values.anchoreEnterpriseFeeds.url }}
       url: "{{- .Values.anchoreEnterpriseFeeds.url }}"
       ssl_verify: {{ .Values.anchoreGlobal.internalServicesSsl.verifyCerts }}

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