Skip to content

[vsphere] remove override of defaults for compute pool #29234

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
Jun 10, 2022
Merged

[vsphere] remove override of defaults for compute pool #29234

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
22 changes: 14 additions & 8 deletions ci-operator/step-registry/ipi/conf/vsphere/ipi-conf-vsphere-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ CONFIG="${SHARED_DIR}/install-config.yaml"
base_domain=$(<"${SHARED_DIR}"/basedomain.txt)
machine_cidr=$(<"${SHARED_DIR}"/machinecidr.txt)

MACHINE_POOL_OVERRIDES=""

RESOURCE_POOL_DEF=""
set +o errexit
VERSION=$(echo "${JOB_NAME}" | grep -o -E '4\.[0-9]+')
Expand All @@ -37,27 +39,30 @@ if [ ! -z ${VERSION} ]; then
echo "4.x installation is later than 4.9, will install with resource pool"
RESOURCE_POOL_DEF="resourcePool: /${vsphere_datacenter}/host/${vsphere_cluster}/Resources/ipi-ci-clusters"
fi
fi

cat >> "${CONFIG}" << EOF
baseDomain: $base_domain
controlPlane:
name: "master"
if [ ${Z_VERSION} -lt 11 ]; then
MACHINE_POOL_OVERRIDES="controlPlane:
name: master
replicas: 3
platform:
vsphere:
osDisk:
diskSizeGB: 120
compute:
- name: "worker"
- name: worker
replicas: 3
platform:
vsphere:
cpus: 4
coresPerSocket: 1
memoryMB: 16384
osDisk:
diskSizeGB: 120
diskSizeGB: 120"
fi
fi

cat >> "${CONFIG}" << EOF
baseDomain: $base_domain
$MACHINE_POOL_OVERRIDES
platform:
vsphere:
vcenter: "${vsphere_url}"
Expand All @@ -74,3 +79,4 @@ networking:
machineNetwork:
- cidr: "${machine_cidr}"
EOF