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 }} diff --git a/.gitignore b/.gitignore index ae7c08a..0169421 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.eastwood .idea .lein* dewey.iml diff --git a/k8s/dewey.yml b/k8s/dewey.yml index b811269..21f1f8c 100644 --- a/k8s/dewey.yml +++ b/k8s/dewey.yml @@ -39,9 +39,11 @@ spec: requests: cpu: "480m" memory: "512Mi" + ephemeral-storage: "1Gi" limits: cpu: "1600m" memory: "2Gi" + ephemeral-storage: "1Gi" args: - --config - /etc/iplant/de/dewey.properties diff --git a/project.clj b/project.clj index 9f10d98..0195ba5 100644 --- a/project.clj +++ b/project.clj @@ -16,10 +16,10 @@ :manifest {"Git-Ref" ~(git-ref)} :uberjar-name "dewey-standalone.jar" :main ^:skip-aot dewey.core - :dependencies [[org.clojure/clojure "1.10.3"] - [org.clojure/tools.cli "0.3.1"] - [org.clojure/test.check "0.9.0"] - [cheshire "5.5.0" + :dependencies [[org.clojure/clojure "1.11.2"] + [org.clojure/tools.cli "1.1.230"] + [org.clojure/test.check "1.1.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] @@ -27,26 +27,28 @@ [com.fasterxml.jackson.core/jackson-core]]] [com.novemberain/langohr "3.5.1"] [liberator "0.15.3"] - [compojure "1.1.8"] - [ring "1.4.0"] - [slingshot "0.10.3"] - [org.cyverse/clj-jargon "3.0.3" + [compojure "1.7.1"] + [ring "1.12.0"] + [slingshot "0.12.2"] + [org.cyverse/clj-jargon "3.1.0" :exclusions [[org.slf4j/slf4j-log4j12] [log4j]]] - [org.cyverse/clojure-commons "2.8.0"] + [org.cyverse/clojure-commons "3.0.7"] [org.cyverse/common-cli "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/event-messages "0.0.1"] [me.raynes/fs "1.4.6"] - [cc.qbits/spandex "0.7.11"] - [org.apache.httpcomponents/httpcore "4.4.11"] ] + [cc.qbits/spandex "0.8.2"] + [org.apache.httpcomponents/httpcore "4.4.16"]] :eastwood {:exclude-namespaces [:test-paths] :linters [:wrong-arity :wrong-ns-form :wrong-pre-post :wrong-tag :misplaced-docstrings]} - :plugins [[test2junit "1.1.3"] - [jonase/eastwood "0.2.3"]] + :plugins [[jonase/eastwood "1.4.2"] + [lein-ancient "0.7.0"] + [test2junit "1.1.3"]] :resource-paths [] - :profiles {:dev {:dependencies [[midje "1.6.3"]] + :profiles {:dev {:dependencies [[midje "1.10.10"]] + :jvm-opts ["-Dotel.javaagent.enabled=false"] :resource-paths ["dev-resources"]} :uberjar {:aot :all}} :jvm-opts ["-Dlogback.configurationFile=/etc/iplant/de/logging/dewey-logging.xml" "-javaagent:./opentelemetry-javaagent.jar" "-Dotel.resource.attributes=service.name=dewey"])