Merge pull request #7 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 @@ pom.xml.asc
 *.jar
 !opentelemetry-javaagent.jar
 *.class
+/.eastwood
 /.lein-*
 /.nrepl-port
 build.xml

k8s/info-typer.yml

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

project.clj

@@ -14,25 +14,29 @@
             :url "http://iplantcollaborative.org/sites/default/files/iPLANT-LICENSE.txt"}
   :manifest {"Git-Ref" ~(git-ref)}
   :uberjar-name "info-typer-standalone.jar"
-  :dependencies [[org.clojure/clojure "1.10.3"]
+  :dependencies [[org.clojure/clojure "1.11.1"]
                  [com.novemberain/langohr "3.6.1"]
                  [me.raynes/fs "1.4.6"]
-                 [org.cyverse/clj-jargon "3.0.3"
+                 [org.cyverse/clj-jargon "3.1.0"
                    :exclusions [[org.slf4j/slf4j-log4j12]
                                 [log4j]]]
-                 [org.cyverse/clojure-commons "2.8.0" :exclusions [commons-logging]]
+                 [org.cyverse/clojure-commons "3.0.7" :exclusions [commons-logging]]
                  [org.cyverse/common-cli "2.8.1"]
                  [org.cyverse/heuristomancer "2.8.6"]
-                 [org.cyverse/service-logging "2.8.2"]
+                 [org.cyverse/service-logging "2.8.3"]
                  [org.cyverse/otel "0.2.5"]
-                 [net.logstash.logback/logstash-logback-encoder "4.11"]
+                 [net.logstash.logback/logstash-logback-encoder "7.4"]
                  [org.cyverse/event-messages "0.0.1"]]
   :eastwood {:exclude-namespaces [:test-paths]
              :linters [:wrong-arity :wrong-ns-form :wrong-pre-post :wrong-tag :misplaced-docstrings]}
   :main ^:skip-aot info-typer.core
-  :profiles {:dev     {:resource-paths ["conf/test"]}
+  :profiles {:dev     {:resource-paths ["conf/test"]
+                       :jvm-opts ["-Dotel.javaagent.enabled=false"]}
              :uberjar {:aot :all}}
-  :plugins [[jonase/eastwood "0.2.3"]
+  :plugins [[jonase/eastwood "1.4.2"]
+            [lein-ancient "0.7.0"]
             [test2junit "1.1.3"]]
   :uberjar-exclusions [#"LICENSE" #"NOTICE"]
-  :jvm-opts ["-Dlogback.configurationFile=/etc/iplant/de/logging/info-typer-logging.xml" "-javaagent:./opentelemetry-javaagent.jar" "-Dotel.resource.attributes=service.name=info-typer"])
+  :jvm-opts ["-Dlogback.configurationFile=/etc/iplant/de/logging/info-typer-logging.xml"
+             "-javaagent:./opentelemetry-javaagent.jar"
+             "-Dotel.resource.attributes=service.name=info-typer"])