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

.gitignore

@@ -6,6 +6,7 @@ classes
 *~
 bin
 .classpath
+.eastwood
 .project
 .lein*
 \#*\#

k8s/kifshare.yml

@@ -49,9 +49,11 @@ spec:
           requests:
             cpu: "160m"
             memory: "512Mi"
+            ephemeral-storage: "1Gi"
           limits:
             cpu: "640m"
             memory: "2Gi"
+            ephemeral-storage: "1Gi"
         args:
           - --config
           - /etc/iplant/de/kifshare.properties

project.clj

@@ -17,22 +17,22 @@
   :manifest {"Git-Ref" ~(git-ref)}
   :uberjar-name "kifshare-standalone.jar"
 
-  :dependencies [[org.clojure/clojure "1.10.3"]
-                 [org.clojure/tools.logging "0.3.1"]
+  :dependencies [[org.clojure/clojure "1.11.1"]
+                 [org.clojure/tools.logging "1.3.0"]
                  [hawk "0.2.11"]
-                 [medley "0.5.5"]
-                 [org.cyverse/clj-jargon "3.0.3"
+                 [medley "1.4.0"]
+                 [org.cyverse/clj-jargon "3.1.0"
                    :exclusions [[org.slf4j/slf4j-log4j12]
                                 [log4j]]]
                  [org.cyverse/debug-utils "2.8.1"]
-                 [org.cyverse/service-logging "2.8.2"]
-                 [net.logstash.logback/logstash-logback-encoder "4.11"]
+                 [org.cyverse/service-logging "2.8.3"]
+                 [net.logstash.logback/logstash-logback-encoder "7.4"]
                  [org.cyverse/clojure-commons "2.8.0"]
                  [org.cyverse/common-cli "2.8.1"]
                  [org.cyverse/event-messages "0.0.1"]
                  [com.novemberain/langohr "3.5.1"]
                  [me.raynes/fs "1.4.6"]
-                 [cheshire "5.5.0"
+                 [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]
@@ -42,20 +42,24 @@
                  [compojure "1.5.0"]
                  [de.ubercode.clostache/clostache "1.4.0"]
                  [com.cemerick/url "0.1.1" :exclusions [com.cemerick/clojurescript.test]]
-                 [ring-logger "1.0.1"]]
+                 [ring-logger "1.1.1"]]
 
   :eastwood {:exclude-namespaces [:test-paths]
              :linters [:wrong-arity :wrong-ns-form :wrong-pre-post :wrong-tag :misplaced-docstrings]}
 
   :ring {:init kifshare.config/init
          :handler kifshare.core/app}
 
-  :profiles {:dev     {:resource-paths ["build" "conf" "dev-resources"]}
+  :profiles {:dev     {:resource-paths ["build" "conf" "dev-resources"]
+                       :jvm-opts ["-Dotel.javaagent.enabled=false"]}
              :uberjar {:aot :all}}
 
-  :plugins [[jonase/eastwood "0.2.3"]
-            [test2junit "1.2.2"]
-            [lein-ring "0.7.5"]]
+  :plugins [[jonase/eastwood "1.4.2"]
+            [lein-ancient "0.7.0"]
+            [lein-ring "0.7.5"]
+            [test2junit "1.2.2"]]
 
   :main ^:skip-aot kifshare.core
-  :jvm-opts ["-Dlogback.configurationFile=/etc/iplant/de/logging/kifshare-logging.xml" "-javaagent:./opentelemetry-javaagent.jar" "-Dotel.resource.attributes=service.name=kifshare"])
+  :jvm-opts ["-Dlogback.configurationFile=/etc/iplant/de/logging/kifshare-logging.xml"
+             "-javaagent:./opentelemetry-javaagent.jar"
+             "-Dotel.resource.attributes=service.name=kifshare"])