From 6b79f2599d9cc013e5613dae4337bc7562143cba Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Sat, 17 Feb 2024 14:39:31 +0100 Subject: [PATCH] minor fixes --- src/main/cljc/dda/c4k_common/ingress.cljc | 8 ++++---- src/main/cljc/dda/c4k_common/postgres.cljc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/cljc/dda/c4k_common/ingress.cljc b/src/main/cljc/dda/c4k_common/ingress.cljc index 4e436d0..e900de7 100644 --- a/src/main/cljc/dda/c4k_common/ingress.cljc +++ b/src/main/cljc/dda/c4k_common/ingress.cljc @@ -77,9 +77,9 @@ [simple-ingress-config simple-ingress?] (let [{:keys [service-name]} simple-ingress-config config (merge {:app-name service-name - :ingress-name service-name - :cert-name service-name} - ingress-defaults - simple-ingress-config)] + :ingress-name service-name + :cert-name service-name} + ingress-defaults + simple-ingress-config)] [(generate-certificate config) (generate-ingress config)])) \ No newline at end of file diff --git a/src/main/cljc/dda/c4k_common/postgres.cljc b/src/main/cljc/dda/c4k_common/postgres.cljc index 35376ab..90b114e 100644 --- a/src/main/cljc/dda/c4k_common/postgres.cljc +++ b/src/main/cljc/dda/c4k_common/postgres.cljc @@ -15,7 +15,7 @@ (defn postgres-image? [input] - (contains? #{"postgres:13" "postgres:14"} input)) + (contains? #{"postgres:13" "postgres:14" "postgres:15" "postgres:16"} input)) (s/def ::postgres-db-user cp/bash-env-string?) (s/def ::postgres-db-password cp/bash-env-string?)