Update upgrade_job.yaml (#175)

* a customer pointed out an error in a job in the helm chart enterprise 1.0.0 in ZD 4786. * Updated the chart version and made the change from ZD 4786 to the templates pre-upgrade * remove path to certs dir as its included in env var * update test snapshots --------- Signed-off-by: Brady Todhunter <[email protected]> Co-authored-by: Brady Todhunter <[email protected]>
anchore · Jan 12, 2024 · b1bd518 · b1bd518
1 parent 12d5635
commit b1bd518
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/stable/enterprise/Chart.yaml b/stable/enterprise/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: enterprise
-version: "2.2.3"
+version: "2.2.4"
 appVersion: "5.1.1"
 kubeVersion: 1.23.x - 1.28.x || 1.23.x-x - 1.28.x-x
 description: |

diff --git a/stable/enterprise/templates/hooks/pre-upgrade/upgrade_job.yaml b/stable/enterprise/templates/hooks/pre-upgrade/upgrade_job.yaml
@@ -71,7 +71,7 @@ spec:
                   CONNSTR=${CONNSTR}?sslmode=${ANCHORE_DB_SSL_MODE}
                 fi
                 if [[ ${ANCHORE_DB_SSL_ROOT_CERT} != null ]]; then
-                  CONNSTR=${CONNSTR}&sslrootcert=/home/anchore/certs/${ANCHORE_DB_SSL_ROOT_CERT}
+                  CONNSTR=${CONNSTR}\&sslrootcert=${ANCHORE_DB_SSL_ROOT_CERT}
                 fi
                 err=$(anchore-enterprise-manager db --db-connect ${CONNSTR} pre-upgrade-check 2>&1 > /dev/null)
                 if [[ !$err ]]; then

diff --git a/stable/enterprise/tests/__snapshot__/prehook_upgrade_resources_test.yaml.snap b/stable/enterprise/tests/__snapshot__/prehook_upgrade_resources_test.yaml.snap
@@ -117,7 +117,7 @@ should render proper initContainers:
               CONNSTR=${CONNSTR}?sslmode=${ANCHORE_DB_SSL_MODE}
             fi
             if [[ ${ANCHORE_DB_SSL_ROOT_CERT} != null ]]; then
-              CONNSTR=${CONNSTR}&sslrootcert=/home/anchore/certs/${ANCHORE_DB_SSL_ROOT_CERT}
+              CONNSTR=${CONNSTR}\&sslrootcert=${ANCHORE_DB_SSL_ROOT_CERT}
             fi
             err=$(anchore-enterprise-manager db --db-connect ${CONNSTR} pre-upgrade-check 2>&1 > /dev/null)
             if [[ !$err ]]; then

diff --git a/stable/feeds/Chart.yaml b/stable/feeds/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: feeds
 type: application
-version: "2.1.3"
+version: "2.1.4"
 appVersion: "5.1.1"
 kubeVersion: 1.23.x - 1.27.x || 1.23.x-x - 1.28.x-x
 description: Anchore feeds service

diff --git a/stable/feeds/templates/hooks/pre-upgrade/upgrade_job.yaml b/stable/feeds/templates/hooks/pre-upgrade/upgrade_job.yaml
@@ -91,7 +91,7 @@ spec:
                   CONNSTR=${CONNSTR}?sslmode=${ANCHORE_FEEDS_DB_SSL_MODE}
                 fi
                 if [[ ${ANCHORE_FEEDS_DB_SSL_ROOT_CERT} != null ]]; then
-                  CONNSTR=${CONNSTR}&sslrootcert=/home/anchore/certs/${ANCHORE_FEEDS_DB_SSL_ROOT_CERT}
+                  CONNSTR=${CONNSTR}\&sslrootcert=${ANCHORE_FEEDS_DB_SSL_ROOT_CERT}
                 fi
                 err=$(anchore-enterprise-manager db --db-connect ${CONNSTR} pre-upgrade-check 2>&1 > /dev/null)
                 if [[ !$err ]]; then

diff --git a/stable/feeds/tests/__snapshot__/prehook_upgrade_resources_test.yaml.snap b/stable/feeds/tests/__snapshot__/prehook_upgrade_resources_test.yaml.snap
@@ -117,7 +117,7 @@ should render proper initContainers:
               CONNSTR=${CONNSTR}?sslmode=${ANCHORE_FEEDS_DB_SSL_MODE}
             fi
             if [[ ${ANCHORE_FEEDS_DB_SSL_ROOT_CERT} != null ]]; then
-              CONNSTR=${CONNSTR}&sslrootcert=/home/anchore/certs/${ANCHORE_FEEDS_DB_SSL_ROOT_CERT}
+              CONNSTR=${CONNSTR}\&sslrootcert=${ANCHORE_FEEDS_DB_SSL_ROOT_CERT}
             fi
             err=$(anchore-enterprise-manager db --db-connect ${CONNSTR} pre-upgrade-check 2>&1 > /dev/null)
             if [[ !$err ]]; then