From 0c3a95b8b5cfc9df8a0d2f6d4c6b442547437ee3 Mon Sep 17 00:00:00 2001
From: "garcia.ryan" <garcia.ryan@solute.us>
Date: Mon, 1 Mar 2021 10:56:16 -0700
Subject: [PATCH 1/2] fix: Upgrade jobs pre-upgrade instead of post-upgrade

---
 chart/templates/engine_upgrade_job.yaml           | 2 +-
 chart/templates/enterprise_feeds_upgrade_job.yaml | 2 +-
 chart/templates/enterprise_upgrade_job.yaml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chart/templates/engine_upgrade_job.yaml b/chart/templates/engine_upgrade_job.yaml
index caf3beb..4c4ced1 100644
--- a/chart/templates/engine_upgrade_job.yaml
+++ b/chart/templates/engine_upgrade_job.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
   annotations:
-    "helm.sh/hook": post-upgrade
+    "helm.sh/hook": pre-upgrade
     "helm.sh/hook-weight": "-5"
 spec:
   template:
diff --git a/chart/templates/enterprise_feeds_upgrade_job.yaml b/chart/templates/enterprise_feeds_upgrade_job.yaml
index 1e6d061..a487a20 100644
--- a/chart/templates/enterprise_feeds_upgrade_job.yaml
+++ b/chart/templates/enterprise_feeds_upgrade_job.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
   annotations:
-    "helm.sh/hook": post-upgrade
+    "helm.sh/hook": pre-upgrade
     "helm.sh/hook-weight": "-3"
 spec:
   template:
diff --git a/chart/templates/enterprise_upgrade_job.yaml b/chart/templates/enterprise_upgrade_job.yaml
index 17df8d2..356f7e0 100644
--- a/chart/templates/enterprise_upgrade_job.yaml
+++ b/chart/templates/enterprise_upgrade_job.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
   annotations:
-    "helm.sh/hook": post-upgrade
+    "helm.sh/hook": pre-upgrade
     "helm.sh/hook-weight": "-3"
 spec:
   template:
-- 
GitLab


From 8f8f01c0241ca8e8e7b5f28b07c0d6ba666f1fab Mon Sep 17 00:00:00 2001
From: "garcia.ryan" <garcia.ryan@solute.us>
Date: Mon, 1 Mar 2021 11:13:12 -0700
Subject: [PATCH 2/2] fix: bumping chart for successful upgrades

---
 CHANGELOG.md     | 9 +++++++++
 chart/Chart.yaml | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4a941d..0dcc372 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+## [1.11.0-bb.1]
+### Fixed
+- Fixed incorrect timing for upgrade job resource for DB schema upgrades. (helm post-upgrade hook to helm pre-upgrade hook).
+
+## [1.11.0-bb.0]
+### Changed
+- Bumped upstream chart version to 1.11.0.
+- Bumped anchore engine version to v0.9.0 from registry1.
+
 ## [1.9.5-bb.2]
 ### Fixed
 - Fixed a bug that appeared in RKE2 with the postgres deployment not having access to the data directory
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 28be832..c04724f 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: anchore-engine
-version: 1.11.0-bb.0
+version: 1.11.0-bb.1
 appVersion: 0.9.0
 description: Anchore container analysis and policy evaluation engine service
 keywords:
-- 
GitLab