Skip to content

templates: Add large and xlarge variants #6081

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 1 commit into from
Nov 25, 2019
Merged

templates: Add large and xlarge variants #6081

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/templates/openshift/installer/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,12 @@ objects:
workers=0
fi
if [[ "${CLUSTER_TYPE}" = "aws" ]]; then
master_type=null
if [[ "${CLUSTER_VARIANT}" =~ "xlarge" ]]; then
master_type=m5.8xlarge
elif [[ "${CLUSTER_VARIANT}" =~ "large" ]]; then
master_type=m5.4xlarge
fi
subnets="[]"
if [[ "${CLUSTER_VARIANT}" =~ "shared-vpc" ]]; then
case $((RANDOM % 4)) in
Expand All @@ -518,6 +524,7 @@ objects:
replicas: 3
platform:
aws:
type: ${master_type}
zones:
- us-east-1a
- us-east-1b
Expand Down Expand Up @@ -588,7 +595,7 @@ objects:
EOF
elif [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
# HACK: try to "poke" the token endpoint before the test starts
for i in `seq 1 30`; do
for i in $(seq 1 30); do
code="$( curl -s -o /dev/null -w "%{http_code}" https://oauth2.googleapis.com/token -X POST -d '' )"
if [[ "${code}" == "400" ]]; then
break
Expand Down
7 changes: 7 additions & 0 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,12 @@ objects:
workers=0
fi
if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
master_type=null
if [[ "${CLUSTER_VARIANT}" =~ "xlarge" ]]; then
master_type=m5.8xlarge
elif [[ "${CLUSTER_VARIANT}" =~ "large" ]]; then
master_type=m5.4xlarge
fi
subnets="[]"
if [[ "${CLUSTER_VARIANT}" =~ "shared-vpc" ]]; then
case $((RANDOM % 4)) in
Expand All @@ -378,6 +384,7 @@ objects:
replicas: 3
platform:
aws:
type: ${master_type}
zones:
- us-east-1a
- us-east-1b
Expand Down