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 f1b5885b6758a..c21b247c5e05e 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -226,7 +226,6 @@ objects: fi 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}") @@ -234,7 +233,6 @@ objects: cat > /tmp/artifacts/installer/install-config.yaml << EOF apiVersion: v1beta4 baseDomain: ${BASE_DOMAIN} - clusterID: ${CLUSTER_ID} metadata: name: ${CLUSTER_NAME} controlPlane: diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml index e8e765cf52356..8b4bdb83646f0 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml @@ -227,14 +227,12 @@ objects: fi 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}") cat > /tmp/artifacts/installer/install-config.yaml << EOF apiVersion: v1beta4 baseDomain: ${BASE_DOMAIN} - clusterID: ${CLUSTER_ID} metadata: name: ${CLUSTER_NAME} networking: 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 9efacd27bfd33..b499e2b60c56c 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml @@ -220,7 +220,6 @@ objects: mkdir /tmp/artifacts/installer 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}") @@ -228,7 +227,6 @@ objects: cat > /tmp/artifacts/installer/install-config.yaml << EOF apiVersion: v1beta4 baseDomain: ${BASE_DOMAIN} - clusterID: ${CLUSTER_ID} metadata: name: ${CLUSTER_NAME} controlPlane: @@ -271,7 +269,6 @@ objects: cat > /tmp/artifacts/installer/install-config.yaml << EOF apiVersion: v1beta4 baseDomain: ${BASE_DOMAIN} - clusterID: ${CLUSTER_ID} metadata: name: ${CLUSTER_NAME} networking: 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 8a79426d3df2c..c535f2f4afb06 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 @@ -219,7 +219,6 @@ objects: mkdir /tmp/artifacts/installer - export CLUSTER_ID=$(uuidgen --random) export SSH_PUB_KEY=$(cat "${OPENSHIFT_INSTALL_SSH_PUB_KEY_PATH}") export PULL_SECRET=$(cat "${OPENSHIFT_INSTALL_PULL_SECRET_PATH}") @@ -227,7 +226,6 @@ objects: cat > /tmp/artifacts/installer/install-config.yaml << EOF apiVersion: v1beta4 baseDomain: origin-ci-int-gce.dev.rhcloud.com - clusterID: ${CLUSTER_ID} compute: - name: worker replicas: ${WORKERS} @@ -256,7 +254,6 @@ objects: cat > /tmp/artifacts/installer/install-config.yaml << EOF apiVersion: v1beta4 baseDomain: test.ose - clusterID: ${CLUSTER_ID} controlPlane: name: master replicas: ${MASTERS} diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml index 6b685349f9aa1..3df4e382a346d 100644 --- a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml +++ b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml @@ -311,7 +311,6 @@ objects: mkdir /tmp/artifacts/installer 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}") @@ -319,7 +318,6 @@ objects: cat > /tmp/artifacts/installer/install-config.yaml << EOF apiVersion: v1beta4 baseDomain: ${BASE_DOMAIN} - clusterID: ${CLUSTER_ID} metadata: name: ${CLUSTER_NAME} controlPlane: @@ -362,7 +360,6 @@ objects: cat > /tmp/artifacts/installer/install-config.yaml << EOF apiVersion: v1beta4 baseDomain: ${BASE_DOMAIN} - clusterID: ${CLUSTER_ID} metadata: name: ${CLUSTER_NAME} networking: