From e1d729c604eea671d5c6cc12c13dae9a34f98eef Mon Sep 17 00:00:00 2001 From: staebler Date: Tue, 5 Feb 2019 13:04:17 -0500 Subject: [PATCH] Modify install-config.yaml to use controlPlane and compute instead of machines. In the cases where the replica count is not customizable, the controlPlane and compute have been removed to use the defaults for the machine pools. Update the apiVersion for install-config.yaml to v1beta3, which is the version that incorporates the controlPlane and compute fields. See https://github.com/openshift/installer/pull/1157 --- .../cluster-launch-installer-e2e.yaml | 14 ++------------ .../cluster-launch-installer-src.yaml | 14 ++------------ .../cluster-launch-e2e-40.yaml | 18 +++++++++--------- .../cluster-scaleup-e2e-40.yaml | 14 ++------------ 4 files changed, 15 insertions(+), 45 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 e5eb814fba6a..eff3158af029 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -251,14 +251,9 @@ objects: if [[ "${CLUSTER_TYPE}" == "aws" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF - apiVersion: v1beta2 + apiVersion: v1beta3 baseDomain: ${BASE_DOMAIN} clusterID: ${CLUSTER_ID} - machines: - - name: master - replicas: 3 - - name: worker - replicas: 3 metadata: name: ${CLUSTER_NAME} networking: @@ -280,14 +275,9 @@ objects: EOF elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF - apiVersion: v1beta2 + apiVersion: v1beta3 baseDomain: ${BASE_DOMAIN} clusterID: ${CLUSTER_ID} - machines: - - name: master - replicas: 3 - - name: worker - replicas: 3 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 64acd914e027..d03385285578 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml @@ -221,14 +221,9 @@ objects: if [[ "${CLUSTER_TYPE}" == "aws" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF - apiVersion: v1beta2 + apiVersion: v1beta3 baseDomain: ${BASE_DOMAIN} clusterID: ${CLUSTER_ID} - machines: - - name: master - replicas: 3 - - name: worker - replicas: 3 metadata: name: ${CLUSTER_NAME} networking: @@ -250,14 +245,9 @@ objects: EOF elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF - apiVersion: v1beta2 + apiVersion: v1beta3 baseDomain: ${BASE_DOMAIN} clusterID: ${CLUSTER_ID} - machines: - - name: master - replicas: 3 - - name: worker - replicas: 3 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 004e4dae40dc..ef1bef5eea08 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 @@ -226,14 +226,14 @@ objects: if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF - apiVersion: v1beta2 + apiVersion: v1beta3 baseDomain: origin-ci-int-gce.dev.rhcloud.com clusterID: ${CLUSTER_ID} - machines: - - name: master - replicas: ${MASTERS} + compute: - name: worker replicas: ${WORKERS} + controlPlane: + - replicas: ${MASTERS} metadata: name: ${OPENSHIFT_INSTALL_CLUSTER_NAME} networking: @@ -254,14 +254,14 @@ objects: 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.yaml << EOF - apiVersion: v1beta2 + apiVersion: v1beta3 baseDomain: test.ose clusterID: ${CLUSTER_ID} - machines: - - name: master - replicas: ${MASTERS} - - name: worker + compute: + - name: worker replicas: ${WORKERS} + controlPlane: + - replicas: ${MASTERS} metadata: name: ${CLUSTER_NAME} networking: 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 7f7a83044a96..537317c9c623 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 @@ -314,14 +314,9 @@ objects: if [[ "${CLUSTER_TYPE}" == "aws" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF - apiVersion: v1beta2 + apiVersion: v1beta3 baseDomain: ${BASE_DOMAIN} clusterID: ${CLUSTER_ID} - machines: - - name: master - replicas: 3 - - name: worker - replicas: 3 metadata: name: ${CLUSTER_NAME} networking: @@ -343,14 +338,9 @@ objects: EOF elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then cat > /tmp/artifacts/installer/install-config.yaml << EOF - apiVersion: v1beta2 + apiVersion: v1beta3 baseDomain: ${BASE_DOMAIN} clusterID: ${CLUSTER_ID} - machines: - - name: master - replicas: 3 - - name: worker - replicas: 3 metadata: name: ${CLUSTER_NAME} networking: