From a7f9ab7ce499078e35721e9fd87f30940c77ff70 Mon Sep 17 00:00:00 2001
From: CharlieC3 <2747302+CharlieC3@users.noreply.github.com>
Date: Fri, 17 Feb 2023 10:22:20 -0500
Subject: [PATCH] [stacks-blockchain-api] update API version to 7.0.0 & fix CDN
 secret

---
 hirosystems/stacks-blockchain-api/Chart.yaml             | 4 ++--
 hirosystems/stacks-blockchain-api/templates/_helpers.tpl | 2 +-
 hirosystems/stacks-blockchain-api/values.yaml            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hirosystems/stacks-blockchain-api/Chart.yaml b/hirosystems/stacks-blockchain-api/Chart.yaml
index 1d07356..2e2fec9 100644
--- a/hirosystems/stacks-blockchain-api/Chart.yaml
+++ b/hirosystems/stacks-blockchain-api/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
   category: ApplicationServer
 apiVersion: v2
-appVersion: 6.3.4
+appVersion: 7.0.0
 dependencies:
   - condition: stacks-blockchain.enabled
     name: stacks-blockchain
@@ -41,4 +41,4 @@ sources:
   - https://github.com/hirosystems/stacks-blockchain-api
   - https://docs.hiro.so/api
   - https://docs.hiro.so/get-started/stacks-blockchain-api
-version: 2.0.3
+version: 2.0.4
diff --git a/hirosystems/stacks-blockchain-api/templates/_helpers.tpl b/hirosystems/stacks-blockchain-api/templates/_helpers.tpl
index a2716cb..0bcd3a2 100644
--- a/hirosystems/stacks-blockchain-api/templates/_helpers.tpl
+++ b/hirosystems/stacks-blockchain-api/templates/_helpers.tpl
@@ -58,7 +58,7 @@ Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
 Return true if a secret object for the CDN should be created
 */}}
 {{- define "stacksBlockchainApi.cdn.createSecret" -}}
-{{- if not .Values.cdn.existingSecret -}}
+{{- if and (not .Values.cdn.existingSecret) (.Values.cdn.enabled) -}}
     {{- true -}}
 {{- end -}}
 {{- end -}}
diff --git a/hirosystems/stacks-blockchain-api/values.yaml b/hirosystems/stacks-blockchain-api/values.yaml
index f83f6e1..43f264a 100644
--- a/hirosystems/stacks-blockchain-api/values.yaml
+++ b/hirosystems/stacks-blockchain-api/values.yaml
@@ -96,7 +96,7 @@ apiWriter:
   image:
     registry: docker.io
     repository: hirosystems/stacks-blockchain-api
-    tag: 6.3.4
+    tag: 7.0.0
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -589,7 +589,7 @@ apiReader:
   image:
     registry: docker.io
     repository: hirosystems/stacks-blockchain-api
-    tag: 6.3.4
+    tag: 7.0.0
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images