Merge pull request #255 from bacongobbler/rename-workflow-to-controller

fix(pkg): rename workflow to controller

Author: Matthew Fisher

README.md

@@ -52,7 +52,7 @@ Once this is done, SSH into a Kubernetes minion, and run the following:
 ```
 $ curl -sSL http://deis.io/deis-cli/install.sh | sh
 $ sudo mv deis /bin
-$ kubectl get service deis-workflow
+$ kubectl get service deis-controller
 $ deis register 10.247.59.157 # or the appropriate CLUSTER_IP
 $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
 $ eval $(ssh-agent) && ssh-add ~/.ssh/id_rsa

pkg/conf/config.go

@@ -18,7 +18,7 @@ func EnvConfig(appName string, conf interface{}) error {
 	return nil
 }
 
-// GetBuilderKey returns the key to be used as token to interact with deis-workflow
+// GetBuilderKey returns the key to be used as token to interact with deis-controller
 func GetBuilderKey() (string, error) {
 	builderKeyBytes, err := ioutil.ReadFile(builderKeyLocation)
 	if err != nil {

pkg/controller/utils.go

@@ -14,11 +14,11 @@ import (
 )
 
 const (
-	hostEnvName = "DEIS_WORKFLOW_SERVICE_HOST"
-	portEnvName = "DEIS_WORKFLOW_SERVICE_PORT"
+	hostEnvName = "DEIS_CONTROLLER_SERVICE_HOST"
+	portEnvName = "DEIS_CONTROLLER_SERVICE_PORT"
 )
 
-// UserInfo represent the required information from a user to make a push and interact with deis/workflow
+// UserInfo represent the required information from a user to make a push and interact with the controller
 type UserInfo struct {
 	Username    string
 	Key         string

pkg/gitreceive/config.go

@@ -12,8 +12,8 @@ const (
 
 type Config struct {
 	// k8s service discovery env vars
-	WorkflowHost string `envconfig:"DEIS_WORKFLOW_SERVICE_HOST" required:"true"`
-	WorkflowPort string `envconfig:"DEIS_WORKFLOW_SERVICE_PORT" required:"true"`
+	ControllerHost string `envconfig:"DEIS_CONTROLLER_SERVICE_HOST" required:"true"`
+	ControllerPort string `envconfig:"DEIS_CONTROLLER_SERVICE_PORT" required:"true"`
 	RegistryHost string `envconfig:"DEIS_REGISTRY_SERVICE_HOST" required:"true"`
 	RegistryPort string `envconfig:"DEIS_REGISTRY_SERVICE_PORT" required:"true"`
 

pkg/gitreceive/controller.go

@@ -33,7 +33,7 @@ func (u unexpectedControllerStatusCode) Error() string {
 }
 
 func controllerURLStr(conf *Config, additionalPath ...string) string {
-	return fmt.Sprintf("http://%s:%s/%s", conf.WorkflowHost, conf.WorkflowPort, strings.Join(additionalPath, "/"))
+	return fmt.Sprintf("http://%s:%s/%s", conf.ControllerHost, conf.ControllerPort, strings.Join(additionalPath, "/"))
 }
 
 func setReqHeaders(builderKey string, req *http.Request) {
@@ -61,7 +61,7 @@ func getAppConfig(conf *Config, builderKey, userName, appName string) (*pkg.Conf
 
 	setReqHeaders(builderKey, req)
 
-	log.Debug("Workflow request POST /v2/hooks/config\n%s", string(data))
+	log.Debug("Controller request POST /v2/hooks/config\n%s", string(data))
 	res, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return nil, err
@@ -91,7 +91,7 @@ func publishRelease(conf *Config, builderKey string, buildHook *pkg.BuildHook) (
 	}
 
 	url := controllerURLStr(conf, "v2", "hooks", "build")
-	log.Debug("Workflow request POST /v2/hooks/build\n%s", postBody)
+	log.Debug("Controller request POST /v2/hooks/build\n%s", postBody)
 	req, err := http.NewRequest("POST", url, strings.NewReader(postBody))
 	if err != nil {
 		return nil, err
@@ -132,7 +132,7 @@ func receive(conf *Config, builderKey, gitSha string) error {
 		return err
 	}
 
-	log.Debug("Workflow request /v2/hooks/push (body elided)")
+	log.Debug("Controller request /v2/hooks/push (body elided)")
 	req, err := http.NewRequest("POST", urlStr, &body)
 	if err != nil {
 		return err

pkg/gitreceive/storage/slug_builder_info.go

@@ -21,7 +21,7 @@ type SlugBuilderInfo struct {
 // NewSlugBuilderInfo creates and populates a new SlugBuilderInfo based on the given data
 func NewSlugBuilderInfo(s3Endpoint *Endpoint, bucket, appName, slugName string, gitSha *git.SHA) *SlugBuilderInfo {
 	tarKey := fmt.Sprintf("home/%s/tar", slugName)
-	// this is where workflow tells slugrunner to download the slug from, so we have to tell slugbuilder to upload it to here
+	// this is where the controller tells slugrunner to download the slug from, so we have to tell slugbuilder to upload it to here
 	pushKey := fmt.Sprintf("home/%s:git-%s/push", appName, gitSha.Short())
 
 	return &SlugBuilderInfo{