Use install-configs when invoking installer #2353
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -233,10 +233,6 @@ objects: | |
| value: ${CLUSTER_TYPE} | ||
| - name: OPENSHIFT_INSTALL_CLUSTER_NAME | ||
| value: ${NAMESPACE}-${JOB_NAME_HASH} | ||
| - name: OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH | ||
| value: /etc/openshift-installer/ssh-publickey | ||
| - name: OPENSHIFT_INSTALL_PULL_SECRET_PATH | ||
|
|
@@ -255,34 +251,80 @@ objects: | |
| trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/config-success; else touch /tmp/exit; fi; exit "${rc}"' EXIT | ||
| trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN}; fi' TERM | ||
|
|
||
| mkdir /tmp/artifacts/installer && | ||
| /bin/openshift-install version >/tmp/artifacts/installer/version | ||
|
|
||
| export CLUSTER_ID=$(uuidgen --random) | ||
|
Contributor
There was a problem hiding this comment. Why not use
Contributor
Author
There was a problem hiding this comment. The cluster ID has to be a version 4 UUID. If
Contributor
There was a problem hiding this comment. Ah, right, it doesn't. Seems this value would be logged in the container logs, so resource can be tracked down to the CI job |
||
|
|
||
| if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then | ||
| cat > /tmp/artifacts/installer/install-config.yml << EOF | ||
| baseDomain: origin-ci-int-gce.dev.rhcloud.com | ||
| clusterID: ${CLUSTER_ID} | ||
| machines: | ||
| - name: master | ||
| replicas: ${MASTERS} | ||
| - name: worker | ||
| replicas: ${WORKERS} | ||
| metadata: | ||
| name: ${CLUSTER_NAME} | ||
| networking: | ||
| clusterNetworks: | ||
| - cidr: 10.128.0.0/14 | ||
| hostSubnetLength: 9 | ||
| serviceCIDR: 172.30.0.0/16 | ||
| type: OpenshiftSDN | ||
| platform: | ||
| libvirt: | ||
| URI: qemu+tcp://192.168.122.1/system | ||
| defaultMachinePlatform: | ||
| image: file:///unused | ||
| masterIPs: null | ||
| network: | ||
| if: tt0 | ||
| ipRange: 192.168.126.0/24 | ||
| pullSecret: | | ||
| ${PULL_SECRET} | ||
| sshKey: | | ||
| ${SSH_PUB_KEY} | ||
|
Contributor
There was a problem hiding this comment. This should be left blank for BYOR - public key is being injected via playbook |
||
| EOF | ||
| elif [[ "${CLUSTER_TYPE}" == "aws" ]]; then | ||
| export AWS_SHARED_CREDENTIALS_FILE="/etc/openshift-installer/.awscred" | ||
| export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) | ||
| cat > /tmp/artifacts/installer/install-config.yml << EOF | ||
| baseDomain: test.ose | ||
| clusterID: ${CLUSTER_ID} | ||
| machines: | ||
| - name: master | ||
| replicas: ${MASTERS} | ||
| - name: worker | ||
| replicas: ${WORKERS} | ||
| metadata: | ||
| name: ${CLUSTER_NAME} | ||
| networking: | ||
| clusterNetworks: | ||
| - cidr: 10.128.0.0/14 | ||
| hostSubnetLength: 9 | ||
| serviceCIDR: 172.30.0.0/16 | ||
| type: OpenshiftSDN | ||
| platform: | ||
| aws: | ||
| region: us-east-1 | ||
| vpcCIDRBlock: 10.0.0.0/16 | ||
| userTags: | ||
| expirationDate: ${EXPIRATION_DATE} | ||
| pullSecret: | | ||
| ${PULL_SECRET} | ||
| sshKey: | | ||
| ${SSH_PUB_KEY} | ||
| EOF | ||
| else | ||
| echo "Unsupported cluster type '${CLUSTER_NAME}'" | ||
| exit 1 | ||
| fi | ||
|
|
||
| /bin/openshift-install --dir=/tmp/artifacts/installer --log-level=debug create ignition-configs & | ||
|
Contributor
There was a problem hiding this comment.
Contributor
Author
There was a problem hiding this comment. That is core to the design of the installer (so no, not a bug). Why is the install config needed after the Ignition Configs are generated?
Contributor
There was a problem hiding this comment. I'd keep the backup to ensure that the all the vars got templated correctly, this is not required though
Contributor
Author
There was a problem hiding this comment. The installer's state file (
Contributor
There was a problem hiding this comment. CI stores this file, but it doesn't seem to contain any config - https://storage.googleapis.com/origin-ci-test/pr-logs/pull/openshift_installer/861/pull-ci-openshift-installer-master-e2e-aws/2219/artifacts/e2e-aws/installer/.openshift_install_state.json - a bug in PR 861? nevermind, it does - |
||
| wait "$!" | ||
|
|
||
| # Runs an install | ||
| - name: setup | ||
| image: ${IMAGE_ANSIBLE} | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is now silently dropped, so CI would use pinned release instead of latest
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, that variable is still respected; even after my installer PR.