From 12f5e97ba973ba107780bf78595a7e31432c3b74 Mon Sep 17 00:00:00 2001 From: Sarah Roberts Date: Fri, 1 Mar 2024 14:22:03 -0700 Subject: [PATCH 1/3] DD-18: update dependencies and disable OpenTelemetry for local development testing --- project.clj | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/project.clj b/project.clj index 22e5604..9d47d80 100644 --- a/project.clj +++ b/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"] From 70bffe61bd517562938ebc1982b76cc501cc5b83 Mon Sep 17 00:00:00 2001 From: Sarah Roberts Date: Fri, 1 Mar 2024 14:23:55 -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 02691088ba4f3a3ccca57eded26826deaa2a40fa Mon Sep 17 00:00:00 2001 From: Sarah Roberts Date: Fri, 1 Mar 2024 14:25:58 -0700 Subject: [PATCH 3/3] DD-18: added ephemeral storage requests and limits --- k8s/clockwork.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/k8s/clockwork.yml b/k8s/clockwork.yml index ba3c62a..54e8d0c 100644 --- a/k8s/clockwork.yml +++ b/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