From f78b512c1d3e966a2321035c5295adfbab82d419 Mon Sep 17 00:00:00 2001
From: joshwolf <joshua.wolf@aero.org>
Date: Wed, 17 Mar 2021 15:59:40 +0000
Subject: [PATCH] Merge branch 'anchore-3.0.0' into 'master'

Upgrade Anchore

Bumps the Anchore tag to the newest version.

This includes the enterprise upgrade to 3.0.1, engine upgrade to 0.9.2, a small SSO bug fix with upgrades, and the upstream chart updates.

This is merging into Big Bang the changes from https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise/-/merge_requests/21

See merge request platform-one/big-bang/bigbang!322
---
 chart/values.yaml           | 2 +-
 scripts/package/synker.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chart/values.yaml b/chart/values.yaml
index a2f53ea463..261614cdbb 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -498,7 +498,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise.git
       path: "./chart"
-      tag: "1.11.0-bb.3"
+      tag: "1.12.4-bb.0"
 
     # -- Initial admin password used to authenticate to Anchore.
     adminPassword: ""
diff --git a/scripts/package/synker.yaml b/scripts/package/synker.yaml
index b25c1a450b..3461196270 100644
--- a/scripts/package/synker.yaml
+++ b/scripts/package/synker.yaml
@@ -30,8 +30,8 @@ source:
   authFile: /root/.docker/config.json
   images:
     - registry1.dso.mil/ironbank/twistlock/defender/defender:20.12.531
-    - registry1.dso.mil/ironbank/anchore/enterprise/enterprise:2.4.1
-    - registry1.dso.mil/ironbank/anchore/enterpriseui/enterpriseui:2.4.1
+    - registry1.dso.mil/ironbank/anchore/enterprise/enterprise:3.0.1
+    - registry1.dso.mil/ironbank/anchore/enterpriseui/enterpriseui:3.0.1
 
     # Images used by pipeline-templates
     # NOTE: These are __not__ fully inclusive yet, see this issue for updates: https://repo1.dso.mil/platform-one/big-bang/bigbang/-/issues/145
-- 
GitLab