From 06713f1c66924030dc696c81c387326afaae2ed4 Mon Sep 17 00:00:00 2001
From: Vikas Choudhary <vichoudh@redhat.com>
Date: Fri, 21 Sep 2018 14:03:18 +0530
Subject: [PATCH] Update yaml files

---
 examples/app-version-mao.yaml                  | 16 ----------------
 examples/cluster-test.yaml                     | 18 +++++++++---------
 examples/machine-set-test.yaml                 |  1 -
 ...machine-set.yaml => worker.machineset.yaml} |  0
 ...machine-set.yaml => worker.machineset.yaml} |  2 +-
 manifests/clusterapi-apiserver.yaml            |  2 +-
 manifests/clusterapi-controller.yaml           |  2 +-
 7 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 examples/app-version-mao.yaml
 rename machines/aws/{machine-set.yaml => worker.machineset.yaml} (100%)
 rename machines/libvirt/{machine-set.yaml => worker.machineset.yaml} (98%)

diff --git a/examples/app-version-mao.yaml b/examples/app-version-mao.yaml
deleted file mode 100644
index 43fdbceb5c..0000000000
--- a/examples/app-version-mao.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-apiVersion: tco.coreos.com/v1
-kind: AppVersion
-metadata:
-  name: machine-api
-  namespace: tectonic-system
-  labels:
-    managed-by-channel-operator: "true"
-spec:
-  desiredVersion:
-  paused: false
-status:
-  currentVersion:
-  paused: false
-upgradereq:  1
-upgradecomp: 0
diff --git a/examples/cluster-test.yaml b/examples/cluster-test.yaml
index 832c360481..287d1f0803 100644
--- a/examples/cluster-test.yaml
+++ b/examples/cluster-test.yaml
@@ -35,12 +35,12 @@ spec:
         aws:
           instanceType: m4.large
       machineSets:
-      - nodeType: Master
-        size: 1
-      - shortName: infra
-        nodeType: Compute
-        infra: true
-        size: 1
-      - shortName: compute
-        nodeType: Compute
-        size: 1
+        - nodeType: Master
+          size: 1
+        - shortName: infra
+          nodeType: Compute
+          infra: true
+          size: 1
+        - shortName: compute
+          nodeType: Compute
+          size: 1
diff --git a/examples/machine-set-test.yaml b/examples/machine-set-test.yaml
index fd6675147a..5425627c85 100644
--- a/examples/machine-set-test.yaml
+++ b/examples/machine-set-test.yaml
@@ -38,4 +38,3 @@ spec:
         controlPlane: 0.0.0
       roles:
       - Master
-
diff --git a/machines/aws/machine-set.yaml b/machines/aws/worker.machineset.yaml
similarity index 100%
rename from machines/aws/machine-set.yaml
rename to machines/aws/worker.machineset.yaml
diff --git a/machines/libvirt/machine-set.yaml b/machines/libvirt/worker.machineset.yaml
similarity index 98%
rename from machines/libvirt/machine-set.yaml
rename to machines/libvirt/worker.machineset.yaml
index 6a5e9cf984..5b5ef3e5b7 100644
--- a/machines/libvirt/machine-set.yaml
+++ b/machines/libvirt/worker.machineset.yaml
@@ -40,4 +40,4 @@ spec:
           uri: {{.Libvirt.URI}}
       versions:
         kubelet: ""
-        controlPlane: ""
+        controlPlane: ""
\ No newline at end of file
diff --git a/manifests/clusterapi-apiserver.yaml b/manifests/clusterapi-apiserver.yaml
index f5729b82cb..49ef40a860 100644
--- a/manifests/clusterapi-apiserver.yaml
+++ b/manifests/clusterapi-apiserver.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: clusterapi-apiserver
diff --git a/manifests/clusterapi-controller.yaml b/manifests/clusterapi-controller.yaml
index 5f6b758a67..164357e1a7 100644
--- a/manifests/clusterapi-controller.yaml
+++ b/manifests/clusterapi-controller.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: clusterapi-controllers