From 506f6c90f8e14190c89f548f2b437fdaff18916d Mon Sep 17 00:00:00 2001 From: Sarah Roberts Date: Mon, 11 Mar 2024 17:42:42 -0700 Subject: [PATCH 1/2] DD-18: updated dependencies --- project.clj | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/project.clj b/project.clj index f9de75c3..317017d5 100644 --- a/project.clj +++ b/project.clj @@ -16,56 +16,56 @@ :uberjar-name "terrain-standalone.jar" :middleware [lein-git-down.plugin/inject-properties] :git-down {org.cyverse.de/cyverse-de-protobufs {:coordinates cyverse-de/p}} - :dependencies [[org.clojure/clojure "1.10.3"] - [org.clojure/data.codec "0.1.1"] + :dependencies [[org.clojure/clojure "1.11.2"] + [org.clojure/data.codec "0.2.0"] [org.clojure/tools.nrepl "0.2.13"] - [cheshire "5.10.0"] - [clj-http "3.11.0"] + [cheshire "5.12.0"] + [clj-http "3.12.3"] [clj-time "0.15.2"] [clojurewerkz/elastisch "2.2.0"] [com.cemerick/url "0.1.1" :exclusions [com.cemerick/clojurescript.test]] [compojure "1.6.1"] [dire "0.5.4"] [me.raynes/fs "1.4.6" :exclusions [org.apache.commons/commons-compress]] - [medley "1.3.0"] - [metosin/ring-http-response "0.9.1"] - [potemkin "0.4.5"] + [medley "1.4.0"] + [metosin/ring-http-response "0.9.3"] + [potemkin "0.4.7"] [proto-repl "0.3.1"] - [org.apache.tika/tika-core "1.23"] + [org.apache.tika/tika-core "2.9.1"] [ring/ring-jetty-adapter "1.8.0"] [slingshot "0.12.2"] - [org.cyverse/async-tasks-client "0.0.3"] - [org.cyverse/clj-icat-direct "2.9.0"] + [org.cyverse/async-tasks-client "0.0.4"] + [org.cyverse/clj-icat-direct "2.9.4"] [org.cyverse/clj-jargon "3.1.0" :exclusions [org.bouncycastle/bcprov-jdk16]] - [org.cyverse/clojure-commons "3.0.6"] + [org.cyverse/clojure-commons "3.0.7"] [org.cyverse/cyverse-groups-client "0.1.8"] [org.cyverse/common-cfg "2.8.2"] [org.cyverse/common-cli "2.8.1"] [org.cyverse/common-swagger-api "3.4.4"] - [org.cyverse/kameleon "3.0.6" + [org.cyverse/kameleon "3.0.8" :exclusion [com.impossibl.pgjdbc-ng/pgjdbc-ng]] [com.impossibl.pgjdbc-ng/pgjdbc-ng "0.8.9"] [org.cyverse/metadata-client "3.1.1"] [org.cyverse/metadata-files "2.1.0"] [org.cyverse/otel "0.2.5"] - [org.cyverse/permissions-client "2.8.1"] + [org.cyverse/permissions-client "2.8.3"] [org.cyverse/service-logging "2.8.3"] - [io.nats/jnats "2.4.0"] + [io.nats/jnats "2.17.3"] [less-awful-ssl "1.0.6"] - [clojure.java-time "1.2.0"] - [com.appsflyer/pronto "2.1.1"] + [clojure.java-time "1.4.2"] + [com.appsflyer/pronto "2.1.2"] [org.cyverse.de/cyverse-de-protobufs "2317731ae9fac1ecce3cedfb7ee168ba28305d73"]] :eastwood {:exclude-namespaces [terrain.util.jwt :test-paths] :linters [:wrong-arity :wrong-ns-form :wrong-pre-post :wrong-tag :misplaced-docstrings]} - :plugins [[lein-ancient "0.6.15"] + :plugins [[lein-ancient "0.7.0"] [lein-cljfmt "0.6.4"] [lein-ring "0.12.5" :exclusions [org.clojure/clojure]] [swank-clojure "1.4.2" :exclusions [org.clojure/clojure]] [test2junit "1.2.2"] - [jonase/eastwood "0.3.10"] + [jonase/eastwood "1.4.2"] [reifyhealth/lein-git-down "0.4.1"]] - :profiles {:dev {:dependencies [[clj-http-fake "1.0.3"]] + :profiles {:dev {:dependencies [[clj-http-fake "1.0.4"]] :resource-paths ["conf/test" "test-resources"] :jvm-opts ["-Dotel.javaagent.enabled=false"]} :uberjar {:aot :all}} From 3ee25244f7aea2a564b4df37d764f0251ffce5cc Mon Sep 17 00:00:00 2001 From: Sarah Roberts Date: Mon, 11 Mar 2024 17:46:03 -0700 Subject: [PATCH 2/2] DD-17: added `ephemeral-storage` requests and limits --- k8s/terrain.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/k8s/terrain.yml b/k8s/terrain.yml index 401842ea..2041834e 100644 --- a/k8s/terrain.yml +++ b/k8s/terrain.yml @@ -67,9 +67,11 @@ spec: requests: cpu: "320m" memory: "1Gi" + ephemeral-storage: "1Gi" limits: cpu: "3000m" memory: "3Gi" + ephemeral-storage: "1Gi" args: - --config - /etc/iplant/de/terrain.properties