From 94db98d8547ce3d40e26b26c0addcdbd1f4c54c7 Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Fri, 9 Sep 2016 00:49:04 -0700
Subject: [PATCH] *: Rename k8s-master to k8s-controller

---
 Documentation/ignition.md                                       | 2 +-
 bootcfg/storage/storagepb/group_test.go                         | 2 +-
 examples/groups/k8s-install/node1.json                          | 2 +-
 examples/groups/k8s/node1.json                                  | 2 +-
 examples/ignition/{k8s-master.yaml => k8s-controller.yaml}      | 0
 .../{k8s-master-install.json => k8s-controller-install.json}    | 0
 examples/profiles/{k8s-master.json => k8s-controller.json}      | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename examples/ignition/{k8s-master.yaml => k8s-controller.yaml} (100%)
 rename examples/profiles/{k8s-master-install.json => k8s-controller-install.json} (100%)
 rename examples/profiles/{k8s-master.json => k8s-controller.json} (92%)

diff --git a/Documentation/ignition.md b/Documentation/ignition.md
index 5a975100..72758e2e 100644
--- a/Documentation/ignition.md
+++ b/Documentation/ignition.md
@@ -16,7 +16,7 @@ Fuze template files can be added in the `/var/lib/bootcfg/ignition` directory or
     /var/lib/bootcfg
      ├── cloud
      ├── ignition
-     │   └── k8s-master.yaml
+     │   └── k8s-controller.yaml
      │   └── etcd.yaml
      │   └── k8s-worker.yaml
      │   └── raw.ign
diff --git a/bootcfg/storage/storagepb/group_test.go b/bootcfg/storage/storagepb/group_test.go
index 2de7e85b..37b6c761 100644
--- a/bootcfg/storage/storagepb/group_test.go
+++ b/bootcfg/storage/storagepb/group_test.go
@@ -108,7 +108,7 @@ func TestGroupValidate(t *testing.T) {
 		group *Group
 		valid bool
 	}{
-		{&Group{Id: "node1", Profile: "k8s-master"}, true},
+		{&Group{Id: "node1", Profile: "k8s-controller"}, true},
 		{testGroupWithoutProfile, false},
 		{&Group{Id: "node1"}, false},
 		{&Group{}, false},
diff --git a/examples/groups/k8s-install/node1.json b/examples/groups/k8s-install/node1.json
index 23b1788b..a4263a41 100644
--- a/examples/groups/k8s-install/node1.json
+++ b/examples/groups/k8s-install/node1.json
@@ -1,7 +1,7 @@
 {
   "id": "node1",
   "name": "k8s controller",
-  "profile": "k8s-master-install",
+  "profile": "k8s-controller-install",
   "selector": {
     "os": "installed",
     "mac": "52:54:00:a1:9c:ae"
diff --git a/examples/groups/k8s/node1.json b/examples/groups/k8s/node1.json
index cfc660aa..09f3afa5 100644
--- a/examples/groups/k8s/node1.json
+++ b/examples/groups/k8s/node1.json
@@ -1,7 +1,7 @@
 {
   "id": "node1",
   "name": "k8s controller",
-  "profile": "k8s-master",
+  "profile": "k8s-controller",
   "selector": {
     "mac": "52:54:00:a1:9c:ae"
   },
diff --git a/examples/ignition/k8s-master.yaml b/examples/ignition/k8s-controller.yaml
similarity index 100%
rename from examples/ignition/k8s-master.yaml
rename to examples/ignition/k8s-controller.yaml
diff --git a/examples/profiles/k8s-master-install.json b/examples/profiles/k8s-controller-install.json
similarity index 100%
rename from examples/profiles/k8s-master-install.json
rename to examples/profiles/k8s-controller-install.json
diff --git a/examples/profiles/k8s-master.json b/examples/profiles/k8s-controller.json
similarity index 92%
rename from examples/profiles/k8s-master.json
rename to examples/profiles/k8s-controller.json
index 449acedb..1d134f46 100644
--- a/examples/profiles/k8s-master.json
+++ b/examples/profiles/k8s-controller.json
@@ -12,5 +12,5 @@
     }
   },
   "cloud_id": "",
-  "ignition_id": "k8s-master.yaml"
+  "ignition_id": "k8s-controller.yaml"
 }