From db290285f899451285e6505f924714489085f15e Mon Sep 17 00:00:00 2001
From: Sarah Roberts <sarahr@cyverse.org>
Date: Thu, 29 Feb 2024 12:33:24 -0700
Subject: [PATCH 1/2] DD-17: added ephemeral-storage resource requests and
 limits

---
 k8s/analyses.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/k8s/analyses.yml b/k8s/analyses.yml
index da924eb..1971d2e 100644
--- a/k8s/analyses.yml
+++ b/k8s/analyses.yml
@@ -63,9 +63,11 @@ spec:
           requests:
             cpu: "100m"
             memory: "1Gi"
+            ephemeral-storage: "1Gi"
           limits:
             cpu: "3000m"
             memory: "3Gi"
+            ephemeral-storage: "1Gi"
         env:
           - name: JAVA_TOOL_OPTIONS
             valueFrom:

From 068f3431776a3f59b6e56fc478516b2d928793e9 Mon Sep 17 00:00:00 2001
From: Sarah Roberts <sarahr@cyverse.org>
Date: Thu, 29 Feb 2024 14:02:17 -0700
Subject: [PATCH 2/2] DD-18: updated the GitHub workflows to use a reusable
 workflow

---
 .github/workflows/build-prerelease.yml | 35 --------------------------
 .github/workflows/build-release.yml    | 34 -------------------------
 .github/workflows/skaffold-build.yml   | 15 +++++++++++
 3 files changed, 15 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..4b2969b
--- /dev/null
+++ b/.github/workflows/skaffold-build.yml
@@ -0,0 +1,15 @@
+name: skaffold-build
+
+on:
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+(-rc[0-9]+)?"
+
+jobs:
+  call-workflow-passing-data:
+    uses: cyverse-de/github-workflows/skaffold-build.yaml
+    with:
+      build-prerelease: ${{ contains(github.ref_name, "-rc")
+    secrets:
+      harbor-username: ${{ secrets.HARBOR_USERNAME }}
+      harbor-password: ${{ secrets.HARBOR_PASSWORD }}