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 openshift/installer#1157
openshift · Feb 15, 2019 · e1d729c · e1d729c
1 parent 77604e3
commit e1d729c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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: