From e310281e7156c036ab1b4f2eeb63c37ef01518d5 Mon Sep 17 00:00:00 2001 From: erik Date: Fri, 18 Nov 2022 09:40:50 +0100 Subject: [PATCH] Remove deprecated field from cert --- src/main/cljc/dda/c4k_website/ingress_cert.cljc | 3 +-- src/main/resources/ingress/certificate.yaml | 1 - src/test/cljc/dda/c4k_website/ingress_cert_test.cljc | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/cljc/dda/c4k_website/ingress_cert.cljc b/src/main/cljc/dda/c4k_website/ingress_cert.cljc index fadcf9c..41eb152 100644 --- a/src/main/cljc/dda/c4k_website/ingress_cert.cljc +++ b/src/main/cljc/dda/c4k_website/ingress_cert.cljc @@ -73,8 +73,7 @@ (yaml/load-as-edn "ingress/certificate.yaml") (assoc-in [:metadata :name] cert-name) (assoc-in [:metadata :labels :app.kubernetes.part-of] app-name) - (assoc-in [:spec :secretName] cert-name) - (assoc-in [:spec :commonName] (first fqdns)) + (assoc-in [:spec :secretName] cert-name) (assoc-in [:spec :dnsNames] fqdns) (assoc-in [:spec :issuerRef :name] letsencrypt-issuer)))) \ No newline at end of file diff --git a/src/main/resources/ingress/certificate.yaml b/src/main/resources/ingress/certificate.yaml index 5020461..e95ae13 100644 --- a/src/main/resources/ingress/certificate.yaml +++ b/src/main/resources/ingress/certificate.yaml @@ -7,7 +7,6 @@ metadata: namespace: default spec: secretName: c4k-common-cert - commonName: FQDN duration: 2160h # 90d renewBefore: 360h # 15d dnsNames: diff --git a/src/test/cljc/dda/c4k_website/ingress_cert_test.cljc b/src/test/cljc/dda/c4k_website/ingress_cert_test.cljc index 262a086..8b1ebe7 100644 --- a/src/test/cljc/dda/c4k_website/ingress_cert_test.cljc +++ b/src/test/cljc/dda/c4k_website/ingress_cert_test.cljc @@ -108,8 +108,7 @@ :labels {:app.kubernetes.part-of "c4k-common-app"}, }, :spec - {:secretName "test-io-cert", - :commonName "test.de", + {:secretName "test-io-cert", :duration "2160h", :renewBefore "360h", :dnsNames ["test.de" "test.org" "www.test.de" "www.test.org"],