Skip to content

azure: use Standard v3 instance types for OCP 4.21 and older #80483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sdodson wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −3
Open

azure: use Standard v3 instance types for OCP 4.21 and older #80483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,21 @@ elif [[ "${SIZE_VARIANT}" == "compact" ]]; then
fi
if [ -n "${master_type_prefix}" ]; then
if [ "${OCP_ARCH}" = "amd64" ]; then
master_type=${master_type_prefix}as_v5
if ! version_gt "${version}" "4.21"; then
master_type=${master_type_prefix}s_v3
else
master_type=${master_type_prefix}as_v5
fi
Comment thread
coderabbitai[bot] marked this conversation as resolved.
elif [ "${OCP_ARCH}" = "arm64" ]; then
master_type=${master_type_prefix}ps_v5
fi
fi
if [[ -n "${CONTROL_PLANE_INSTANCE_TYPE}" ]]; then
master_type="${CONTROL_PLANE_INSTANCE_TYPE}"
fi
if [ "${OCP_ARCH}" = "amd64" ] && ! version_gt "${version}" "4.21" && [[ "${COMPUTE_NODE_TYPE}" == "Standard_D4as_v5" ]]; then
COMPUTE_NODE_TYPE="Standard_D4s_v3"
fi

master_replicas=${CONTROL_PLANE_REPLICAS:-3}

Expand Down
7 changes: 5 additions & 2 deletions ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,14 @@ ref:
default: ""
documentation: |-
The instance type to use for control plane nodes.
When "" (default), depends on SIZE_VARIANT setting.
When "" (default), depends on SIZE_VARIANT and OCP version: Standard_D8as_v5 when OCP version is 4.22+,
Standard_D8s_v3 when OCP version is 4.21 and older (amd64 only; arm64 always uses Standard_D8ps_v5).
- name: COMPUTE_NODE_TYPE
default: 'Standard_D4as_v5'
documentation: |-
The instance type to use for compute nodes
The instance type to use for compute nodes.
When set to the default (Standard_D4as_v5) and OCP version is 4.21 and older, the script
automatically substitutes Standard_D4s_v3 to stay within Azure quota limits.
- name: COMPUTE_NODE_REPLICAS
default: "3"
documentation: |-
Expand Down