diff --git a/src/main/cljc/dda/c4k_common/monitoring.cljc b/src/main/cljc/dda/c4k_common/monitoring.cljc index d966d3e..07893e5 100644 --- a/src/main/cljc/dda/c4k_common/monitoring.cljc +++ b/src/main/cljc/dda/c4k_common/monitoring.cljc @@ -48,27 +48,7 @@ #?(:cljs (defmethod yaml/load-resource :monitoring [resource-name] - (case resource-name - "monitoring/namespace.yaml" (rc/inline "monitoring/namespace.yaml") - - "monitoring/kube-state-metrics/cluster-role-binding.yaml" (rc/inline "monitoring/kube-state-metrics/cluster-role-binding.yaml") - "monitoring/kube-state-metrics/cluster-role.yaml" (rc/inline "monitoring/kube-state-metrics/cluster-role.yaml") - "monitoring/kube-state-metrics/deployment.yaml" (rc/inline "monitoring/kube-state-metrics/deployment.yaml") - "monitoring/kube-state-metrics/service-account.yaml" (rc/inline "monitoring/kube-state-metrics/service-account.yaml") - "monitoring/kube-state-metrics/service.yaml" (rc/inline "monitoring/kube-state-metrics/service.yaml") - "monitoring/node-exporter/cluster-role-binding.yaml" (rc/inline "monitoring/node-exporter/cluster-role-binding.yaml") - "monitoring/node-exporter/cluster-role.yaml" (rc/inline "monitoring/node-exporter/cluster-role.yaml") - "monitoring/node-exporter/daemon-set.yaml" (rc/inline "monitoring/node-exporter/daemon-set.yaml") - "monitoring/node-exporter/service-account.yaml" (rc/inline "monitoring/node-exporter/service-account.yaml") - "monitoring/node-exporter/service.yaml" (rc/inline "monitoring/node-exporter/service.yaml") - "monitoring/prometheus/cluster-role-binding.yaml" (rc/inline "monitoring/prometheus/cluster-role-binding.yaml") - "monitoring/prometheus/cluster-role.yaml" (rc/inline "monitoring/prometheus/cluster-role.yaml") - "monitoring/prometheus/config.yaml" (rc/inline "monitoring/prometheus/config.yaml") - "monitoring/prometheus/deployment.yaml" (rc/inline "monitoring/prometheus/deployment.yaml") - "monitoring/prometheus/prometheus.yaml" (rc/inline "monitoring/prometheus/prometheus.yaml") - "monitoring/prometheus/service-account.yaml" (rc/inline "monitoring/prometheus/service-account.yaml") - "monitoring/prometheus/service.yaml" (rc/inline "monitoring/prometheus/service.yaml") - (throw (js/Error. "Undefined Resource!"))))) + (get (inline-resources "monitoring") resource-name))) (defn-spec generate-stateful-set cp/map-or-seq? [config ::storage] diff --git a/src/main/cljc/dda/c4k_common/postgres.cljc b/src/main/cljc/dda/c4k_common/postgres.cljc index 90b114e..4e81554 100644 --- a/src/main/cljc/dda/c4k_common/postgres.cljc +++ b/src/main/cljc/dda/c4k_common/postgres.cljc @@ -35,17 +35,7 @@ #?(:cljs (defmethod yaml/load-resource :postgres [resource-name] - (case resource-name - "postgres/config-2gb.yaml" (rc/inline "postgres/config-2gb.yaml") - "postgres/config-4gb.yaml" (rc/inline "postgres/config-4gb.yaml") - "postgres/config-8gb.yaml" (rc/inline "postgres/config-8gb.yaml") - "postgres/config-16gb.yaml" (rc/inline "postgres/config-16gb.yaml") - "postgres/deployment.yaml" (rc/inline "postgres/deployment.yaml") - "postgres/persistent-volume.yaml" (rc/inline "postgres/persistent-volume.yaml") - "postgres/pvc.yaml" (rc/inline "postgres/pvc.yaml") - "postgres/secret.yaml" (rc/inline "postgres/secret.yaml") - "postgres/service.yaml" (rc/inline "postgres/service.yaml") - (throw (js/Error. "Undefined Resource!"))))) + (get (inline-resources "postgres") resource-name))) (defn-spec generate-config cp/map-or-seq? [& config (s/? pg-config?)] @@ -57,7 +47,6 @@ (str "postgres/config-" (name postgres-size) ".yaml"))) (assoc-in [:data :postgres-db] db-name)))) -; TODO: why do we need a sequence of configs? (defn-spec generate-deployment cp/map-or-seq? [& config (s/? pg-config?)] (let [{:keys [postgres-image]