From d31f601ef9e92e7843ce4771d1e87e03ab8657d5 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sat, 2 Feb 2019 08:51:18 -0800
Subject: [PATCH] ci-operator/templates/openshift: Bump install-config.yaml to
 v1beta2

To keep up with openshift/installer@3b393da
(pkg/types/aws/machinepool: Drop IAM-role overrides, 2019-01-30,
openshift/installer#1154).  The change only affected AWS, and we
didn't set the removed property anyway.
---
 .../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 ++--
 .../openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml   | 4 ++--
 4 files changed, 8 insertions(+), 8 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 8e598e398081..0a45c12ad0d2 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
@@ -251,7 +251,7 @@ objects:
 
         if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
             cat > /tmp/artifacts/installer/install-config.yaml << EOF
-        apiVersion: v1beta1
+        apiVersion: v1beta2
         baseDomain: ${BASE_DOMAIN}
         clusterID:  ${CLUSTER_ID}
         machines:
@@ -280,7 +280,7 @@ objects:
         EOF
         elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
             cat > /tmp/artifacts/installer/install-config.yaml << EOF
-        apiVersion: v1beta1
+        apiVersion: v1beta2
         baseDomain: ${BASE_DOMAIN}
         clusterID:  ${CLUSTER_ID}
         machines:
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 75aa659b20bf..5a9fce92fcf5 100644
--- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
+++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
@@ -221,7 +221,7 @@ objects:
 
         if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
             cat > /tmp/artifacts/installer/install-config.yaml << EOF
-        apiVersion: v1beta1
+        apiVersion: v1beta2
         baseDomain: ${BASE_DOMAIN}
         clusterID:  ${CLUSTER_ID}
         machines:
@@ -250,7 +250,7 @@ objects:
         EOF
         elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
             cat > /tmp/artifacts/installer/install-config.yaml << EOF
-        apiVersion: v1beta1
+        apiVersion: v1beta2
         baseDomain: ${BASE_DOMAIN}
         clusterID:  ${CLUSTER_ID}
         machines:
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 21f07085905c..388af142b6cb 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
@@ -227,7 +227,7 @@ objects:
 
         if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
           cat > /tmp/artifacts/installer/install-config.yaml << EOF
-        apiVersion: v1beta1
+        apiVersion: v1beta2
         baseDomain: origin-ci-int-gce.dev.rhcloud.com
         clusterID:  ${CLUSTER_ID}
         machines:
@@ -255,7 +255,7 @@ 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: v1beta1
+        apiVersion: v1beta2
         baseDomain: test.ose
         clusterID:  ${CLUSTER_ID}
         machines:
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 edf0344f5e79..b5fe1dc21c06 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
@@ -315,7 +315,7 @@ objects:
 
         if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
             cat > /tmp/artifacts/installer/install-config.yaml << EOF
-        apiVersion: v1beta1
+        apiVersion: v1beta2
         baseDomain: ${BASE_DOMAIN}
         clusterID:  ${CLUSTER_ID}
         machines:
@@ -344,7 +344,7 @@ objects:
         EOF
         elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
             cat > /tmp/artifacts/installer/install-config.yaml << EOF
-        apiVersion: v1beta1
+        apiVersion: v1beta2
         baseDomain: ${BASE_DOMAIN}
         clusterID:  ${CLUSTER_ID}
         machines: