update deps

This commit is contained in:
jerger 2022-05-20 18:02:24 +02:00
parent 9821c6e0b4
commit f255f9ad75
2 changed files with 20 additions and 18 deletions

View file

@ -5,12 +5,12 @@
[dda.c4k-common.yaml :as yaml] [dda.c4k-common.yaml :as yaml]
[dda.c4k-common.base64 :as b64] [dda.c4k-common.base64 :as b64]
[dda.c4k-common.common :as cm] [dda.c4k-common.common :as cm]
[dda.c4k-common.prefixes :as pf])) [dda.c4k-common.predicate :as pd]))
(s/def ::aws-access-key-id pf/bash-env-string?) (s/def ::aws-access-key-id pd/bash-env-string?)
(s/def ::aws-secret-access-key pf/bash-env-string?) (s/def ::aws-secret-access-key pd/bash-env-string?)
(s/def ::restic-password pf/bash-env-string?) (s/def ::restic-password pd/bash-env-string?)
(s/def ::restic-repository pf/bash-env-string?) (s/def ::restic-repository pd/bash-env-string?)
#?(:cljs #?(:cljs
(defmethod yaml/load-resource :backup [resource-name] (defmethod yaml/load-resource :backup [resource-name]

View file

@ -9,29 +9,31 @@
[dda.c4k-jira.jira :as jira] [dda.c4k-jira.jira :as jira]
[dda.c4k-jira.backup :as backup])) [dda.c4k-jira.backup :as backup]))
(def default-storage-class :local-path)
(def default-jira-storage-size-gb 50)
(def config-defaults {:issuer :staging}) (def config-defaults {:issuer :staging})
(def config? (s/keys :req-un [::jira/fqdn] (def config? (s/keys :req-un [::fqdn]
:opt-un [::jira/issuer ::jira/jira-data-volume-path :opt-un [::issuer ::restic-repository]))
::postgres/postgres-data-volume-path ::restic-repository]))
(def auth? (s/keys :req-un [::postgres/postgres-db-user ::postgres/postgres-db-password (def auth? (s/keys :req-un [::postgres/postgres-db-user ::postgres/postgres-db-password
::aws-access-key-id ::aws-secret-access-key ::aws-access-key-id ::aws-secret-access-key
::restic-password])) ::restic-password]))
(defn k8s-objects [config] (defn-spec k8s-objects any?
[config (s/merge config? auth?)]
(into (into
[] []
(concat [(yaml/to-string (postgres/generate-config :postgres-size :2gb :db-name "jira")) (concat [(yaml/to-string (postgres/generate-config {:postgres-size :2gb :db-name "jira"}))
(yaml/to-string (postgres/generate-secret config))] (yaml/to-string (postgres/generate-secret config))
(when (contains? config :postgres-data-volume-path) (yaml/to-string (postgres/generate-pvc {:pv-storage-size-gb 30
[(yaml/to-string (postgres/generate-persistent-volume config))]) :pvc-storage-class-name default-storage-class}))
[(yaml/to-string (postgres/generate-pvc))
(yaml/to-string (postgres/generate-deployment :postgres-image "postgres:14")) (yaml/to-string (postgres/generate-deployment :postgres-image "postgres:14"))
(yaml/to-string (postgres/generate-service))] (yaml/to-string (postgres/generate-service))
(when (contains? config :jira-data-volume-path) (yaml/to-string (jira/generate-pvc {:pvc-storage-class-name default-storage-class
[(yaml/to-string (jira/generate-persistent-volume config))]) :pv-storage-size-gb default-jira-storage-size-gb}))
[(yaml/to-string (jira/generate-pvc))
(yaml/to-string (jira/generate-deployment config)) (yaml/to-string (jira/generate-deployment config))
(yaml/to-string (jira/generate-service)) (yaml/to-string (jira/generate-service))
(yaml/to-string (jira/generate-certificate config)) (yaml/to-string (jira/generate-certificate config))