From 81d84683830bfe09722c8da267cd76aa04247101 Mon Sep 17 00:00:00 2001
From: Robert Bailey <robertbailey@google.com>
Date: Tue, 26 Jun 2018 14:48:11 -0700
Subject: [PATCH] Update yaml files to remove role from the machine spec.

---
 clusterctl/examples/google/machines.yaml.template    | 4 ----
 clusterctl/examples/vsphere/machines.yaml.template   | 2 --
 clusterctl/examples/vsphere/machineset.yaml.template | 2 --
 gcp-deployer/machines.yaml.template                  | 4 ----
 sample/machinedeployment.yaml                        | 5 -----
 sample/machineset.yaml                               | 2 --
 6 files changed, 19 deletions(-)

diff --git a/clusterctl/examples/google/machines.yaml.template b/clusterctl/examples/google/machines.yaml.template
index 6cd7617ce4e6..600c78375897 100644
--- a/clusterctl/examples/google/machines.yaml.template
+++ b/clusterctl/examples/google/machines.yaml.template
@@ -22,8 +22,6 @@ items:
     versions:
       kubelet: 1.9.4
       controlPlane: 1.9.4
-    roles:
-    - Master
 - apiVersion: "cluster.k8s.io/v1alpha1"
   kind: Machine
   metadata:
@@ -46,5 +44,3 @@ items:
             diskType: "pd-standard"
     versions:
       kubelet: 1.9.4
-    roles:
-    - Node
diff --git a/clusterctl/examples/vsphere/machines.yaml.template b/clusterctl/examples/vsphere/machines.yaml.template
index 3c553ea7003c..a221b621ddcb 100644
--- a/clusterctl/examples/vsphere/machines.yaml.template
+++ b/clusterctl/examples/vsphere/machines.yaml.template
@@ -25,5 +25,3 @@ items:
     versions:
       kubelet: 1.10.1
       controlPlane: 1.10.1
-    roles:
-    - Master
diff --git a/clusterctl/examples/vsphere/machineset.yaml.template b/clusterctl/examples/vsphere/machineset.yaml.template
index e7fdaa4a07dd..83a6786f40dd 100644
--- a/clusterctl/examples/vsphere/machineset.yaml.template
+++ b/clusterctl/examples/vsphere/machineset.yaml.template
@@ -30,5 +30,3 @@ spec:
             virtual_machine_domain: ""
       versions:
         kubelet: 1.10.1
-      roles:
-      - Node
\ No newline at end of file
diff --git a/gcp-deployer/machines.yaml.template b/gcp-deployer/machines.yaml.template
index 6cd7617ce4e6..600c78375897 100644
--- a/gcp-deployer/machines.yaml.template
+++ b/gcp-deployer/machines.yaml.template
@@ -22,8 +22,6 @@ items:
     versions:
       kubelet: 1.9.4
       controlPlane: 1.9.4
-    roles:
-    - Master
 - apiVersion: "cluster.k8s.io/v1alpha1"
   kind: Machine
   metadata:
@@ -46,5 +44,3 @@ items:
             diskType: "pd-standard"
     versions:
       kubelet: 1.9.4
-    roles:
-    - Node
diff --git a/sample/machinedeployment.yaml b/sample/machinedeployment.yaml
index 8f7881af733f..f69dc90ace69 100644
--- a/sample/machinedeployment.yaml
+++ b/sample/machinedeployment.yaml
@@ -24,8 +24,3 @@ spec:
           os: "ubuntu-1604-lts"
       versions:
         kubelet: 1.9.4
-        containerRuntime:
-          name: docker
-          version: 1.12.0
-      roles:
-      - Node
diff --git a/sample/machineset.yaml b/sample/machineset.yaml
index 335dc60e07cf..88b39dbf5941 100644
--- a/sample/machineset.yaml
+++ b/sample/machineset.yaml
@@ -23,5 +23,3 @@ spec:
           os: "ubuntu-1604-lts"
       versions:
         kubelet: 1.9.4
-      roles:
-      - Node