Rename ReplicasInSet to ReplicaSelector

duda · Jun 19, 2014 · cfce408 · cfce408
1 parent ee02cb2
commit cfce408
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/api/doc/controller-schema.json b/api/doc/controller-schema.json
@@ -30,7 +30,7 @@
           "required": false,
           "description": "Number of pods desired in the set"
         },
-        "replicasInSet": {
+        "replicaSelector": {
           "type": "object",
           "required": false,
           "description": "Required labels used to identify pods in the set"

diff --git a/api/examples/controller-list.json b/api/examples/controller-list.json
@@ -4,7 +4,7 @@
             "id": "testRun",
             "desiredState": {
                 "replicas": 2,
-                "replicasInSet": {
+                "replicaSelector": {
                     "name": "testRun"
                 },
                 "podTemplate": {

diff --git a/api/examples/controller.json b/api/examples/controller.json
@@ -2,7 +2,7 @@
     "id": "nginxController",
     "desiredState": {
       "replicas": 2,
-      "replicasInSet": {"name": "nginx"},
+      "replicaSelector": {"name": "nginx"},
       "podTemplate": {
         "desiredState": {
            "manifest": {

diff --git a/api/kubernetes.html b/api/kubernetes.html
@@ -970,7 +970,7 @@ <h3>Body</h3>
             "<span class="hljs-attribute">id</span>": <span class="hljs-value"><span class="hljs-string">"testRun"</span></span>,
             "<span class="hljs-attribute">desiredState</span>": <span class="hljs-value">{
                 "<span class="hljs-attribute">replicas</span>": <span class="hljs-value"><span class="hljs-number">2</span></span>,
-                "<span class="hljs-attribute">replicasInSet</span>": <span class="hljs-value">{
+                "<span class="hljs-attribute">replicaSelector</span>": <span class="hljs-value">{
                     "<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"testRun"</span>
                 </span>}</span>,
                 "<span class="hljs-attribute">podTemplate</span>": <span class="hljs-value">{
@@ -1074,7 +1074,7 @@ <h3>Body</h3>
           "<span class="hljs-attribute">required</span>": <span class="hljs-value"><span class="hljs-literal">false</span></span>,
           "<span class="hljs-attribute">description</span>": <span class="hljs-value"><span class="hljs-string">"Number of pods desired in the set"</span>
         </span>}</span>,
-        "<span class="hljs-attribute">replicasInSet</span>": <span class="hljs-value">{
+        "<span class="hljs-attribute">replicaSelector</span>": <span class="hljs-value">{
           "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"object"</span></span>,
           "<span class="hljs-attribute">required</span>": <span class="hljs-value"><span class="hljs-literal">false</span></span>,
           "<span class="hljs-attribute">description</span>": <span class="hljs-value"><span class="hljs-string">"Required labels used to identify pods in the set"</span>
@@ -1100,7 +1100,7 @@ <h3>Body</h3>
     "<span class="hljs-attribute">id</span>": <span class="hljs-value"><span class="hljs-string">"nginxController"</span></span>,
     "<span class="hljs-attribute">desiredState</span>": <span class="hljs-value">{
       "<span class="hljs-attribute">replicas</span>": <span class="hljs-value"><span class="hljs-number">2</span></span>,
-      "<span class="hljs-attribute">replicasInSet</span>": <span class="hljs-value">{"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span></span>}</span>,
+      "<span class="hljs-attribute">replicaSelector</span>": <span class="hljs-value">{"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span></span>}</span>,
       "<span class="hljs-attribute">podTemplate</span>": <span class="hljs-value">{
         "<span class="hljs-attribute">desiredState</span>": <span class="hljs-value">{
            "<span class="hljs-attribute">manifest</span>": <span class="hljs-value">{
@@ -1231,7 +1231,7 @@ <h3>Body</h3>
     "<span class="hljs-attribute">id</span>": <span class="hljs-value"><span class="hljs-string">"nginxController"</span></span>,
     "<span class="hljs-attribute">desiredState</span>": <span class="hljs-value">{
       "<span class="hljs-attribute">replicas</span>": <span class="hljs-value"><span class="hljs-number">2</span></span>,
-      "<span class="hljs-attribute">replicasInSet</span>": <span class="hljs-value">{"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span></span>}</span>,
+      "<span class="hljs-attribute">replicaSelector</span>": <span class="hljs-value">{"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span></span>}</span>,
       "<span class="hljs-attribute">podTemplate</span>": <span class="hljs-value">{
         "<span class="hljs-attribute">desiredState</span>": <span class="hljs-value">{
            "<span class="hljs-attribute">manifest</span>": <span class="hljs-value">{
@@ -1333,7 +1333,7 @@ <h3>Body</h3>
           "<span class="hljs-attribute">required</span>": <span class="hljs-value"><span class="hljs-literal">false</span></span>,
           "<span class="hljs-attribute">description</span>": <span class="hljs-value"><span class="hljs-string">"Number of pods desired in the set"</span>
         </span>}</span>,
-        "<span class="hljs-attribute">replicasInSet</span>": <span class="hljs-value">{
+        "<span class="hljs-attribute">replicaSelector</span>": <span class="hljs-value">{
           "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"object"</span></span>,
           "<span class="hljs-attribute">required</span>": <span class="hljs-value"><span class="hljs-literal">false</span></span>,
           "<span class="hljs-attribute">description</span>": <span class="hljs-value"><span class="hljs-string">"Required labels used to identify pods in the set"</span>
@@ -1359,7 +1359,7 @@ <h3>Body</h3>
     "<span class="hljs-attribute">id</span>": <span class="hljs-value"><span class="hljs-string">"nginxController"</span></span>,
     "<span class="hljs-attribute">desiredState</span>": <span class="hljs-value">{
       "<span class="hljs-attribute">replicas</span>": <span class="hljs-value"><span class="hljs-number">2</span></span>,
-      "<span class="hljs-attribute">replicasInSet</span>": <span class="hljs-value">{"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span></span>}</span>,
+      "<span class="hljs-attribute">replicaSelector</span>": <span class="hljs-value">{"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span></span>}</span>,
       "<span class="hljs-attribute">podTemplate</span>": <span class="hljs-value">{
         "<span class="hljs-attribute">desiredState</span>": <span class="hljs-value">{
            "<span class="hljs-attribute">manifest</span>": <span class="hljs-value">{

diff --git a/examples/guestbook/frontend-controller.json b/examples/guestbook/frontend-controller.json
@@ -2,7 +2,7 @@
     "id": "frontendController",
     "desiredState": {
       "replicas": 1,
-      "replicasInSet": {"name": "frontend"},
+      "replicaSelector": {"name": "frontend"},
       "podTemplate": {
         "desiredState": {
            "manifest": {

diff --git a/examples/guestbook/guestbook.md b/examples/guestbook/guestbook.md
@@ -108,7 +108,7 @@ Create a file named `redis-slave-controller.json` that contains:
     "id": "redisSlaveController",
     "desiredState": {
       "replicas": 2,
-      "replicasInSet": {"name": "redis-slave"},
+      "replicaSelector": {"name": "redis-slave"},
       "podTemplate": {
         "desiredState": {
            "manifest": {
@@ -191,7 +191,7 @@ Create a file named `frontend-controller.json`:
   "id": "frontendController",
   "desiredState": {
     "replicas": 3,
-    "replicasInSet": {"name": "frontend"},
+    "replicaSelector": {"name": "frontend"},
     "podTemplate": {
       "desiredState": {
          "manifest": {

diff --git a/examples/guestbook/redis-slave-controller.json b/examples/guestbook/redis-slave-controller.json
@@ -2,7 +2,7 @@
     "id": "redisSlaveController",
     "desiredState": {
       "replicas": 2,
-      "replicasInSet": {"name": "redisslave"},
+      "replicaSelector": {"name": "redisslave"},
       "podTemplate": {
         "desiredState": {
            "manifest": {

diff --git a/pkg/api/types.go b/pkg/api/types.go
@@ -108,9 +108,9 @@ type Pod struct {
 
 // ReplicationControllerState is the state of a replication controller, either input (create, update) or as output (list, get)
 type ReplicationControllerState struct {
-	Replicas      int               `json:"replicas" yaml:"replicas"`
-	ReplicasInSet map[string]string `json:"replicasInSet,omitempty" yaml:"replicasInSet,omitempty"`
-	PodTemplate   PodTemplate       `json:"podTemplate,omitempty" yaml:"podTemplate,omitempty"`
+	Replicas        int               `json:"replicas" yaml:"replicas"`
+	ReplicaSelector map[string]string `json:"replicaSelector,omitempty" yaml:"replicaSelector,omitempty"`
+	PodTemplate     PodTemplate       `json:"podTemplate,omitempty" yaml:"podTemplate,omitempty"`
 }
 
 type ReplicationControllerList struct {

diff --git a/pkg/cloudcfg/cloudcfg.go b/pkg/cloudcfg/cloudcfg.go
@@ -74,7 +74,7 @@ func Update(name string, client client.ClientInterface, updatePeriod time.Durati
 	if err != nil {
 		return err
 	}
-	labels := controller.DesiredState.ReplicasInSet
+	labels := controller.DesiredState.ReplicaSelector
 
 	podList, err := client.ListPods(labels)
 	if err != nil {
@@ -200,7 +200,7 @@ func RunController(image, name string, replicas int, client client.ClientInterfa
 		},
 		DesiredState: api.ReplicationControllerState{
 			Replicas: replicas,
-			ReplicasInSet: map[string]string{
+			ReplicaSelector: map[string]string{
 				"name": name,
 			},
 			PodTemplate: api.PodTemplate{

diff --git a/pkg/cloudcfg/resource_printer.go b/pkg/cloudcfg/resource_printer.go
@@ -107,7 +107,7 @@ func (h *HumanReadablePrinter) printPodList(podList api.PodList, w io.Writer) er
 
 func (h *HumanReadablePrinter) printReplicationController(ctrl api.ReplicationController, w io.Writer) error {
 	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%d\n",
-		ctrl.ID, h.makeImageList(ctrl.DesiredState.PodTemplate.DesiredState.Manifest), labels.Set(ctrl.DesiredState.ReplicasInSet), ctrl.DesiredState.Replicas)
+		ctrl.ID, h.makeImageList(ctrl.DesiredState.PodTemplate.DesiredState.Manifest), labels.Set(ctrl.DesiredState.ReplicaSelector), ctrl.DesiredState.Replicas)
 	return err
 }
 

diff --git a/pkg/controller/replication_controller.go b/pkg/controller/replication_controller.go
@@ -177,7 +177,7 @@ func (rm *ReplicationManager) filterActivePods(pods []api.Pod) []api.Pod {
 }
 
 func (rm *ReplicationManager) syncReplicationController(controllerSpec api.ReplicationController) error {
-	podList, err := rm.kubeClient.ListPods(controllerSpec.DesiredState.ReplicasInSet)
+	podList, err := rm.kubeClient.ListPods(controllerSpec.DesiredState.ReplicaSelector)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/registry/controller_registry_test.go b/pkg/registry/controller_registry_test.go
@@ -139,7 +139,7 @@ func TestControllerParsing(t *testing.T) {
 		},
 		DesiredState: api.ReplicationControllerState{
 			Replicas: 2,
-			ReplicasInSet: map[string]string{
+			ReplicaSelector: map[string]string{
 				"name": "nginx",
 			},
 			PodTemplate: api.PodTemplate{