Merge pull request #326 from GertiPoppel/userdoc

renamed replica set to replication controller

Author: bryk

src/app/backend/apihandler.go

@@ -96,31 +96,31 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient)
 			Writes(AppDeploymentFromFileSpec{}))
 	wsContainer.Add(deployFromFileWs)
 
-	replicaSetWs := new(restful.WebService)
-	replicaSetWs.Filter(wsLogger)
-	replicaSetWs.Path("/api/replicasets").
+	replicationControllerWs := new(restful.WebService)
+	replicationControllerWs.Filter(wsLogger)
+	replicationControllerWs.Path("/api/replicationcontrollers").
 		Consumes(restful.MIME_JSON).
 		Produces(restful.MIME_JSON)
-	replicaSetWs.Route(
-		replicaSetWs.GET("").
-			To(apiHandler.handleGetReplicaSetList).
-			Writes(ReplicaSetList{}))
-	replicaSetWs.Route(
-		replicaSetWs.GET("/{namespace}/{replicaSet}").
-			To(apiHandler.handleGetReplicaSetDetail).
-			Writes(ReplicaSetDetail{}))
-	replicaSetWs.Route(
-		replicaSetWs.POST("/{namespace}/{replicaSet}/update/pods").
+	replicationControllerWs.Route(
+		replicationControllerWs.GET("").
+			To(apiHandler.handleGetReplicationControllerList).
+			Writes(ReplicationControllerList{}))
+	replicationControllerWs.Route(
+		replicationControllerWs.GET("/{namespace}/{replicationController}").
+			To(apiHandler.handleGetReplicationControllerDetail).
+			Writes(ReplicationControllerDetail{}))
+	replicationControllerWs.Route(
+		replicationControllerWs.POST("/{namespace}/{replicationController}/update/pods").
 			To(apiHandler.handleUpdateReplicasCount).
-			Reads(ReplicaSetSpec{}))
-	replicaSetWs.Route(
-		replicaSetWs.DELETE("/{namespace}/{replicaSet}").
-			To(apiHandler.handleDeleteReplicaSet))
-	replicaSetWs.Route(
-		replicaSetWs.GET("/pods/{namespace}/{replicaSet}").
-			To(apiHandler.handleGetReplicaSetPods).
-			Writes(ReplicaSetPods{}))
-	wsContainer.Add(replicaSetWs)
+			Reads(ReplicationControllerSpec{}))
+	replicationControllerWs.Route(
+		replicationControllerWs.DELETE("/{namespace}/{replicationController}").
+			To(apiHandler.handleDeleteReplicationController))
+	replicationControllerWs.Route(
+		replicationControllerWs.GET("/pods/{namespace}/{replicationController}").
+			To(apiHandler.handleGetReplicationControllerPods).
+			Writes(ReplicationControllerPods{}))
+	wsContainer.Add(replicationControllerWs)
 
 	namespacesWs := new(restful.WebService)
 	namespacesWs.Filter(wsLogger)
@@ -157,7 +157,7 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient)
 	eventsWs.Path("/api/events").
 		Produces(restful.MIME_JSON)
 	eventsWs.Route(
-		eventsWs.GET("/{namespace}/{replicaSet}").
+		eventsWs.GET("/{namespace}/{replicationController}").
 			To(apiHandler.handleEvents).
 			Writes(Events{}))
 	wsContainer.Add(eventsWs)
@@ -246,11 +246,11 @@ func (apiHandler *ApiHandler) handleGetAvailableProcotols(request *restful.Reque
 	response.WriteHeaderAndEntity(http.StatusCreated, GetAvailableProtocols())
 }
 
-// Handles get Replica Set list API call.
-func (apiHandler *ApiHandler) handleGetReplicaSetList(
+// Handles get Replication Controller list API call.
+func (apiHandler *ApiHandler) handleGetReplicationControllerList(
 	request *restful.Request, response *restful.Response) {
 
-	result, err := GetReplicaSetList(apiHandler.client)
+	result, err := GetReplicationControllerList(apiHandler.client)
 	if err != nil {
 		handleInternalError(response, err)
 		return
@@ -259,13 +259,13 @@ func (apiHandler *ApiHandler) handleGetReplicaSetList(
 	response.WriteHeaderAndEntity(http.StatusCreated, result)
 }
 
-// Handles get Replica Set detail API call.
-func (apiHandler *ApiHandler) handleGetReplicaSetDetail(
+// Handles get Replication Controller detail API call.
+func (apiHandler *ApiHandler) handleGetReplicationControllerDetail(
 	request *restful.Request, response *restful.Response) {
 
 	namespace := request.PathParameter("namespace")
-	replicaSet := request.PathParameter("replicaSet")
-	result, err := GetReplicaSetDetail(apiHandler.client, apiHandler.heapsterClient, namespace, replicaSet)
+	replicationController := request.PathParameter("replicationController")
+	result, err := GetReplicationControllerDetail(apiHandler.client, apiHandler.heapsterClient, namespace, replicationController)
 	if err != nil {
 		handleInternalError(response, err)
 		return
@@ -274,54 +274,54 @@ func (apiHandler *ApiHandler) handleGetReplicaSetDetail(
 	response.WriteHeaderAndEntity(http.StatusCreated, result)
 }
 
-// Handles update of Replica Set pods update API call.
+// Handles update of Replication Controller pods update API call.
 func (apiHandler *ApiHandler) handleUpdateReplicasCount(
 	request *restful.Request, response *restful.Response) {
 
 	namespace := request.PathParameter("namespace")
-	replicaSetName := request.PathParameter("replicaSet")
-	replicaSetSpec := new(ReplicaSetSpec)
+	replicationControllerName := request.PathParameter("replicationController")
+	replicationControllerSpec := new(ReplicationControllerSpec)
 
-	if err := request.ReadEntity(replicaSetSpec); err != nil {
+	if err := request.ReadEntity(replicationControllerSpec); err != nil {
 		handleInternalError(response, err)
 		return
 	}
 
-	if err := UpdateReplicasCount(apiHandler.client, namespace, replicaSetName,
-		replicaSetSpec); err != nil {
+	if err := UpdateReplicasCount(apiHandler.client, namespace, replicationControllerName,
+		replicationControllerSpec); err != nil {
 		handleInternalError(response, err)
 		return
 	}
 
 	response.WriteHeader(http.StatusAccepted)
 }
 
-// Handles delete Replica Set API call.
-func (apiHandler *ApiHandler) handleDeleteReplicaSet(
+// Handles delete Replication Controller API call.
+func (apiHandler *ApiHandler) handleDeleteReplicationController(
 	request *restful.Request, response *restful.Response) {
 
 	namespace := request.PathParameter("namespace")
-	replicaSet := request.PathParameter("replicaSet")
+	replicationController := request.PathParameter("replicationController")
 
-	if err := DeleteReplicaSetWithPods(apiHandler.client, namespace, replicaSet); err != nil {
+	if err := DeleteReplicationControllerWithPods(apiHandler.client, namespace, replicationController); err != nil {
 		handleInternalError(response, err)
 		return
 	}
 
 	response.WriteHeader(http.StatusOK)
 }
 
-// Handles get Replica Set Pods API call.
-func (apiHandler *ApiHandler) handleGetReplicaSetPods(
+// Handles get Replication Controller Pods API call.
+func (apiHandler *ApiHandler) handleGetReplicationControllerPods(
 	request *restful.Request, response *restful.Response) {
 
 	namespace := request.PathParameter("namespace")
-	replicaSet := request.PathParameter("replicaSet")
+	replicationController := request.PathParameter("replicationController")
 	limit, err := strconv.Atoi(request.QueryParameter("limit"))
 	if err != nil {
 		limit = 0
 	}
-	result, err := GetReplicaSetPods(apiHandler.client, namespace, replicaSet, limit)
+	result, err := GetReplicationControllerPods(apiHandler.client, namespace, replicationController, limit)
 	if err != nil {
 		handleInternalError(response, err)
 		return
@@ -405,8 +405,8 @@ func (apiHandler *ApiHandler) handleLogs(request *restful.Request, response *res
 // Handles event API call.
 func (apiHandler *ApiHandler) handleEvents(request *restful.Request, response *restful.Response) {
 	namespace := request.PathParameter("namespace")
-	replicaSet := request.PathParameter("replicaSet")
-	result, err := GetEvents(apiHandler.client, namespace, replicaSet)
+	replicationController := request.PathParameter("replicationController")
+	result, err := GetEvents(apiHandler.client, namespace, replicationController)
 	if err != nil {
 		handleInternalError(response, err)
 		return

src/app/backend/deploy.go

@@ -167,7 +167,7 @@ func DeployApp(spec *AppDeploymentSpec, client client.Interface) error {
 		Spec:       podSpec,
 	}
 
-	replicaSet := &api.ReplicationController{
+	replicationController := &api.ReplicationController{
 		ObjectMeta: objectMeta,
 		Spec: api.ReplicationControllerSpec{
 			Replicas: spec.Replicas,
@@ -176,7 +176,7 @@ func DeployApp(spec *AppDeploymentSpec, client client.Interface) error {
 		},
 	}
 
-	_, err := client.ReplicationControllers(spec.Namespace).Create(replicaSet)
+	_, err := client.ReplicationControllers(spec.Namespace).Create(replicationController)
 
 	if err != nil {
 		// TODO(bryk): Roll back created resources in case of error.

src/app/backend/events.go

@@ -66,13 +66,13 @@ type Event struct {
 	Type string `json:"type"`
 }
 
-// Return events for particular namespace and replica set or error if occurred.
-func GetEvents(client *client.Client, namespace, replicaSetName string) (*Events, error) {
-	log.Printf("Getting events related to %s replica set in %s namespace", replicaSetName,
+// Return events for particular namespace and replication controller or error if occurred.
+func GetEvents(client *client.Client, namespace, replicationControllerName string) (*Events, error) {
+	log.Printf("Getting events related to %s replication controller in %s namespace", replicationControllerName,
 		namespace)
 
-	// Get events for replica set.
-	rsEvents, err := GetReplicaSetEvents(client, namespace, replicaSetName)
+	// Get events for replication controller.
+	rsEvents, err := GetReplicationControllerEvents(client, namespace, replicationControllerName)
 
 	if err != nil {
 		return nil, err
@@ -83,25 +83,25 @@ func GetEvents(client *client.Client, namespace, replicaSetName string) (*Events
 		Events:    make([]Event, 0),
 	})
 
-	// Get events for pods in replica set.
-	podEvents, err := GetReplicaSetPodsEvents(client, namespace, replicaSetName)
+	// Get events for pods in replication controller.
+	podEvents, err := GetReplicationControllerPodsEvents(client, namespace, replicationControllerName)
 
 	if err != nil {
 		return nil, err
 	}
 
 	events = AppendEvents(podEvents, events)
 
-	log.Printf("Found %d events related to %s replica set in %s namespace", len(events.Events),
-		replicaSetName, namespace)
+	log.Printf("Found %d events related to %s replication controller in %s namespace", len(events.Events),
+		replicationControllerName, namespace)
 
 	return &events, nil
 }
 
-// Gets events associated to replica set.
-func GetReplicaSetEvents(client *client.Client, namespace, replicaSetName string) ([]api.Event,
+// Gets events associated to replication controller.
+func GetReplicationControllerEvents(client *client.Client, namespace, replicationControllerName string) ([]api.Event,
 	error) {
-	fieldSelector, err := fields.ParseSelector("involvedObject.name=" + replicaSetName)
+	fieldSelector, err := fields.ParseSelector("involvedObject.name=" + replicationControllerName)
 
 	if err != nil {
 		return nil, err
@@ -119,17 +119,17 @@ func GetReplicaSetEvents(client *client.Client, namespace, replicaSetName string
 	return list.Items, nil
 }
 
-// Gets events associated to pods in replica set.
-func GetReplicaSetPodsEvents(client *client.Client, namespace, replicaSetName string) ([]api.Event,
+// Gets events associated to pods in replication controller.
+func GetReplicationControllerPodsEvents(client *client.Client, namespace, replicationControllerName string) ([]api.Event,
 	error) {
-	replicaSet, err := client.ReplicationControllers(namespace).Get(replicaSetName)
+	replicationController, err := client.ReplicationControllers(namespace).Get(replicationControllerName)
 
 	if err != nil {
 		return nil, err
 	}
 
 	pods, err := client.Pods(namespace).List(unversioned.ListOptions{
-		LabelSelector: unversioned.LabelSelector{labels.SelectorFromSet(replicaSet.Spec.Selector)},
+		LabelSelector: unversioned.LabelSelector{labels.SelectorFromSet(replicationController.Spec.Selector)},
 		FieldSelector: unversioned.FieldSelector{fields.Everything()},
 	})
 

src/app/backend/replicasetcommon.go renamed to src/app/backend/replicationcontrollercommon.go

@@ -22,17 +22,17 @@ import (
 	"k8s.io/kubernetes/pkg/labels"
 )
 
-type ReplicaSetWithPods struct {
-	ReplicaSet *api.ReplicationController
+type ReplicationControllerWithPods struct {
+	ReplicationController *api.ReplicationController
 	Pods       *api.PodList
 }
 
-// ReplicaSetPodInfo represents aggregate information about replica set pods.
-type ReplicaSetPodInfo struct {
+// ReplicationControllerPodInfo represents aggregate information about replication controller pods.
+type ReplicationControllerPodInfo struct {
 	// Number of pods that are created.
 	Current int `json:"current"`
 
-	// Number of pods that are desired in this Replica Set.
+	// Number of pods that are desired in this Replication Controller.
 	Desired int `json:"desired"`
 
 	// Number of pods that are currently running.
@@ -45,15 +45,15 @@ type ReplicaSetPodInfo struct {
 	Failed int `json:"failed"`
 }
 
-// Returns structure containing ReplicaSet and Pods for the given replica set.
-func getRawReplicaSetWithPods(client client.Interface, namespace, name string) (
-	*ReplicaSetWithPods, error) {
-	replicaSet, err := client.ReplicationControllers(namespace).Get(name)
+// Returns structure containing ReplicationController and Pods for the given replication controller.
+func getRawReplicationControllerWithPods(client client.Interface, namespace, name string) (
+	*ReplicationControllerWithPods, error) {
+	replicationController, err := client.ReplicationControllers(namespace).Get(name)
 	if err != nil {
 		return nil, err
 	}
 
-	labelSelector := labels.SelectorFromSet(replicaSet.Spec.Selector)
+	labelSelector := labels.SelectorFromSet(replicationController.Spec.Selector)
 	pods, err := client.Pods(namespace).List(
 		unversioned.ListOptions{
 			LabelSelector: unversioned.LabelSelector{labelSelector},
@@ -64,27 +64,27 @@ func getRawReplicaSetWithPods(client client.Interface, namespace, name string) (
 		return nil, err
 	}
 
-	replicaSetAndPods := &ReplicaSetWithPods{
-		ReplicaSet: replicaSet,
+	replicationControllerAndPods := &ReplicationControllerWithPods{
+		ReplicationController: replicationController,
 		Pods:       pods,
 	}
-	return replicaSetAndPods, nil
+	return replicationControllerAndPods, nil
 }
 
-// Retrieves Pod list that belongs to a Replica Set.
-func getRawReplicaSetPods(client client.Interface, namespace, name string) (*api.PodList, error) {
-	replicaSetAndPods, err := getRawReplicaSetWithPods(client, namespace, name)
+// Retrieves Pod list that belongs to a Replication Controller.
+func getRawReplicationControllerPods(client client.Interface, namespace, name string) (*api.PodList, error) {
+	replicationControllerAndPods, err := getRawReplicationControllerWithPods(client, namespace, name)
 	if err != nil {
 		return nil, err
 	}
-	return replicaSetAndPods.Pods, nil
+	return replicationControllerAndPods.Pods, nil
 }
 
-// Returns aggregate information about replica set pods.
-func getReplicaSetPodInfo(replicaSet *api.ReplicationController, pods []api.Pod) ReplicaSetPodInfo {
-	result := ReplicaSetPodInfo{
-		Current: replicaSet.Status.Replicas,
-		Desired: replicaSet.Spec.Replicas,
+// Returns aggregate information about replication controller pods.
+func getReplicationControllerPodInfo(replicationController *api.ReplicationController, pods []api.Pod) ReplicationControllerPodInfo {
+	result := ReplicationControllerPodInfo{
+		Current: replicationController.Status.Replicas,
+		Desired: replicationController.Spec.Replicas,
 	}
 
 	for _, pod := range pods {