From 4860e62fc215af08549b28172431fb8e8497601a Mon Sep 17 00:00:00 2001 From: bom Date: Tue, 2 Jul 2024 15:25:35 +0200 Subject: [PATCH] Clean up deprecations --- src/main/cljc/dda/c4k_shynet/shynet.cljc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/cljc/dda/c4k_shynet/shynet.cljc b/src/main/cljc/dda/c4k_shynet/shynet.cljc index 06392e7..dfc957e 100644 --- a/src/main/cljc/dda/c4k_shynet/shynet.cljc +++ b/src/main/cljc/dda/c4k_shynet/shynet.cljc @@ -21,10 +21,6 @@ "shynet/service-webserver.yaml" (rc/inline "shynet/service-webserver.yaml") "shynet/statefulset.yaml" (rc/inline "shynet/statefulset.yaml") (throw (js/Error. "Undefined Resource!"))))) - -#?(:cljs - (defmethod yaml/load-as-edn :shynet [resource-name] - (yaml/from-string (yaml/load-resource resource-name)))) (defn generate-secret [config] (let [{:keys [fqdn django-secret-key postgres-db-user postgres-db-password]} config] @@ -48,13 +44,13 @@ (defn generate-webserver-deployment [] (let [shynet-application "shynet-webserver"] (-> (yaml/load-as-edn "shynet/deployments.yaml") - (cm/replace-all-matching-values-by-new-value "shynet-application" shynet-application) + (cm/replace-all-matching "shynet-application" shynet-application) (update-in [:spec :template :spec :containers 0] dissoc :command)))) (defn generate-celeryworker-deployment [] (let [shynet-application "shynet-celeryworker"] (-> (yaml/load-as-edn "shynet/deployments.yaml") - (cm/replace-all-matching-values-by-new-value "shynet-application" shynet-application)))) + (cm/replace-all-matching "shynet-application" shynet-application)))) (defn generate-ingress [config] (let [{:keys [fqdn issuer] @@ -63,7 +59,7 @@ (-> (yaml/load-as-edn "shynet/ingress.yaml") (assoc-in [:metadata :annotations :cert-manager.io/cluster-issuer] letsencrypt-issuer) - (cm/replace-all-matching-values-by-new-value "fqdn" fqdn)))) + (cm/replace-all-matching "fqdn" fqdn)))) (defn generate-statefulset [] (yaml/load-as-edn "shynet/statefulset.yaml"))