From c84e9dfc9751cebc4bd2adec870267de3dcf0907 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Mon, 10 Dec 2018 14:56:14 -0800 Subject: [PATCH 1/2] Remove email and password environment variables These variables were removed from the installer recently (in favor of dynamically generated console credentials) and have no effect. --- .../openshift/installer/cluster-launch-installer-e2e.yaml | 4 ---- .../openshift/installer/cluster-launch-installer-src.yaml | 4 ---- .../openshift/openshift-ansible/cluster-launch-e2e-40.yaml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml index 2f7af0a2121c1..992be345dfe32 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -258,10 +258,6 @@ objects: value: ${NAMESPACE}-${JOB_NAME_HASH} - name: OPENSHIFT_INSTALL_BASE_DOMAIN value: origin-ci-int-aws.dev.rhcloud.com - - name: OPENSHIFT_INSTALL_EMAIL_ADDRESS - value: test@ci.openshift.io - - name: OPENSHIFT_INSTALL_PASSWORD - value: verysecure - name: OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH value: /etc/openshift-installer/ssh-publickey - name: OPENSHIFT_INSTALL_PULL_SECRET_PATH diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml index b9bd79d3d8fbd..245ddda7d0002 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml @@ -230,10 +230,6 @@ objects: value: ${NAMESPACE}-${JOB_NAME_HASH} - name: OPENSHIFT_INSTALL_BASE_DOMAIN value: origin-ci-int-aws.dev.rhcloud.com - - name: OPENSHIFT_INSTALL_EMAIL_ADDRESS - value: test@ci.openshift.io - - name: OPENSHIFT_INSTALL_PASSWORD - value: verysecure - name: OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH value: /etc/openshift-installer/ssh-publickey - name: OPENSHIFT_INSTALL_PULL_SECRET_PATH diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml index 936815bc920b0..75f6d95017088 100644 --- a/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml +++ b/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml @@ -233,10 +233,6 @@ objects: value: ${CLUSTER_TYPE} - name: OPENSHIFT_INSTALL_CLUSTER_NAME value: ${NAMESPACE}-${JOB_NAME_HASH} - - name: OPENSHIFT_INSTALL_EMAIL_ADDRESS - value: test@ci.openshift.io - - name: OPENSHIFT_INSTALL_PASSWORD - value: verysecure - name: OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH value: /etc/openshift-installer/ssh-publickey - name: OPENSHIFT_INSTALL_PULL_SECRET_PATH From 4134347160907c46169317d46c1df70643e2ce53 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Mon, 10 Dec 2018 16:53:42 -0800 Subject: [PATCH 2/2] 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. --- .../cluster-launch-installer-e2e.yaml | 90 ++++++++++++++++--- .../cluster-launch-installer-src.yaml | 90 ++++++++++++++++--- .../cluster-launch-e2e-40.yaml | 86 +++++++++++++----- 3 files changed, 218 insertions(+), 48 deletions(-) diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml index 992be345dfe32..2e558b785eaed 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -254,27 +254,23 @@ objects: value: ${CLUSTER_TYPE} - name: AWS_SHARED_CREDENTIALS_FILE value: /etc/openshift-installer/.awscred - - name: OPENSHIFT_INSTALL_CLUSTER_NAME + - name: AWS_REGION + value: us-east-1 + - name: CLUSTER_NAME value: ${NAMESPACE}-${JOB_NAME_HASH} - - name: OPENSHIFT_INSTALL_BASE_DOMAIN + - name: BASE_DOMAIN value: origin-ci-int-aws.dev.rhcloud.com - - name: OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH + - name: SSH_PUB_KEY_PATH value: /etc/openshift-installer/ssh-publickey - - name: OPENSHIFT_INSTALL_PULL_SECRET_PATH + - name: PULL_SECRET_PATH value: /etc/openshift-installer/pull-secret - - name: OPENSHIFT_INSTALL_PLATFORM - value: ${CLUSTER_TYPE} - - name: OPENSHIFT_INSTALL_AWS_REGION - value: us-east-1 - name: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE value: ${RELEASE_IMAGE_LATEST} - - name: OPENSHIFT_INSTALL_OPENSTACK_IMAGE + - name: OPENSTACK_IMAGE value: rhcos - - name: OPENSHIFT_INSTALL_OPENSTACK_CLOUD - value: openstack-cloud - - name: OPENSHIFT_INSTALL_OPENSTACK_REGION + - name: OPENSTACK_REGION value: RegionOne - - name: OPENSHIFT_INSTALL_OPENSTACK_EXTERNAL_NETWORK + - name: OPENSTACK_EXTERNAL_NETWORK value: public - name: OS_CLOUD value: openstack-cloud @@ -295,7 +291,73 @@ objects: mkdir /tmp/artifacts/installer && /bin/openshift-install version >/tmp/artifacts/installer/version - export _CI_ONLY_STAY_AWAY_OPENSHIFT_INSTALL_AWS_USER_TAGS="{\"expirationDate\": \"$(date -d '4 hours' --iso=minutes --utc)\"}" + export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) + export CLUSTER_ID=$(uuidgen --random) + export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") + export PULL_SECRET=$(cat "${PULL_SECRET_PATH}") + + if [[ "${CLUSTER_TYPE}" == "aws" ]]; then + cat > /tmp/artifacts/installer/install-config.yml << EOF + baseDomain: ${BASE_DOMAIN} + clusterID: ${CLUSTER_ID} + machines: + - name: master + replicas: 3 + - name: worker + replicas: 3 + 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: ${AWS_REGION} + vpcCIDRBlock: 10.0.0.0/16 + userTags: + expirationDate: ${EXPIRATION_DATE} + pullSecret: | + ${PULL_SECRET} + sshKey: | + ${SSH_PUB_KEY} + EOF + elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then + cat > /tmp/artifacts/installer/install-config.yml << EOF + baseDomain: ${BASE_DOMAIN} + clusterID: ${CLUSTER_ID} + machines: + - name: master + replicas: 3 + - name: worker + replicas: 3 + metadata: + name: ${CLUSTER_NAME} + networking: + clusterNetworks: + - cidr: 10.128.0.0/14 + hostSubnetLength: 9 + serviceCIDR: 172.30.0.0/16 + type: OpenshiftSDN + platform: + openstack: + NetworkCIDRBlock: 10.0.0.0/16 + baseImage: ${OPENSTACK_IMAGE} + cloud: ${OS_CLOUD} + externalNetwork: ${OPENSTACK_EXTERNAL_NETWORK} + region: ${OPENSTACK_REGION} + 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 cluster & wait "$!" diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml index 245ddda7d0002..6b6b6d063348e 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml @@ -226,27 +226,23 @@ objects: value: ${CLUSTER_TYPE} - name: AWS_SHARED_CREDENTIALS_FILE value: /etc/openshift-installer/.awscred - - name: OPENSHIFT_INSTALL_CLUSTER_NAME + - name: AWS_REGION + value: us-east-1 + - name: CLUSTER_NAME value: ${NAMESPACE}-${JOB_NAME_HASH} - - name: OPENSHIFT_INSTALL_BASE_DOMAIN + - name: BASE_DOMAIN value: origin-ci-int-aws.dev.rhcloud.com - - name: OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH + - name: SSH_PUB_KEY_PATH value: /etc/openshift-installer/ssh-publickey - - name: OPENSHIFT_INSTALL_PULL_SECRET_PATH + - name: PULL_SECRET_PATH value: /etc/openshift-installer/pull-secret - - name: OPENSHIFT_INSTALL_PLATFORM - value: ${CLUSTER_TYPE} - - name: OPENSHIFT_INSTALL_AWS_REGION - value: us-east-1 - name: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE value: ${RELEASE_IMAGE_LATEST} - - name: OPENSHIFT_INSTALL_OPENSTACK_IMAGE + - name: OPENSTACK_IMAGE value: rhcos - - name: OPENSHIFT_INSTALL_OPENSTACK_CLOUD - value: openstack-cloud - - name: OPENSHIFT_INSTALL_OPENSTACK_REGION + - name: OPENSTACK_REGION value: RegionOne - - name: OPENSHIFT_INSTALL_OPENSTACK_EXTERNAL_NETWORK + - name: OPENSTACK_EXTERNAL_NETWORK value: public - name: OS_CLOUD value: openstack-cloud @@ -267,7 +263,73 @@ objects: mkdir /tmp/artifacts/installer && /bin/openshift-install version >/tmp/artifacts/installer/version - export _CI_ONLY_STAY_AWAY_OPENSHIFT_INSTALL_AWS_USER_TAGS="{\"expirationDate\": \"$(date -d '4 hours' --iso=minutes --utc)\"}" + export EXPIRATION_DATE=$(date -d '4 hours' --iso=minutes --utc) + export CLUSTER_ID=$(uuidgen --random) + export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}") + export PULL_SECRET=$(cat "${PULL_SECRET_PATH}") + + if [[ "${CLUSTER_TYPE}" == "aws" ]]; then + cat > /tmp/artifacts/installer/install-config.yml << EOF + baseDomain: ${BASE_DOMAIN} + clusterID: ${CLUSTER_ID} + machines: + - name: master + replicas: 3 + - name: worker + replicas: 3 + 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: ${AWS_REGION} + vpcCIDRBlock: 10.0.0.0/16 + userTags: + expirationDate: ${EXPIRATION_DATE} + pullSecret: | + ${PULL_SECRET} + sshKey: | + ${SSH_PUB_KEY} + EOF + elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then + cat > /tmp/artifacts/installer/install-config.yml << EOF + baseDomain: ${BASE_DOMAIN} + clusterID: ${CLUSTER_ID} + machines: + - name: master + replicas: 3 + - name: worker + replicas: 3 + metadata: + name: ${CLUSTER_NAME} + networking: + clusterNetworks: + - cidr: 10.128.0.0/14 + hostSubnetLength: 9 + serviceCIDR: 172.30.0.0/16 + type: OpenshiftSDN + platform: + openstack: + NetworkCIDRBlock: 10.0.0.0/16 + baseImage: ${OPENSTACK_IMAGE} + cloud: ${OS_CLOUD} + externalNetwork: ${OPENSTACK_EXTERNAL_NETWORK} + region: ${OPENSTACK_REGION} + 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 cluster & wait "$!" diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml index 75f6d95017088..44e55872340eb 100644 --- a/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml +++ b/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml @@ -251,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 - if [[ ${TYPE} == 'gcp' ]]; then - export OPENSHIFT_INSTALL_PLATFORM=libvirt - export OPENSHIFT_INSTALL_BASE_DOMAIN=origin-ci-int-gce.dev.rhcloud.com - export OPENSHIFT_INSTALL_LIBVIRT_URI="qemu+tcp://192.168.122.1/system" - export OPENSHIFT_INSTALL_LIBVIRT_IMAGE="file:///unused" - fi - if [[ ${TYPE} == 'aws' ]]; then - export OPENSHIFT_INSTALL_PLATFORM="aws" - export OPENSHIFT_INSTALL_BASE_DOMAIN="test.ose" - export AWS_SHARED_CREDENTIALS_FILE="/etc/openshift-installer/.awscred" - export OPENSHIFT_INSTALL_AWS_REGION="us-east-1" - fi mkdir /tmp/artifacts/installer && /bin/openshift-install version >/tmp/artifacts/installer/version - export _CI_ONLY_STAY_AWAY_OPENSHIFT_INSTALL_AWS_USER_TAGS="{\"expirationDate\": \"$(date -d '4 hours' --iso=minutes --utc)\"}" - /bin/openshift-install --dir=/tmp/artifacts/installer --log-level=debug create install-config + export CLUSTER_ID=$(uuidgen --random) - # Update install configs to set desired number of masters and workers - sed -i "/master/{n;s/1/${MASTERS}/}" /tmp/artifacts/installer/.openshift_install_state.json - sed -i "/worker/{n;s/1/${WORKERS}/}" /tmp/artifacts/installer/.openshift_install_state.json - sed -i "/master/{n;n;s/1/${MASTERS}/}" /tmp/artifacts/installer/install-config.yml - sed -i "/worker/{n;n;s/1/${WORKERS}/}" /tmp/artifacts/installer/install-config.yml + 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} + 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 & wait "$!" - # Runs an install - name: setup image: ${IMAGE_ANSIBLE}