Skip to content

Default worker type for aws on arm64 #32969

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

Merged
openshift-merge-robot merged 2 commits into from
Oct 10, 2022
Merged

Default worker type for aws on arm64 #32969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fd1301
Adding default worker types for arm64 aws compute nodes
aleskandro Oct 9, 2022
4a5d9f3
No need to set compute_node_type in the arm64 QE jobs anymore
aleskandro Oct 9, 2022
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
2 changes: 0 additions & 2 deletions ...penshift-tests-private/openshift-openshift-tests-private-release-4.11__arm64-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-openshiftsdn and not @fips'
OCP_ARCH: arm64
TAG_VERSION: '@4.11'
Expand All @@ -67,7 +66,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-ovnkubernetes and not @fips'
OCP_ARCH: arm64
TAG_VERSION: '@4.11'
Expand Down
11 changes: 0 additions & 11 deletions ...penshift-tests-private/openshift-openshift-tests-private-release-4.12__arm64-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-openshiftsdn and not @fips'
OCP_ARCH: arm64
TAG_VERSION: '@4.12'
Expand All @@ -71,7 +70,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-ovnkubernetes and not @fips'
OCP_ARCH: arm64
TAG_VERSION: '@4.12'
Expand All @@ -86,7 +84,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-ovnkubernetes and not @fips
and @destructive'
OCP_ARCH: arm64
Expand All @@ -102,7 +99,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-ovnkubernetes and not @fips
and @destructive'
OCP_ARCH: arm64
Expand All @@ -118,7 +114,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-ovnkubernetes and not @fips'
OCP_ARCH: arm64
TAG_VERSION: '@4.12'
Expand All @@ -133,7 +128,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-ovnkubernetes and not @fips'
OCP_ARCH: arm64
TAG_VERSION: '@4.12'
Expand All @@ -148,7 +142,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @disconnected and @network-ovnkubernetes
and not @fips'
OCP_ARCH: arm64
Expand All @@ -164,7 +157,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @proxy and @network-ovnkubernetes and
not @fips'
OCP_ARCH: arm64
Expand All @@ -180,7 +172,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @network-openshiftsdn and not @fips'
OCP_ARCH: arm64
TAG_VERSION: '@4.12'
Expand Down Expand Up @@ -211,7 +202,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @disconnected and @network-ovnkubernetes
and not @fips'
OCP_ARCH: arm64
Expand All @@ -228,7 +218,6 @@ tests:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
BASE_DOMAIN: qe.devcluster.openshift.com
COMPUTE_NODE_TYPE: m6g.large
E2E_RUN_TAGS: '@aws-ipi and @arm64 and @proxy and @network-ovnkubernetes and
not @fips'
OCP_ARCH: arm64
Expand Down
24 changes: 14 additions & 10 deletions ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,25 @@ function eval_instance_capacity() {
set -o errexit
}


# BootstrapInstanceType gets its value from pkg/types/aws/defaults/platform.go
architecture=${OCP_ARCH:-"amd64"}
if [[ "${CLUSTER_TYPE}" == "aws-arm64" ]]; then
architecture="arm64"
fi

# Do not change auto-types unless it is coordinated with the cloud
# financial operations team. Savings plans may be in place to
# decrease the cost of certain instance families.
if [[ "${COMPUTE_NODE_TYPE}" == "" ]]; then
if [[ "${IS_M6A_REGION}" == "yes" ]]; then
COMPUTE_NODE_TYPE=$(eval_instance_capacity "m6a.xlarge" "m6i.xlarge")
if [ "${architecture}" = "arm64" ]; then
COMPUTE_NODE_TYPE="m6g.xlarge"
else
COMPUTE_NODE_TYPE="m6i.xlarge"
if [[ "${IS_M6A_REGION}" == "yes" ]]; then
COMPUTE_NODE_TYPE=$(eval_instance_capacity "m6a.xlarge" "m6i.xlarge")
else
COMPUTE_NODE_TYPE="m6i.xlarge"
fi
fi
fi

Expand All @@ -79,13 +90,6 @@ elif [[ "${SIZE_VARIANT}" == "compact" ]]; then
CONTROL_PLANE_INSTANCE_SIZE="2xlarge"
fi

# BootstrapInstanceType gets its value from pkg/types/aws/defaults/platform.go
architecture=${OCP_ARCH:-"amd64"}

if [[ "${CLUSTER_TYPE}" == "aws-arm64" ]]; then
architecture="arm64"
fi

if [[ x"${architecture}" == x"arm64" ]]; then
arch_instance_type=m6g
CONTROL_PLANE_INSTANCE_TYPE="${arch_instance_type}.${CONTROL_PLANE_INSTANCE_SIZE}"
Expand Down