From fabe24ac1d71cf88e3e23160a5bffa02e1644a81 Mon Sep 17 00:00:00 2001 From: Fabian von Feilitzsch Date: Wed, 31 May 2023 11:12:37 -0400 Subject: [PATCH] :sparkles: allow memory and CPU request for windup container to be customized (#237) in the install-tackle action Signed-off-by: Fabian von Feilitzsch --- .github/actions/install-tackle/action.yml | 10 ++++++++++ hack/install-tackle.sh | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/.github/actions/install-tackle/action.yml b/.github/actions/install-tackle/action.yml index 4490a69..7d7fbd7 100644 --- a/.github/actions/install-tackle/action.yml +++ b/.github/actions/install-tackle/action.yml @@ -30,6 +30,14 @@ inputs: description: "Image Pull Policy" required: false default: "Always" + tackle-windup-container-cpu: + description: "The CPU request value for the windup task containers" + required: false + default: 0 + tackle-windup-container-memory: + description: "The memory request value for the windup task containers" + required: false + default: 0 # TODO(djzager): uncomment when supported # tackle-operator-container-image: # description: "image url for operator container" @@ -49,6 +57,8 @@ runs: export TACKLE_ADDON_ADMIN_IMAGE="${{ inputs.tackle-addon-admin-image }}" export TACKLE_ADDON_WINDUP_IMAGE="${{ inputs.tackle-addon-windup-image }}" export TACKLE_IMAGE_PULL_POLICY="${{ inputs.tackle-image-pull-policy }}" + export TACKLE_WINDUP_CONTAINER_REQUESTS_MEMORY="${{ inputs.tackle-windup-container-memory }}" + export TACKLE_WINDUP_CONTAINER_REQUESTS_CPU="${{ inputs.tackle-windup-container-cpu }}" make install-tackle working-directory: ${{ github.action_path }}/../../.. shell: bash diff --git a/hack/install-tackle.sh b/hack/install-tackle.sh index 78586c1..e1da817 100755 --- a/hack/install-tackle.sh +++ b/hack/install-tackle.sh @@ -11,6 +11,8 @@ TACKLE_UI_INGRESS_CLASS_NAME="${TACKLE_UI_INGRESS_CLASS_NAME:-nginx}" TACKLE_ADDON_ADMIN_IMAGE="${TACKLE_ADDON_ADMIN_IMAGE:-quay.io/konveyor/tackle2-addon:latest}" TACKLE_ADDON_WINDUP_IMAGE="${TACKLE_ADDON_WINDUP_IMAGE:-quay.io/konveyor/tackle2-addon-windup:latest}" TACKLE_IMAGE_PULL_POLICY="${TACKLE_IMAGE_PULL_POLICY:-Always}" +TACKLE_WINDUP_CONTAINER_REQUESTS_MEMORY="${TACKLE_WINDUP_CONTAINER_REQUESTS_MEMORY:-0}" +TACKLE_WINDUP_CONTAINER_REQUESTS_CPU="${TACKLE_WINDUP_CONTAINER_REQUESTS_CPU:-0}" TACKLE_FEATURE_AUTH_REQUIRED="${TACKLE_FEATURE_AUTH_REQUIRED:-false}" @@ -90,6 +92,8 @@ spec: admin_fqin: ${TACKLE_ADDON_ADMIN_IMAGE} windup_fqin: ${TACKLE_ADDON_WINDUP_IMAGE} image_pull_policy: ${TACKLE_IMAGE_PULL_POLICY} + windup_container_requests_memory: ${TACKLE_WINDUP_CONTAINER_REQUESTS_MEMORY} + windup_container_requests_cpu: ${TACKLE_WINDUP_CONTAINER_REQUESTS_CPU} EOF # Wait for reconcile to finish kubectl wait \