From c2da784f6fa3995129132d323fe393430dc2c0bc Mon Sep 17 00:00:00 2001
From: Philip Sabri <4808216+philipsabri@users.noreply.github.com>
Date: Thu, 4 May 2023 11:42:22 +0200
Subject: [PATCH] fix(certificate): correcting format and removing unnecessary
 config (#791)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(certificate): correcting format and removing unnecessary config

Fix correct timestamp format
Remove isCA as it is not necessary to configure it as false

* Update charts/kong/CHANGELOG.md

---------

Co-authored-by: Patryk Małek <malekpatryk+github@gmail.com>
---
 charts/kong/CHANGELOG.md               | 9 ++++++++-
 charts/kong/Chart.yaml                 | 2 +-
 charts/kong/templates/certificate.yaml | 5 ++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
index 242268c30..3351faf24 100644
--- a/charts/kong/CHANGELOG.md
+++ b/charts/kong/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.20.1
+
+### Fixed
+
+* Fix correct timestamp format and remove `isCA` in certificates
+  [#791](https://github.com/Kong/charts/pull/791)
+
 ## 2.20.0
 
 ### Improvements
@@ -52,7 +59,7 @@
   [#747](https://github.com/Kong/charts/pull/747)
 * Added experimental support for the ingress controller's Konnect sync feature via `ingressController.konnect.*` values.
   This feature is only available when deploying chart with Kong Ingress Controller in version 2.9 or higher and
-  requires `ingressController.gatewayDiscovery.enabled` set to `true`. 
+  requires `ingressController.gatewayDiscovery.enabled` set to `true`.
   [#746](https://github.com/Kong/charts/pull/746)
 * Added support for annotations on the admission webhook ValidatingWebhookConfiguration.
   [#760](https://github.com/Kong/charts/pull/760)
diff --git a/charts/kong/Chart.yaml b/charts/kong/Chart.yaml
index 9278ec0fc..d8da2e645 100644
--- a/charts/kong/Chart.yaml
+++ b/charts/kong/Chart.yaml
@@ -11,7 +11,7 @@ maintainers:
 name: kong
 sources:
 - https://github.com/Kong/charts/tree/main/charts/kong
-version: 2.20.0
+version: 2.20.1
 appVersion: "3.2"
 dependencies:
 - name: postgresql
diff --git a/charts/kong/templates/certificate.yaml b/charts/kong/templates/certificate.yaml
index f87e9d8cd..9da641bb1 100644
--- a/charts/kong/templates/certificate.yaml
+++ b/charts/kong/templates/certificate.yaml
@@ -56,9 +56,8 @@ spec:
   {{- range (append .dnsNames .commonName) }}
   - {{ . | quote }}
   {{- end }}
-  renewBefore: 360h
-  duration: 2160h
-  isCA: false
+  renewBefore: 360h0m0s
+  duration: 2160h0m0s
   {{ if .subject -}}
   subject:
     {{- toYaml .subject | nindent 4 }}