From 04fe33f564fdb08ba1e8a50a5e228ca12cd50318 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 18 Nov 2022 10:08:48 +0100 Subject: [PATCH] Remove ingress_cert files --- .../cljc/dda/c4k_website/ingress_cert.cljc | 80 ------------ .../dda/c4k_website/ingress_cert_test.cljc | 120 ------------------ 2 files changed, 200 deletions(-) delete mode 100644 src/main/cljc/dda/c4k_website/ingress_cert.cljc delete mode 100644 src/test/cljc/dda/c4k_website/ingress_cert_test.cljc diff --git a/src/main/cljc/dda/c4k_website/ingress_cert.cljc b/src/main/cljc/dda/c4k_website/ingress_cert.cljc deleted file mode 100644 index fadcf9c..0000000 --- a/src/main/cljc/dda/c4k_website/ingress_cert.cljc +++ /dev/null @@ -1,80 +0,0 @@ -(ns dda.c4k-website.ingress-cert - (:require - [clojure.spec.alpha :as s] - #?(:cljs [shadow.resource :as rc]) - #?(:clj [orchestra.core :refer [defn-spec]] - :cljs [orchestra.core :refer-macros [defn-spec]]) - #?(:clj [clojure.edn :as edn] - :cljs [cljs.reader :as edn]) - [dda.c4k-common.yaml :as yaml] - [dda.c4k-common.common :as cm] - [dda.c4k-common.predicate :as pred] - [clojure.string :as str])) - -(s/def ::issuer pred/letsencrypt-issuer?) -(s/def ::service-name string?) -(s/def ::app-name string?) -(s/def ::ingress-name string?) -(s/def ::cert-name string?) -(s/def ::service-port pos-int?) -(s/def ::fqdns (s/coll-of pred/fqdn-string?)) - -(def ingress? (s/keys :req-un [::fqdns ::app-name ::ingress-name ::service-name ::service-port] - :opt-un [::issuer ::cert-name])) - -(def certificate? (s/keys :req-un [::fqdns ::app-name ::cert-name] - :opt-un [::issuer])) - -#?(:cljs - (defmethod yaml/load-resource :ingress [resource-name] - (case resource-name - "ingress/host-rule.yaml" (rc/inline "ingress/host-rule.yaml") - "ingress/certificate.yaml" (rc/inline "ingress/certificate.yaml") - "ingress/http-ingress.yaml" (rc/inline "ingress/http-ingress.yaml") - "ingress/https-ingress.yaml" (rc/inline "ingress/https-ingress.yaml") - (throw (js/Error. "Undefined Resource!"))))) - -(defn-spec generate-host-rule pred/map-or-seq? - [service-name ::service-name - service-port ::service-port - fqdn pred/fqdn-string?] - (-> - (yaml/load-as-edn "ingress/host-rule.yaml") - (cm/replace-all-matching-values-by-new-value "FQDN" fqdn) - (cm/replace-all-matching-values-by-new-value "SERVICE_PORT" service-port) - (cm/replace-all-matching-values-by-new-value "SERVICE_NAME" service-name))) - -(defn-spec generate-http-ingress pred/map-or-seq? - [config ingress?] - (let [{:keys [ingress-name service-name service-port fqdns app-name]} config] - (-> - (yaml/load-as-edn "ingress/http-ingress.yaml") - (assoc-in [:metadata :name] ingress-name) - (assoc-in [:metadata :labels :app.kubernetes.part-of] app-name) - (assoc-in [:spec :rules] (mapv (partial generate-host-rule service-name service-port) fqdns))))) - -(defn-spec generate-https-ingress pred/map-or-seq? - [config ingress?] - (let [{:keys [ingress-name cert-name service-name service-port fqdns app-name]} config] - (-> - (yaml/load-as-edn "ingress/https-ingress.yaml") - (assoc-in [:metadata :name] ingress-name) - (assoc-in [:metadata :labels :app.kubernetes.part-of] app-name) - (assoc-in [:spec :tls 0 :secretName] cert-name) - (assoc-in [:spec :tls 0 :hosts] fqdns) - (assoc-in [:spec :rules] (mapv (partial generate-host-rule service-name service-port) fqdns))))) - -(defn-spec generate-certificate pred/map-or-seq? - [config certificate?] - (let [{:keys [cert-name issuer fqdns app-name] - :or {issuer "staging"}} config - letsencrypt-issuer (name issuer)] - (-> - (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 :dnsNames] fqdns) - (assoc-in [:spec :issuerRef :name] letsencrypt-issuer)))) - \ No newline at end of file diff --git a/src/test/cljc/dda/c4k_website/ingress_cert_test.cljc b/src/test/cljc/dda/c4k_website/ingress_cert_test.cljc deleted file mode 100644 index 262a086..0000000 --- a/src/test/cljc/dda/c4k_website/ingress_cert_test.cljc +++ /dev/null @@ -1,120 +0,0 @@ -(ns dda.c4k-website.ingress-cert-test - (:require - #?(:clj [clojure.test :refer [deftest is are testing run-tests]] - :cljs [cljs.test :refer-macros [deftest is are testing run-tests]]) - [clojure.spec.test.alpha :as st] - [dda.c4k-website.ingress-cert :as cut])) - -(st/instrument `cut/generate-host-rule) -(st/instrument `cut/generate-http-ingress) -(st/instrument `cut/generate-https-ingress) -(st/instrument `cut/generate-certificate) - -(deftest should-generate-rule - (is (= {:host "test.com", - :http - {:paths - [{:pathType "Prefix", - :path "/", - :backend - {:service {:name "myservice", :port {:number 3000}}}}]}} - (cut/generate-host-rule "myservice" 3000 "test.com")))) - - -(deftest should-generate-http-ingress - (is (= {:apiVersion "networking.k8s.io/v1", - :kind "Ingress", - :metadata - {:name "test-io-http-ingress", - :namespace "default", - :labels {:app.kubernetes.part-of "c4k-common-app"}, - :annotations - #:traefik.ingress.kubernetes.io{:router.entrypoints "web", - :router.middlewares "default-redirect-https@kubernetescrd"}}} - (dissoc (cut/generate-http-ingress - {:issuer "prod" - :app-name "c4k-common-app" - :service-name "myservice" - :service-port 3000 - :ingress-name "test-io-http-ingress" - :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}) :spec))) - (is (= {:rules - [{:host "test.de", - :http - {:paths [{:pathType "Prefix", :path "/", :backend {:service {:name "myservice", :port {:number 3000}}}}]}} - {:host "www.test.de", - :http - {:paths [{:pathType "Prefix", :path "/", :backend {:service {:name "myservice", :port {:number 3000}}}}]}} - {:host "test-it.de", - :http - {:paths [{:pathType "Prefix", :path "/", :backend {:service {:name "myservice", :port {:number 3000}}}}]}} - {:host "www.test-it.de", - :http - {:paths [{:pathType "Prefix", :path "/", :backend {:service {:name "myservice", :port {:number 3000}}}}]}}]} - (:spec (cut/generate-http-ingress - {:issuer "prod" - :service-name "myservice" - :app-name "c4k-common-app" - :service-port 3000 - :ingress-name "test-io-http-ingress" - :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}))))) - -(deftest should-generate-https-ingress - (is (= {:apiVersion "networking.k8s.io/v1", - :kind "Ingress", - :metadata - {:name "test-io-https-ingress", - :namespace "default", - :labels {:app.kubernetes.part-of "c4k-common-app"}, - :annotations #:traefik.ingress.kubernetes.io{:router.entrypoints "websecure", :router.tls "true"}}} - (dissoc (cut/generate-https-ingress - {:issuer "prod" - :service-name "test-io-service" - :app-name "c4k-common-app" - :service-port 80 - :ingress-name "test-io-https-ingress" - :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}) :spec))) - (is (= {:tls - [{:hosts - ["test.de" "www.test.de" "test-it.de" "www.test-it.de"], - :secretName "test-io-cert"}] - :rules - [{:host "test.de", - :http - {:paths [{:pathType "Prefix", :path "/", :backend {:service {:name "test-io-service", :port {:number 80}}}}]}} - {:host "www.test.de", - :http - {:paths [{:pathType "Prefix", :path "/", :backend {:service {:name "test-io-service", :port {:number 80}}}}]}} - {:host "test-it.de", - :http - {:paths [{:pathType "Prefix", :path "/", :backend {:service {:name "test-io-service", :port {:number 80}}}}]}} - {:host "www.test-it.de", - :http - {:paths [{:pathType "Prefix", :path "/", :backend {:service {:name "test-io-service", :port {:number 80}}}}]}}]} - (:spec (cut/generate-https-ingress {:issuer "prod" - :app-name "c4k-common-app" - :service-name "test-io-service" - :service-port 80 - :ingress-name "test-io-https-ingress" - :cert-name "test-io-cert" - :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}))))) - -(deftest should-generate-certificate - (is (= {:apiVersion "cert-manager.io/v1", - :kind "Certificate", - :metadata { - :name "test-io-cert", - :namespace "default", - :labels {:app.kubernetes.part-of "c4k-common-app"}, - }, - :spec - {:secretName "test-io-cert", - :commonName "test.de", - :duration "2160h", - :renewBefore "360h", - :dnsNames ["test.de" "test.org" "www.test.de" "www.test.org"], - :issuerRef {:name "prod", :kind "ClusterIssuer"}}} - (cut/generate-certificate {:fqdns ["test.de" "test.org" "www.test.de" "www.test.org"] - :app-name "c4k-common-app" - :cert-name "test-io-cert" - :issuer "prod"}))))