Merge pull request #64 from slr71/main

DD-17: added `ephemeral-storage` requests and limits.
cyverse-de · Mar 1, 2024 · 58a357e · 58a357e
2 parents e519a05 + 9f715c0
commit 58a357e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 79 deletions.
diff --git a/.github/workflows/build-prerelease.yml b/.github/workflows/build-prerelease.yml
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
diff --git a/.github/workflows/skaffold-build.yml b/.github/workflows/skaffold-build.yml
@@ -0,0 +1,16 @@
+name: skaffold-build
+
+on:
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+"
+
+jobs:
+  call-workflow-passing-data:
+    uses: cyverse-de/github-workflows/.github/workflows/[email protected]
+    with:
+      build-prerelease: ${{ contains(github.ref_name, '-rc') }}
+    secrets:
+      harbor-username: ${{ secrets.HARBOR_USERNAME }}
+      harbor-password: ${{ secrets.HARBOR_PASSWORD }}
diff --git a/k8s/data-info.yml b/k8s/data-info.yml
@@ -49,9 +49,11 @@ spec:
           requests:
             cpu: "160m"
             memory: "1Gi"
+            ephemeral-storage: "1Gi"
           limits:
             cpu: "4000m"
             memory: "3Gi"
+            ephemeral-storage: "1Gi"
         args:
           - --config
           - /etc/iplant/de/data-info.properties

diff --git a/project.clj b/project.clj
@@ -14,8 +14,8 @@
             :url "http://iplantcollaborative.org/sites/default/files/iPLANT-LICENSE.txt"}
   :manifest {"Git-Ref" ~(git-ref)}
   :uberjar-name "data-info-standalone.jar"
-  :dependencies [[org.clojure/clojure "1.10.3"]
-                 [cheshire "5.10.0"
+  :dependencies [[org.clojure/clojure "1.11.1"]
+                 [cheshire "5.12.0"
                    :exclusions [[com.fasterxml.jackson.dataformat/jackson-dataformat-cbor]
                                 [com.fasterxml.jackson.dataformat/jackson-dataformat-smile]
                                 [com.fasterxml.jackson.core/jackson-annotations]
@@ -24,7 +24,7 @@
                  [com.cemerick/url "0.1.1" :exclusions [com.cemerick/clojurescript.test]]
                  [dire "0.5.4"]
                  [me.raynes/fs "1.4.6"]
-                 [org.apache.tika/tika-core "1.26"]
+                 [org.apache.tika/tika-core "2.9.1"]
                  [net.sf.opencsv/opencsv "2.3"]
                  [de.ubercode.clostache/clostache "1.4.0" :exclusions [org.clojure/core.incubator]]
                  [org.cyverse/clj-irods "0.3.4"]
@@ -36,17 +36,17 @@
                                 [log4j]]]
                  [javax.servlet/servlet-api "2.5"]
                  [metosin/compojure-api "1.1.13"]
-                 [ring/ring-jetty-adapter "1.6.3"] ;; update this when underlying ring version changes, probably
+                 [ring/ring-jetty-adapter "1.11.0"] ;; update this when underlying ring version changes, probably
                  [org.cyverse/otel "0.2.5"]
                  [org.cyverse/clojure-commons "3.0.7"]
                  [org.cyverse/common-cli "2.8.1"]
                  [org.cyverse/common-cfg "2.8.2"]
-                 [org.cyverse/common-swagger-api "3.1.0"]
+                 [org.cyverse/common-swagger-api "3.4.4"]
                  [org.cyverse/heuristomancer "2.8.6"]
-                 [org.cyverse/kameleon "3.0.6"]
+                 [org.cyverse/kameleon "3.0.8"]
                  [org.cyverse/metadata-client "3.1.1"]
                  [org.cyverse/async-tasks-client "0.0.4"]
-                 [org.cyverse/metadata-files "1.0.3"]
+                 [org.cyverse/metadata-files "2.1.0"]
                  [org.cyverse/oai-ore "1.0.3"]
                  [org.cyverse/service-logging "2.8.3"]
                  [org.cyverse/event-messages "0.0.1"]
@@ -58,10 +58,12 @@
                                   data-info.routes.schemas.trash
                                   :test-paths]
              :linters [:wrong-arity :wrong-ns-form :wrong-pre-post :wrong-tag :misplaced-docstrings]}
-  :plugins [[test2junit "1.1.3"]
-            [jonase/eastwood "0.4.0"]]
+  :plugins [[jonase/eastwood "1.4.2"]
+            [lein-ancient "0.7.0"]
+            [test2junit "1.1.3"]]
   :profiles {:dev     {:plugins        [[lein-ring "0.12.5"]]
-                       :resource-paths ["conf/test"]}
+                       :resource-paths ["conf/test"]
+                       :jvm-opts       ["-Dotel.javaagent.enabled=false"]}
              :repl    {:source-paths ["repl"]}
              :uberjar {:aot :all}}
   :main ^:skip-aot data-info.core