From bbcb795826538a09375e1f1c829801980c6cf7cb Mon Sep 17 00:00:00 2001 From: Sarah Roberts Date: Fri, 1 Mar 2024 15:44:59 -0700 Subject: [PATCH 1/3] DD-18: updated dependencies --- project.clj | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/project.clj b/project.clj index c874391..51e284b 100644 --- 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 From f6ca5e58ee8c07c9f46c7d4e31f82d657c7311fe Mon Sep 17 00:00:00 2001 From: Sarah Roberts Date: Fri, 1 Mar 2024 15:45:39 -0700 Subject: [PATCH 2/3] DD-18: migrated to the shared GitHub workflows --- .github/workflows/build-prerelease.yml | 35 -------------------------- .github/workflows/build-release.yml | 34 ------------------------- .github/workflows/skaffold-build.yml | 16 ++++++++++++ 3 files changed, 16 insertions(+), 69 deletions(-) delete mode 100644 .github/workflows/build-prerelease.yml delete mode 100644 .github/workflows/build-release.yml create mode 100644 .github/workflows/skaffold-build.yml diff --git a/.github/workflows/build-prerelease.yml b/.github/workflows/build-prerelease.yml deleted file mode 100644 index 8ba760d..0000000 --- a/.github/workflows/build-prerelease.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: skaffold-build-prerelease -on: - push: - tags: - - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+" -jobs: - pipeline: - name: Skaffold Docker build - runs-on: ubuntu-20.04 - steps: - - name: Checkout Repo - id: checkout - uses: actions/checkout@v3 - - name: Harbor Login - id: harbor_login - uses: docker/login-action@v2 - with: - registry: harbor.cyverse.org - username: ${{ secrets.HARBOR_USERNAME }} - password: ${{ secrets.HARBOR_PASSWORD }} - - name: Install Kubernetes Tools - id: install_k8s_tools - uses: yokawasa/action-setup-kube-tools@v0.9.2 - - name: Build Docker images - id: build - run: | - skaffold build --file-output build.json - - name: Build manifest tarball - id: build_manifest_tarball - run: | - tar -czpvf deploy-info.tar.gz build.json skaffold.yaml k8s - - uses: ncipollo/release-action@v1 - with: - artifacts: "build.json,deploy-info.tar.gz" - prerelease: true diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml deleted file mode 100644 index be07f90..0000000 --- a/.github/workflows/build-release.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: skaffold-build-release -on: - push: - tags: - - "v[0-9]+.[0-9]+.[0-9]+" -jobs: - pipeline: - name: Skaffold Docker build - runs-on: ubuntu-20.04 - steps: - - name: Checkout Repo - id: checkout - uses: actions/checkout@v3 - - name: Harbor Login - id: harbor_login - uses: docker/login-action@v2 - with: - registry: harbor.cyverse.org - username: ${{ secrets.HARBOR_USERNAME }} - password: ${{ secrets.HARBOR_PASSWORD }} - - name: Install Kubernetes Tools - id: install_k8s_tools - uses: yokawasa/action-setup-kube-tools@v0.9.2 - - name: Build Docker images - id: build - run: | - skaffold build --file-output build.json - - name: Build manifest tarball - id: build_manifest_tarball - run: | - tar -czpvf deploy-info.tar.gz build.json skaffold.yaml k8s - - uses: ncipollo/release-action@v1 - with: - artifacts: "build.json,deploy-info.tar.gz" diff --git a/.github/workflows/skaffold-build.yml b/.github/workflows/skaffold-build.yml new file mode 100644 index 0000000..2d57c99 --- /dev/null +++ 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/skaffold-build.yml@v0.0.3 + with: + build-prerelease: ${{ contains(github.ref_name, '-rc') }} + secrets: + harbor-username: ${{ secrets.HARBOR_USERNAME }} + harbor-password: ${{ secrets.HARBOR_PASSWORD }} From 9f715c002cb406c0daade78ef1c32b61a930e96f Mon Sep 17 00:00:00 2001 From: Sarah Roberts Date: Fri, 1 Mar 2024 15:47:31 -0700 Subject: [PATCH 3/3] DD-17: added ephemeral-storage requests and limits --- k8s/data-info.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/k8s/data-info.yml b/k8s/data-info.yml index 1c158af..911024f 100644 --- 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