Skip to content

Commit 4134347

Browse files
crawfordcrawford
committed
Use install-configs when invoking installer
The installer is moving away from environment variables. They were originally added as a work-around for CI, but now that install-configs can be read directly, these should be used instead.
1 parent c84e9df commit 4134347

File tree

3 files changed

+218
-48
lines changed

3 files changed

+218
-48
lines changed

‎ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml

Lines changed: 76 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -254,27 +254,23 @@ objects:
254254
value: ${CLUSTER_TYPE}
255255
- name: AWS_SHARED_CREDENTIALS_FILE
256256
value: /etc/openshift-installer/.awscred
257-
- name: OPENSHIFT_INSTALL_CLUSTER_NAME
257+
- name: AWS_REGION
258+
value: us-east-1
259+
- name: CLUSTER_NAME
258260
value: ${NAMESPACE}-${JOB_NAME_HASH}
259-
- name: OPENSHIFT_INSTALL_BASE_DOMAIN
261+
- name: BASE_DOMAIN
260262
value: origin-ci-int-aws.dev.rhcloud.com
261-
- name: OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH
263+
- name: SSH_PUB_KEY_PATH
262264
value: /etc/openshift-installer/ssh-publickey
263-
- name: OPENSHIFT_INSTALL_PULL_SECRET_PATH
265+
- name: PULL_SECRET_PATH
264266
value: /etc/openshift-installer/pull-secret
265-
- name: OPENSHIFT_INSTALL_PLATFORM
266-
value: ${CLUSTER_TYPE}
267-
- name: OPENSHIFT_INSTALL_AWS_REGION
268-
value: us-east-1
269267
- name: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
270268
value: ${RELEASE_IMAGE_LATEST}
271-
- name: OPENSHIFT_INSTALL_OPENSTACK_IMAGE
269+
- name: OPENSTACK_IMAGE
272270
value: rhcos
273-
- name: OPENSHIFT_INSTALL_OPENSTACK_CLOUD
274-
value: openstack-cloud
275-
- name: OPENSHIFT_INSTALL_OPENSTACK_REGION
271+
- name: OPENSTACK_REGION
276272
value: RegionOne
277-
- name: OPENSHIFT_INSTALL_OPENSTACK_EXTERNAL_NETWORK
273+
- name: OPENSTACK_EXTERNAL_NETWORK
278274
value: public
279275
- name: OS_CLOUD
280276
value: openstack-cloud
@@ -295,7 +291,73 @@ objects:
295291
mkdir /tmp/artifacts/installer &&
296292
/bin/openshift-install version >/tmp/artifacts/installer/version
297293
298-
export _CI_ONLY_STAY_AWAY_OPENSHIFT_INSTALL_AWS_USER_TAGS="{\"expirationDate\": \"$(date -d '4 hours' --iso=minutes --utc)\"}"
294+
export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
295+
export CLUSTER_ID=$(uuidgen --random)
296+
export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}")
297+
export PULL_SECRET=$(cat "${PULL_SECRET_PATH}")
298+
299+
if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
300+
cat > /tmp/artifacts/installer/install-config.yml << EOF
301+
baseDomain: ${BASE_DOMAIN}
302+
clusterID: ${CLUSTER_ID}
303+
machines:
304+
- name: master
305+
replicas: 3
306+
- name: worker
307+
replicas: 3
308+
metadata:
309+
name: ${CLUSTER_NAME}
310+
networking:
311+
clusterNetworks:
312+
- cidr: 10.128.0.0/14
313+
hostSubnetLength: 9
314+
serviceCIDR: 172.30.0.0/16
315+
type: OpenshiftSDN
316+
platform:
317+
aws:
318+
region: ${AWS_REGION}
319+
vpcCIDRBlock: 10.0.0.0/16
320+
userTags:
321+
expirationDate: ${EXPIRATION_DATE}
322+
pullSecret: |
323+
${PULL_SECRET}
324+
sshKey: |
325+
${SSH_PUB_KEY}
326+
EOF
327+
elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
328+
cat > /tmp/artifacts/installer/install-config.yml << EOF
329+
baseDomain: ${BASE_DOMAIN}
330+
clusterID: ${CLUSTER_ID}
331+
machines:
332+
- name: master
333+
replicas: 3
334+
- name: worker
335+
replicas: 3
336+
metadata:
337+
name: ${CLUSTER_NAME}
338+
networking:
339+
clusterNetworks:
340+
- cidr: 10.128.0.0/14
341+
hostSubnetLength: 9
342+
serviceCIDR: 172.30.0.0/16
343+
type: OpenshiftSDN
344+
platform:
345+
openstack:
346+
NetworkCIDRBlock: 10.0.0.0/16
347+
baseImage: ${OPENSTACK_IMAGE}
348+
cloud: ${OS_CLOUD}
349+
externalNetwork: ${OPENSTACK_EXTERNAL_NETWORK}
350+
region: ${OPENSTACK_REGION}
351+
pullSecret: |
352+
${PULL_SECRET}
353+
sshKey: |
354+
${SSH_PUB_KEY}
355+
EOF
356+
else
357+
echo "Unsupported cluster type '${CLUSTER_NAME}'"
358+
exit 1
359+
fi
360+
299361
/bin/openshift-install --dir=/tmp/artifacts/installer --log-level=debug create cluster &
300362
wait "$!"
301363

‎ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml

Lines changed: 76 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -226,27 +226,23 @@ objects:
226226
value: ${CLUSTER_TYPE}
227227
- name: AWS_SHARED_CREDENTIALS_FILE
228228
value: /etc/openshift-installer/.awscred
229-
- name: OPENSHIFT_INSTALL_CLUSTER_NAME
229+
- name: AWS_REGION
230+
value: us-east-1
231+
- name: CLUSTER_NAME
230232
value: ${NAMESPACE}-${JOB_NAME_HASH}
231-
- name: OPENSHIFT_INSTALL_BASE_DOMAIN
233+
- name: BASE_DOMAIN
232234
value: origin-ci-int-aws.dev.rhcloud.com
233-
- name: OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH
235+
- name: SSH_PUB_KEY_PATH
234236
value: /etc/openshift-installer/ssh-publickey
235-
- name: OPENSHIFT_INSTALL_PULL_SECRET_PATH
237+
- name: PULL_SECRET_PATH
236238
value: /etc/openshift-installer/pull-secret
237-
- name: OPENSHIFT_INSTALL_PLATFORM
238-
value: ${CLUSTER_TYPE}
239-
- name: OPENSHIFT_INSTALL_AWS_REGION
240-
value: us-east-1
241239
- name: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE
242240
value: ${RELEASE_IMAGE_LATEST}
243-
- name: OPENSHIFT_INSTALL_OPENSTACK_IMAGE
241+
- name: OPENSTACK_IMAGE
244242
value: rhcos
245-
- name: OPENSHIFT_INSTALL_OPENSTACK_CLOUD
246-
value: openstack-cloud
247-
- name: OPENSHIFT_INSTALL_OPENSTACK_REGION
243+
- name: OPENSTACK_REGION
248244
value: RegionOne
249-
- name: OPENSHIFT_INSTALL_OPENSTACK_EXTERNAL_NETWORK
245+
- name: OPENSTACK_EXTERNAL_NETWORK
250246
value: public
251247
- name: OS_CLOUD
252248
value: openstack-cloud
@@ -267,7 +263,73 @@ objects:
267263
mkdir /tmp/artifacts/installer &&
268264
/bin/openshift-install version >/tmp/artifacts/installer/version
269265
270-
export _CI_ONLY_STAY_AWAY_OPENSHIFT_INSTALL_AWS_USER_TAGS="{\"expirationDate\": \"$(date -d '4 hours' --iso=minutes --utc)\"}"
266+
export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
267+
export CLUSTER_ID=$(uuidgen --random)
268+
export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}")
269+
export PULL_SECRET=$(cat "${PULL_SECRET_PATH}")
270+
271+
if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
272+
cat > /tmp/artifacts/installer/install-config.yml << EOF
273+
baseDomain: ${BASE_DOMAIN}
274+
clusterID: ${CLUSTER_ID}
275+
machines:
276+
- name: master
277+
replicas: 3
278+
- name: worker
279+
replicas: 3
280+
metadata:
281+
name: ${CLUSTER_NAME}
282+
networking:
283+
clusterNetworks:
284+
- cidr: 10.128.0.0/14
285+
hostSubnetLength: 9
286+
serviceCIDR: 172.30.0.0/16
287+
type: OpenshiftSDN
288+
platform:
289+
aws:
290+
region: ${AWS_REGION}
291+
vpcCIDRBlock: 10.0.0.0/16
292+
userTags:
293+
expirationDate: ${EXPIRATION_DATE}
294+
pullSecret: |
295+
${PULL_SECRET}
296+
sshKey: |
297+
${SSH_PUB_KEY}
298+
EOF
299+
elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
300+
cat > /tmp/artifacts/installer/install-config.yml << EOF
301+
baseDomain: ${BASE_DOMAIN}
302+
clusterID: ${CLUSTER_ID}
303+
machines:
304+
- name: master
305+
replicas: 3
306+
- name: worker
307+
replicas: 3
308+
metadata:
309+
name: ${CLUSTER_NAME}
310+
networking:
311+
clusterNetworks:
312+
- cidr: 10.128.0.0/14
313+
hostSubnetLength: 9
314+
serviceCIDR: 172.30.0.0/16
315+
type: OpenshiftSDN
316+
platform:
317+
openstack:
318+
NetworkCIDRBlock: 10.0.0.0/16
319+
baseImage: ${OPENSTACK_IMAGE}
320+
cloud: ${OS_CLOUD}
321+
externalNetwork: ${OPENSTACK_EXTERNAL_NETWORK}
322+
region: ${OPENSTACK_REGION}
323+
pullSecret: |
324+
${PULL_SECRET}
325+
sshKey: |
326+
${SSH_PUB_KEY}
327+
EOF
328+
else
329+
echo "Unsupported cluster type '${CLUSTER_NAME}'"
330+
exit 1
331+
fi
332+
271333
/bin/openshift-install --dir=/tmp/artifacts/installer --log-level=debug create cluster &
272334
wait "$!"
273335

‎ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml

Lines changed: 66 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -251,34 +251,80 @@ objects:
251251
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/config-success; else touch /tmp/exit; fi; exit "${rc}"' EXIT
252252
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN}; fi' TERM
253253
254-
if [[ ${TYPE} == 'gcp' ]]; then
255-
export OPENSHIFT_INSTALL_PLATFORM=libvirt
256-
export OPENSHIFT_INSTALL_BASE_DOMAIN=origin-ci-int-gce.dev.rhcloud.com
257-
export OPENSHIFT_INSTALL_LIBVIRT_URI="qemu+tcp://192.168.122.1/system"
258-
export OPENSHIFT_INSTALL_LIBVIRT_IMAGE="file:///unused"
259-
fi
260-
if [[ ${TYPE} == 'aws' ]]; then
261-
export OPENSHIFT_INSTALL_PLATFORM="aws"
262-
export OPENSHIFT_INSTALL_BASE_DOMAIN="test.ose"
263-
export AWS_SHARED_CREDENTIALS_FILE="/etc/openshift-installer/.awscred"
264-
export OPENSHIFT_INSTALL_AWS_REGION="us-east-1"
265-
fi
266254
mkdir /tmp/artifacts/installer &&
267255
/bin/openshift-install version >/tmp/artifacts/installer/version
268256
269-
export _CI_ONLY_STAY_AWAY_OPENSHIFT_INSTALL_AWS_USER_TAGS="{\"expirationDate\": \"$(date -d '4 hours' --iso=minutes --utc)\"}"
270-
/bin/openshift-install --dir=/tmp/artifacts/installer --log-level=debug create install-config
257+
export CLUSTER_ID=$(uuidgen --random)
271258
272-
# Update install configs to set desired number of masters and workers
273-
sed -i "/master/{n;s/1/${MASTERS}/}" /tmp/artifacts/installer/.openshift_install_state.json
274-
sed -i "/worker/{n;s/1/${WORKERS}/}" /tmp/artifacts/installer/.openshift_install_state.json
275-
sed -i "/master/{n;n;s/1/${MASTERS}/}" /tmp/artifacts/installer/install-config.yml
276-
sed -i "/worker/{n;n;s/1/${WORKERS}/}" /tmp/artifacts/installer/install-config.yml
259+
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
260+
cat > /tmp/artifacts/installer/install-config.yml << EOF
261+
baseDomain: origin-ci-int-gce.dev.rhcloud.com
262+
clusterID: ${CLUSTER_ID}
263+
machines:
264+
- name: master
265+
replicas: ${MASTERS}
266+
- name: worker
267+
replicas: ${WORKERS}
268+
metadata:
269+
name: ${CLUSTER_NAME}
270+
networking:
271+
clusterNetworks:
272+
- cidr: 10.128.0.0/14
273+
hostSubnetLength: 9
274+
serviceCIDR: 172.30.0.0/16
275+
type: OpenshiftSDN
276+
platform:
277+
libvirt:
278+
URI: qemu+tcp://192.168.122.1/system
279+
defaultMachinePlatform:
280+
image: file:///unused
281+
masterIPs: null
282+
network:
283+
if: tt0
284+
ipRange: 192.168.126.0/24
285+
pullSecret: |
286+
${PULL_SECRET}
287+
sshKey: |
288+
${SSH_PUB_KEY}
289+
EOF
290+
elif [[ "${CLUSTER_TYPE}" == "aws" ]]; then
291+
export AWS_SHARED_CREDENTIALS_FILE="/etc/openshift-installer/.awscred"
292+
export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc)
293+
cat > /tmp/artifacts/installer/install-config.yml << EOF
294+
baseDomain: test.ose
295+
clusterID: ${CLUSTER_ID}
296+
machines:
297+
- name: master
298+
replicas: ${MASTERS}
299+
- name: worker
300+
replicas: ${WORKERS}
301+
metadata:
302+
name: ${CLUSTER_NAME}
303+
networking:
304+
clusterNetworks:
305+
- cidr: 10.128.0.0/14
306+
hostSubnetLength: 9
307+
serviceCIDR: 172.30.0.0/16
308+
type: OpenshiftSDN
309+
platform:
310+
aws:
311+
region: us-east-1
312+
vpcCIDRBlock: 10.0.0.0/16
313+
userTags:
314+
expirationDate: ${EXPIRATION_DATE}
315+
pullSecret: |
316+
${PULL_SECRET}
317+
sshKey: |
318+
${SSH_PUB_KEY}
319+
EOF
320+
else
321+
echo "Unsupported cluster type '${CLUSTER_NAME}'"
322+
exit 1
323+
fi
277324
278325
/bin/openshift-install --dir=/tmp/artifacts/installer --log-level=debug create ignition-configs &
279326
wait "$!"
280327
281-
282328
# Runs an install
283329
- name: setup
284330
image: ${IMAGE_ANSIBLE}

0 commit comments

Comments
 (0)