Skip to content

Commit

Permalink
Merge pull request #267 from slr71/main
Browse files Browse the repository at this point in the history
DD-17: add `ephemeral-storage` requests and limits
  • Loading branch information
slr71 authored Mar 1, 2024
2 parents 87d070a + 0bbae95 commit ccc16a2
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 70 deletions.
35 changes: 0 additions & 35 deletions .github/workflows/build-prerelease.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/build-release.yml

This file was deleted.

16 changes: 16 additions & 0 deletions .github/workflows/skaffold-build.yml
Original file line number Diff line number Diff line change
@@ -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 }}
2 changes: 2 additions & 0 deletions k8s/apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ spec:
requests:
cpu: "100m"
memory: "1Gi"
ephemeral-storage: "1Gi"
limits:
cpu: "3000m"
memory: "3Gi"
ephemeral-storage: "1Gi"
args:
- --config
- /etc/iplant/de/apps.properties
Expand Down
3 changes: 2 additions & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
[test2junit "1.4.4"]
[jonase/eastwood "1.3.0"]]
: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}}
:repl-options {:timeout 120000}
Expand Down

0 comments on commit ccc16a2

Please sign in to comment.