Merge pull request #10 from slr71/main

DD-17: added `ephemeral-storage` requests and limits.

.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 }}

k8s/clockwork.yml

@@ -45,9 +45,11 @@ spec:
           requests:
             cpu: "10m"
             memory: "512Mi"
+            ephemeral-storage: "1Gi"
           limits:
             cpu: "650m"
             memory: "2Gi"
+            ephemeral-storage: "1Gi"
         args:
           - --config
           - /etc/iplant/de/clockwork.properties

project.clj

@@ -14,29 +14,30 @@
             :url "https://cyverse.org/license"}
   :manifest {"Git-Ref" ~(git-ref)}
   :uberjar-name "clockwork-standalone.jar"
-  :dependencies [[org.clojure/clojure "1.10.2"]
-                 [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]
                                 [com.fasterxml.jackson.core/jackson-databind]
                                 [com.fasterxml.jackson.core/jackson-core]]]
-                 [clj-time "0.4.5"]
+                 [clj-time "0.15.2"]
                  [clojurewerkz/quartzite "1.0.1"
                    :exclusions [c3p0]]
-                 [com.mchange/c3p0 "0.9.5.1"]
+                 [com.mchange/c3p0 "0.9.5.5"]
                  [com.novemberain/langohr "3.5.1"]
-                 [org.cyverse/clojure-commons "2.8.0"]
+                 [org.cyverse/clojure-commons "3.0.7"]
                  [org.cyverse/common-cli "2.8.1"]
                  [org.cyverse/event-messages "0.0.1"]
-                 [org.cyverse/service-logging "2.8.0"]
+                 [org.cyverse/service-logging "2.8.3"]
                  [me.raynes/fs "1.4.6"]
-                 [slingshot "0.10.3"]]
-  :profiles {:dev     {:resource-paths ["resources/test"]}
+                 [slingshot "0.12.2"]]
+  :profiles {:dev     {:resource-paths ["resources/test"]
+                       :jvm-opts       ["-Dotel.javaagent.enabled=false"]}
              :test    {:resource-paths ["resources/test"]}
              :uberjar {:aot :all}}
   :main ^:skip-aot clockwork.core
-  :plugins [[jonase/eastwood "0.3.14"]
+  :plugins [[jonase/eastwood "1.4.2"]
             [lein-ancient "0.7.0"]
             [test2junit "1.4.2"]]
   :uberjar-exclusions [#"BCKEY.SF"]