From 8338c0beda261abe50015ff8a1000e8b24a13e74 Mon Sep 17 00:00:00 2001 From: Sonia Garudi Date: Mon, 10 Aug 2026 08:34:20 +0000 Subject: [PATCH] Support flexible machine config for PowerVS Signed-off-by: Sonia Garudi --- ...t-mce-power-create-ibmcloud-workers-infra-commands.sh | 6 +++--- ...hift-mce-power-create-ibmcloud-workers-infra-ref.yaml | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ci-operator/step-registry/hypershift/mce/power/create/ibmcloud-workers/infra/hypershift-mce-power-create-ibmcloud-workers-infra-commands.sh b/ci-operator/step-registry/hypershift/mce/power/create/ibmcloud-workers/infra/hypershift-mce-power-create-ibmcloud-workers-infra-commands.sh index 1ca3f26c386f4..395991be086d3 100644 --- a/ci-operator/step-registry/hypershift/mce/power/create/ibmcloud-workers/infra/hypershift-mce-power-create-ibmcloud-workers-infra-commands.sh +++ b/ci-operator/step-registry/hypershift/mce/power/create/ibmcloud-workers/infra/hypershift-mce-power-create-ibmcloud-workers-infra-commands.sh @@ -103,9 +103,9 @@ update_agentserviceconfig() { set_power_configs() { # PowerVS VSI(Virtual Server Instance) configs POWERVS_VSI_NAME="power-${HOSTED_CLUSTER_NAME}-worker" - POWERVS_VSI_MEMORY=$(jq -r '.powervsVSIMemory' "${AGENT_POWER_CREDENTIALS}/ibmcloud-resources.json") - POWERVS_VSI_PROCESSORS=$(jq -r '.powervsVSIProcessors' "${AGENT_POWER_CREDENTIALS}/ibmcloud-resources.json") - POWERVS_VSI_PROC_TYPE=$(jq -r '.powervsVSIProcType' "${AGENT_POWER_CREDENTIALS}/ibmcloud-resources.json") + POWERVS_VSI_MEMORY=${POWERVS_VSI_MEMORY:-$(jq -r '.powervsVSIMemory' "${AGENT_POWER_CREDENTIALS}/ibmcloud-resources.json")} + POWERVS_VSI_PROCESSORS=${POWERVS_VSI_PROCESSORS:-$(jq -r '.powervsVSIProcessors' "${AGENT_POWER_CREDENTIALS}/ibmcloud-resources.json")} + POWERVS_VSI_PROC_TYPE=${POWERVS_VSI_PROC_TYPE:-$(jq -r '.powervsVSIProcType' "${AGENT_POWER_CREDENTIALS}/ibmcloud-resources.json")} if [ ${IS_HETEROGENEOUS} == "yes" ]; then # NOTE: Using e980 as a workaround for VPC Load Balancer connectivity issues with # s922 in heterogeneous node pools, until a permanent fix. diff --git a/ci-operator/step-registry/hypershift/mce/power/create/ibmcloud-workers/infra/hypershift-mce-power-create-ibmcloud-workers-infra-ref.yaml b/ci-operator/step-registry/hypershift/mce/power/create/ibmcloud-workers/infra/hypershift-mce-power-create-ibmcloud-workers-infra-ref.yaml index d5b90301fa3de..fb58c987a2694 100644 --- a/ci-operator/step-registry/hypershift/mce/power/create/ibmcloud-workers/infra/hypershift-mce-power-create-ibmcloud-workers-infra-ref.yaml +++ b/ci-operator/step-registry/hypershift/mce/power/create/ibmcloud-workers/infra/hypershift-mce-power-create-ibmcloud-workers-infra-ref.yaml @@ -37,6 +37,15 @@ ref: - name: IS_HETEROGENEOUS documentation: "Flag to indicate whether the power workers being created are part of a heterogeneous cluster" default: "no" + - name: POWERVS_VSI_MEMORY + documentation: "Memory in GB for PowerVS worker VSI. If empty, reads from ibmcloud-resources.json" + default: "" + - name: POWERVS_VSI_PROCESSORS + documentation: "Number of processors for PowerVS worker VSI. If empty, reads from ibmcloud-resources.json" + default: "" + - name: POWERVS_VSI_PROC_TYPE + documentation: "Processor type for PowerVS worker VSI (shared/dedicated/capped). If empty, reads from ibmcloud-resources.json" + default: "" commands: hypershift-mce-power-create-ibmcloud-workers-infra-commands.sh from: dev-scripts grace_period: 15m0s